页面顶部信息接口修改

prec-service/src/main/java/com/diagbot/vo/GetTopPatientInfoDjVO.java

@@ -40,8 +40,7 @@ public class GetTopPatientInfoDjVO {
     /**
      * 医院医生编号
      */
-    @ApiModelProperty(value = "医院医生编号", required = true)
-    @NotBlank(message = "医院医生编号必填")
+    @ApiModelProperty(value = "医院医生编号")
     private String doctorCode;
 
     /**
@@ -54,8 +53,7 @@ public class GetTopPatientInfoDjVO {
     /**
      * 门诊号
      */
-    @ApiModelProperty(value = "门诊号", required = true)
-    @NotBlank(message = "门诊号必填")
+    @ApiModelProperty(value = "门诊号")
     private String recordId;
 
 

tran-service/src/main/java/com/diagbot/facade/PatientInfoDjFacade.java

@@ -11,7 +11,6 @@ import com.diagbot.entity.PatientInfo;
 import com.diagbot.entity.SysSet;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.enums.VisibleIdTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.exception.ServiceErrorCode;
 import com.diagbot.idc.VisibleIdCreater;
@@ -71,37 +70,40 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         getTopPatientInfoDjDTO.setSystemTime(DateUtil.now());
         getTopPatientInfoDjDTO.setRecordId(getTopPatientInfoDjVO.getRecordId());
         getTopPatientInfoDjDTO.setPatientAge(DateUtil.yearCompare(getTopPatientInfoDjDTO.getBirthday(), DateUtil.now()));
-        if (StringUtil.isNotBlank(getTopPatientInfoDjVO.getHospitalDeptCode())) {
-            String hospitalCode = getTopPatientInfoDjVO.getHospitalCode();
-            QueryWrapper<SysSet> sysSetQe = new QueryWrapper<>();
-            sysSetQe.eq("hospital_code", hospitalCode);
-            sysSetQe.eq("sys_type", SysTypeEnum.PREC_SERVICE.getKey());
-            sysSetQe.eq("code", "junior_hospital");
-            SysSet sysSet = sysSetFacade.getOne(sysSetQe, true);
-            if (sysSet != null && StringUtil.isNotBlank(sysSet.getValue())) {
-                if (StringUtil.isBlank(getTopPatientInfoDjVO.getSonHospitalCode())) {
-                    throw new CommonException(CommonErrorCode.RPC_ERROR, "子医院编码必传");
-                }
-                hospitalCode = getTopPatientInfoDjVO.getSonHospitalCode();
-                QueryWrapper<HospitalInfo> hospitalInfoQe = new QueryWrapper<>();
-                hospitalInfoQe.eq("code", hospitalCode);
-                HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(hospitalInfoQe, true);
-                if (hospitalInfo != null) {
-                    getTopPatientInfoDjDTO.setSonHospitalId(hospitalInfo.getId());
-                    getTopPatientInfoDjDTO.setSonHospitalCode(hospitalInfo.getCode());
-                    getTopPatientInfoDjDTO.setSonHospitalName(hospitalInfo.getName());
-                }
-            }
-            QueryWrapper<HospitalDept> hospitalDeptQe = new QueryWrapper<>();
-            hospitalDeptQe.eq("hospital_code", hospitalCode);
-            hospitalDeptQe.eq("code", getTopPatientInfoDjVO.getHospitalDeptCode());
-            HospitalDept hospitalDept = hospitalDeptFacade.getOne(hospitalDeptQe, true);
-            if (hospitalDept != null) {
-                getTopPatientInfoDjDTO.setHospitalDeptId(hospitalDept.getId());
-                getTopPatientInfoDjDTO.setHospitalDeptCode(hospitalDept.getCode());
-                getTopPatientInfoDjDTO.setHospitalDeptName(hospitalDept.getName());
-                getTopPatientInfoDjDTO.setSelfDeptName(hospitalDept.getConceptDeptName());
-            }
+
+        List<String> hospitalCodeList = Lists.newArrayList();
+        hospitalCodeList.add(getTopPatientInfoDjVO.getHospitalCode());
+        if (StringUtil.isNotBlank(getTopPatientInfoDjVO.getSonHospitalCode())) {
+            hospitalCodeList.add(getTopPatientInfoDjVO.getSonHospitalCode());
+        }
+        QueryWrapper<HospitalInfo> hospitalInfoQe = new QueryWrapper<>();
+        hospitalInfoQe.in("code", hospitalCodeList);
+        Map<String, HospitalInfo> hospitalInfoMap = hospitalInfoFacade.list(hospitalInfoQe)
+                .stream().collect(Collectors.toMap(HospitalInfo::getCode, i -> i));
+
+        HospitalInfo hospitalInfo = hospitalInfoMap.get(getTopPatientInfoDjVO.getHospitalCode());
+        HospitalInfo sonHospitalInfo = hospitalInfoMap.get(getTopPatientInfoDjVO.getSonHospitalCode());
+        getTopPatientInfoDjDTO.setHospitalId(hospitalInfo.getId());
+        getTopPatientInfoDjDTO.setHospitalCode(hospitalInfo.getCode());
+        getTopPatientInfoDjDTO.setHospitalName(hospitalInfo.getName());
+        if (sonHospitalInfo != null) {
+            getTopPatientInfoDjDTO.setSonHospitalId(sonHospitalInfo.getId());
+            getTopPatientInfoDjDTO.setSonHospitalCode(sonHospitalInfo.getCode());
+            getTopPatientInfoDjDTO.setSonHospitalName(sonHospitalInfo.getName());
+        }
+
+        QueryWrapper<HospitalDept> hospitalDeptQe = new QueryWrapper<>();
+        hospitalDeptQe.eq("hospital_code",
+                StringUtil.isBlank(getTopPatientInfoDjVO.getSonHospitalCode())
+                        ? getTopPatientInfoDjVO.getHospitalCode()
+                        : getTopPatientInfoDjVO.getSonHospitalCode());
+        hospitalDeptQe.eq("code", getTopPatientInfoDjVO.getHospitalDeptCode());
+        HospitalDept hospitalDept = hospitalDeptFacade.getOne(hospitalDeptQe, false);
+        if (hospitalDept != null) {
+            getTopPatientInfoDjDTO.setHospitalDeptId(hospitalDept.getId());
+            getTopPatientInfoDjDTO.setHospitalDeptCode(hospitalDept.getCode());
+            getTopPatientInfoDjDTO.setHospitalDeptName(hospitalDept.getName());
+            getTopPatientInfoDjDTO.setSelfDeptName(hospitalDept.getConceptDeptName());
         }
 
         return getTopPatientInfoDjDTO;
@@ -355,7 +357,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
      * @return
      */
     public Boolean inquiryQuote(InquiryQuoteVO inquiryQuoteVO) {
-        List<String> hospitalCodeList = Lists.newLinkedList();
+        List<String> hospitalCodeList = Lists.newArrayList();
         hospitalCodeList.add(inquiryQuoteVO.getHospitalCode());
 
         String hospitalCode = inquiryQuoteVO.getHospitalCode();
@@ -369,8 +371,8 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
 
         QueryWrapper<HospitalInfo> hospitalInfoQe = new QueryWrapper<>();
         hospitalInfoQe.in("code", hospitalCodeList);
-        Map<String,Long> hospitalInfoIdMap = hospitalInfoFacade.list(hospitalInfoQe)
-                .stream().collect(Collectors.toMap(HospitalInfo::getCode,i->i.getId()));
+        Map<String, Long> hospitalInfoIdMap = hospitalInfoFacade.list(hospitalInfoQe)
+                .stream().collect(Collectors.toMap(HospitalInfo::getCode, i -> i.getId()));
 
         inquiryQuoteVO.setHospitalId(hospitalInfoIdMap.get(inquiryQuoteVO.getHospitalCode()));
         if (StringUtil.isNotBlank(inquiryQuoteVO.getSonHospitalCode())) {