Преглед на файлове

病历详情接口修改

rengb преди 5 години
родител
ревизия
6b61558bdc

+ 10 - 0
prec-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -338,6 +338,16 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
                 "hospital_id", getInquiryDetailVO.getHospitalId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalCode()),
                 "hospital_code", getInquiryDetailVO.getHospitalCode());
+
+        if (StringUtil.isNotBlank(getInquiryDetailVO.getSonHospitalCode())) {
+            inquiryInfoQe.and(qe ->
+                    qe.eq("son_hospital_code", getInquiryDetailVO.getSonHospitalCode())
+                            .or()
+                            .eq("son_hospital_code", "")
+                            .or()
+                            .isNull("son_hospital_code"));
+        }
+
         inquiryInfoQe.eq(getInquiryDetailVO.getHospitalDeptId() != null,
                 "hospital_dept_id", getInquiryDetailVO.getHospitalDeptId());
         inquiryInfoQe.eq(StringUtil.isNotBlank(getInquiryDetailVO.getHospitalDeptCode()),

+ 12 - 0
prec-service/src/main/java/com/diagbot/vo/GetInquiryDetailVO.java

@@ -33,6 +33,18 @@ public class GetInquiryDetailVO {
     @ApiModelProperty(value = "医院编码")
     private String hospitalCode;
 
+    /**
+     * 子医院id
+     */
+    @ApiModelProperty(value = "子医院id")
+    private Long sonHospitalId;
+
+    /**
+     * 子医院编码
+     */
+    @ApiModelProperty(value = "子医院编码")
+    private String sonHospitalCode;
+
     /**
      * 医院科室id
      */