病历引用接口修改

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

@@ -269,7 +269,8 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
                 QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
                 patientInfoQe.eq("hospital_code", sonHospitalCode);
                 patientInfoQe.eq("name", patientInfo.getName());
-                patientInfoQe.eq(StringUtil.isNotBlank(patientInfo.getIdNo()),
+                patientInfoQe.eq(StringUtil.isBlank(patientInfo.getIdentityNum())
+                                && StringUtil.isNotBlank(patientInfo.getIdNo()),
                         "id_no", patientInfo.getIdNo());
                 patientInfoQe.eq(StringUtil.isNotBlank(patientInfo.getIdentityNum()),
                         "identity_num", patientInfo.getIdentityNum());
@@ -551,7 +552,8 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
         patientInfoQe.eq("hospital_code", hospitalCode);
         patientInfoQe.eq("name", inquiryQuoteVO.getPatientInfo().getName());
-        patientInfoQe.eq(StringUtil.isNotBlank(inquiryQuoteVO.getPatientInfo().getIdNo()),
+        patientInfoQe.eq(StringUtil.isBlank(inquiryQuoteVO.getPatientInfo().getIdentityNum())
+                        && StringUtil.isNotBlank(inquiryQuoteVO.getPatientInfo().getIdNo()),
                 "id_no", inquiryQuoteVO.getPatientInfo().getIdNo());
         patientInfoQe.eq(StringUtil.isNotBlank(inquiryQuoteVO.getPatientInfo().getIdentityNum()),
                 "identity_num", inquiryQuoteVO.getPatientInfo().getIdentityNum());