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