Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/develop' into debug

hujing 4 rokov pred
rodič
commit
f4eea10ef6

+ 4 - 4
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -438,7 +438,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         QueryWrapper<MedLisInfo> medLisInfoQe = new QueryWrapper<>();
         medLisInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         medLisInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
-        medLisInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
+        medLisInfoQe.like("behospital_code", behospitalInfo.getFileCode());
         medLisInfoQe.isNotNull("rep_name");
         medLisInfoQe.isNotNull("check_date");
         medLisInfoQe.apply("check_date!=''");
@@ -463,7 +463,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             medLisResultList = medLisResultFacade.list(new QueryWrapper<MedLisResult>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", behospitalInfo.getHospitalId())
-                    .eq("behospital_code", behospitalInfo.getFileCode())
+                    .like("behospital_code", behospitalInfo.getFileCode())
                     .isNotNull("item_name")
                     .in("rep_no", medLisInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
@@ -489,7 +489,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         QueryWrapper<MedPacsInfo> medPacsInfoQe = new QueryWrapper<>();
         medPacsInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
         medPacsInfoQe.eq("hospital_id", behospitalInfo.getHospitalId());
-        medPacsInfoQe.eq("behospital_code", behospitalInfo.getFileCode());
+        medPacsInfoQe.like("behospital_code", behospitalInfo.getFileCode());
         medPacsInfoQe.isNotNull("check_date");
         medPacsInfoQe.apply("check_date!=''");
         medPacsInfoQe.apply(
@@ -511,7 +511,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             medPacsResultList = medPacsResultFacade.list(new QueryWrapper<MedPacsResult>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("hospital_id", behospitalInfo.getHospitalId())
-                    .eq("behospital_code", behospitalInfo.getFileCode())
+                    .like("behospital_code", behospitalInfo.getFileCode())
                     .in("rep_no", medPacsInfoList.stream().map(i -> i.getRepNo()).collect(Collectors.toList()))
             );
         }