病历引用接口修改

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

@@ -268,7 +268,11 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
                     .contains(patientInfo.getCode())) {
                 QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
                 patientInfoQe.eq("hospital_code", sonHospitalCode);
-                patientInfoQe.eq("code", patientInfo.getCode());
+                patientInfoQe.eq("name", patientInfo.getName());
+                patientInfoQe.eq(StringUtil.isNotBlank(patientInfo.getIdNo()),
+                        "id_no", patientInfo.getIdNo());
+                patientInfoQe.eq(StringUtil.isNotBlank(patientInfo.getIdentityNum()),
+                        "identity_num", patientInfo.getIdentityNum());
                 PatientInfo patientInfoQuery = getOne(patientInfoQe, false);
                 PatientInfo saveOrUpat = new PatientInfo();
                 Long patId = null;
@@ -546,12 +550,11 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
 
         QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
         patientInfoQe.eq("hospital_code", hospitalCode);
-        patientInfoQe.eq("code", inquiryQuoteVO.getPatientInfo().getCode());
-        //        patientInfoQe.eq("name", inquiryQuoteVO.getPatientInfo().getName());
-        //        patientInfoQe.and(a ->
-        //                a.eq("id_no", inquiryQuoteVO.getPatientInfo().getIdNo())
-        //                        .or()
-        //                        .eq("identity_num", inquiryQuoteVO.getPatientInfo().getIdentityNum()));
+        patientInfoQe.eq("name", inquiryQuoteVO.getPatientInfo().getName());
+        patientInfoQe.eq(StringUtil.isNotBlank(inquiryQuoteVO.getPatientInfo().getIdNo()),
+                "id_no", inquiryQuoteVO.getPatientInfo().getIdNo());
+        patientInfoQe.eq(StringUtil.isNotBlank(inquiryQuoteVO.getPatientInfo().getIdentityNum()),
+                "identity_num", inquiryQuoteVO.getPatientInfo().getIdentityNum());
         PatientInfo patientInfo = getOne(patientInfoQe, false);
         Long patientId = null;
         if (patientInfo == null) {