病历引用接口修改

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

@@ -466,15 +466,15 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         if (inquiryInfo.getIsQuoted() == 0) {
             inquiryInfo.setGmtModified(now);
             inquiryInfo.setIsQuoted(1);
-            if (StringUtil.isBlank(inquiryInfo.getInquiryCode())) {
-                inquiryInfo.setInquiryCode(inquiryQuoteVO.getInquiryCode());
-            }
-            inquiryInfo.setPatientCode(inquiryQuoteVO.getPatientInfo().getCode());
-            inquiryInfo.setPatientName(inquiryQuoteVO.getPatientInfo().getName());
-            inquiryInfo.setPatientIdNo(inquiryQuoteVO.getPatientInfo().getIdentityNum());
-            inquiryInfo.setPatientBirthday(inquiryQuoteVO.getPatientInfo().getBirthday());
-            inquiryInfo.setPatientPhone(inquiryQuoteVO.getPatientInfo().getPhone());
-            inquiryInfo.setPatientSex(inquiryQuoteVO.getPatientInfo().getSex());
+            //            if (StringUtil.isBlank(inquiryInfo.getInquiryCode())) {
+            //                inquiryInfo.setInquiryCode(inquiryQuoteVO.getInquiryCode());
+            //            }
+            //            inquiryInfo.setPatientCode(inquiryQuoteVO.getPatientInfo().getCode());
+            //            inquiryInfo.setPatientName(inquiryQuoteVO.getPatientInfo().getName());
+            //            inquiryInfo.setPatientIdNo(inquiryQuoteVO.getPatientInfo().getIdentityNum());
+            //            inquiryInfo.setPatientBirthday(inquiryQuoteVO.getPatientInfo().getBirthday());
+            //            inquiryInfo.setPatientPhone(inquiryQuoteVO.getPatientInfo().getPhone());
+            //            inquiryInfo.setPatientSex(inquiryQuoteVO.getPatientInfo().getSex());
         } else if (sysSetFacade.isQuoteShow(inquiryQuoteVO.getHospitalCode())) {
             QueryWrapper<InquiryQuote> inquiryQuoteQe = new QueryWrapper<>();
             inquiryQuoteQe.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -498,7 +498,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         }
 
         if (inquiryInfo.getIsQuoted() == 0) {
-            inquiryInfo.setPatientId(inquiryQuoteVO.getPatientInfo().getId());
+            //            inquiryInfo.setPatientId(inquiryQuoteVO.getPatientInfo().getId());
             updateById(inquiryInfo);
         }
 

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

@@ -526,14 +526,14 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
 
         if (inquiryQuoteVO.getDoctorInfo() != null) {
             QueryWrapper<DoctorInfo> doctorInfoQe = new QueryWrapper<>();
-            doctorInfoQe.eq("hospital_code", inquiryQuoteVO.getHospitalCode());
+            doctorInfoQe.eq("hospital_code", hospitalCode);
             doctorInfoQe.eq("code", inquiryQuoteVO.getDoctorInfo().getCode());
             DoctorInfo doctorInfo = doctorInfoFacade.getOne(doctorInfoQe, false);
             Long doctorId = null;
             if (doctorInfo == null) {
                 doctorInfo = new DoctorInfo();
                 doctorInfo.setGmtCreate(now);
-                doctorInfo.setHospitalCode(inquiryQuoteVO.getHospitalCode());
+                doctorInfo.setHospitalCode(hospitalCode);
             } else {
                 doctorId = doctorInfo.getId().longValue();
             }
@@ -545,18 +545,19 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         }
 
         QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
-        patientInfoQe.eq("hospital_code", inquiryQuoteVO.getHospitalCode());
-        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("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()));
         PatientInfo patientInfo = getOne(patientInfoQe, false);
         Long patientId = null;
         if (patientInfo == null) {
             patientInfo = new PatientInfo();
             patientInfo.setGmtCreate(now);
-            patientInfo.setHospitalCode(inquiryQuoteVO.getHospitalCode());
+            patientInfo.setHospitalCode(hospitalCode);
         } else {
             patientId = patientInfo.getId().longValue();
         }