diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml index afda6b7..ce00c75 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -112,6 +112,10 @@ AND VCCARDNO = #{vcCardNo} + + AND PHONE = #{phone} + + AND HOSPITAL_ID = #{hospitalId} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index b3aab3b..f65805d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -302,9 +302,14 @@ public class LisFacade { if(CollectionUtils.isNotEmpty(list)){ for(Patients pat : list) { - if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getHospitalId())) + if (pat != null && StringUtils.isNotEmpty(pat.getHospitalId())) { + if (StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getPhone())) + { + continue; + } + //获取医院的名称 String hospitalName = hIdNames.get(pat.getHospitalId()); if (!StringUtils.isNotEmpty(hospitalName)) @@ -321,6 +326,7 @@ public class LisFacade { LisReportModel model = new LisReportModel(); model.setVcCardNo(pat.getVcCardNo()); model.setHospitalId(pat.getHospitalId()); + model.setPhone(pat.getPhone()); //通过就诊卡号和医院id查询到医院下面的lis记录 List lises = lisService.queryLisDataByModel(model); if (CollectionUtils.isNotEmpty(lises))