lis和pacs数据传输修改

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

@@ -441,6 +441,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         medLisInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         medLisInfoQe.eq("hospital_id", hospitalId);
         medLisInfoQe.eq("behospital_code", fideCode);
+        medLisInfoQe.isNotNull("rep_name");
         medLisInfoQe.isNotNull("check_date");
         medLisInfoQe.apply("check_date!=''");
         medLisInfoQe.apply(
@@ -457,14 +458,20 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                             + "','%Y-%m-%d %H:%i:%s')"
             );
         }
+        medLisInfoQe.select("rep_no", "rep_name");
         List<MedLisInfo> medLisInfoList = medLisInfoFacade.list(medLisInfoQe);
         if (ListUtil.isNotEmpty(medLisInfoList)) {
+            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)
+                    .isNotNull("item_name")
                     .in("rept_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
+            medLisResultList.forEach(medLisResult -> {
+                medLisResult.setItemName(repNoRepNameMap.get(medLisResult.getReptNo()) + "=" + medLisResult.getItemName());
+            });
         }
         return medLisResultList;
     }