lis数据传输修改

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -352,11 +352,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             queryVo.setBehospitalInfo(behospitalInfoList.get(0));
         }
 
-        String fideCode = analyzeVO.getBehospitalCode().substring(0, analyzeVO.getBehospitalCode().indexOf("_"));
         // 化验
-        List<MedLisResult> medLisResultList = getMedLisResultList(hospitalId, fideCode, behospitalInfoList.get(0));
+        List<MedLisResult> medLisResultList = getMedLisResultList(behospitalInfoList.get(0));
         // 辅检
-        List<MedPacsResult> medPacsResultList = getMedPacsResultList(hospitalId, fideCode, behospitalInfoList.get(0));
+        List<MedPacsResult> medPacsResultList = getMedPacsResultList(behospitalInfoList.get(0));
 
         // 会诊记录
         addDataWithKey("会诊", recMap, medrecVoList,
@@ -425,7 +424,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return queryVo;
     }
 
-    private List<MedLisResult> getMedLisResultList(Long hospitalId, String fideCode, BehospitalInfo behospitalInfo) {
+    private List<MedLisResult> getMedLisResultList(BehospitalInfo behospitalInfo) {
         String behospitalDate = null, leaveHospitalDate = null;
         try {
             behospitalDate = DateUtil.format(behospitalInfo.getBehospitalDate(), DateUtil.DATE_TIME_FORMAT);
@@ -439,8 +438,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<MedLisResult> medLisResultList = null;
         QueryWrapper<MedLisInfo> medLisInfoQe = new QueryWrapper<>();
         medLisInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        medLisInfoQe.eq("hospital_id", hospitalId);
-        medLisInfoQe.eq("behospital_code", fideCode);
+        medLisInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
+        medLisInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
         medLisInfoQe.isNotNull("rep_name");
         medLisInfoQe.isNotNull("check_date");
         medLisInfoQe.apply("check_date!=''");
@@ -464,8 +463,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             Map<String, String> repNoRepNameMap = medLisInfoList.stream().collect(Collectors.toMap(i -> i.getRepNo(), i -> i.getRepName()));
             medLisResultList = medLisResultFacade.list(new QueryWrapper<MedLisResult>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", hospitalId)
-                    .eq("behospital_code", fideCode)
+                    .eq("hospital_id", behospitalInfo.getHospitalId())
+                    .eq("behospital_code", behospitalInfo.getFileCode())
                     .isNotNull("item_name")
                     .in("rept_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
@@ -476,7 +475,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         return medLisResultList;
     }
 
-    private List<MedPacsResult> getMedPacsResultList(Long hospitalId, String fideCode, BehospitalInfo behospitalInfo) {
+    private List<MedPacsResult> getMedPacsResultList(BehospitalInfo behospitalInfo) {
         String behospitalDate = null, leaveHospitalDate = null;
         try {
             behospitalDate = DateUtil.format(behospitalInfo.getBehospitalDate(), DateUtil.DATE_TIME_FORMAT);
@@ -490,8 +489,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<MedPacsResult> medPacsResultList = null;
         QueryWrapper<MedPacsInfo> medPacsInfoQe = new QueryWrapper<>();
         medPacsInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
-        medPacsInfoQe.eq("hospital_id", hospitalId);
-        medPacsInfoQe.eq("behospital_code", fideCode);
+        medPacsInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
+        medPacsInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
         medPacsInfoQe.isNotNull("check_date");
         medPacsInfoQe.apply("check_date!=''");
         medPacsInfoQe.apply(
@@ -512,8 +511,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         if (ListUtil.isNotEmpty(medPacsInfoList)) {
             medPacsResultList = medPacsResultFacade.list(new QueryWrapper<MedPacsResult>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("hospital_id", hospitalId)
-                    .eq("behospital_code", fideCode)
+                    .eq("hospital_id", behospitalInfo.getHospitalId())
+                    .eq("behospital_code", behospitalInfo.getFileCode())
                     .in("rept_no", medPacsInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
         }