diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 0c30361..3c8e098 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1447,7 +1447,6 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(hisPatient)) { - System.out.println("hisPatient size = " + hisPatient.size()); Map babyHis = hisPatient.get(0); if (babyHis != null && babyHis.get("phone") != null && StringUtils.isNotEmpty(babyHis.get("phone").toString())) { @@ -1459,12 +1458,13 @@ public class BabyBookbuildingFacade { List list = new ArrayList(); list.add("1"); list.add("2"); - babyQuery.setEnableListNot(list); + babyModelQuery.setEnableListNot(list); } - babyQuery.setHospitalIdList(groupsFacade.findGroupHospital(userId, false)); + List hospitals = groupsFacade.findGroupHospital(userId, false); + babyModelQuery.setHospitalIdList(hospitals); // - List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); System.out.println("models = " + models.size()); if (CollectionUtils.isNotEmpty(models)) { BabyModel model = models.get(0); @@ -1486,7 +1486,7 @@ public class BabyBookbuildingFacade { BabyModelQuery babyBuildQuery = new BabyModelQuery(); babyBuildQuery.setYn(YnEnums.YES.getId()); babyBuildQuery.setPid(model.getPid()); - List builds = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "buildDate", Sort.Direction.DESC); + List builds = babyBookbuildingService.queryBabyBuildByCond(babyBuildQuery, "buildDate", Sort.Direction.DESC); List> list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(builds)) { 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 c4aa852..e6de4ed 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 @@ -381,6 +381,13 @@ public class LisFacade { return result; } + /** + * 历史检验检查的查看页面 + * @param vcCardNo + * @param phone + * @param model + * @return + */ private List queryLisData(String vcCardNo, String phone,LisReportQuery model) { @@ -434,6 +441,39 @@ public class LisFacade { } + + /** + * lis辅助检查的查询 + * @param vcCardNo + * @param phone + * @param model + * @return + */ + private List queryCheckLis(String vcCardNo, String phone,LisReportQuery model) { + + + List reportModelList = new ArrayList<>(); + //通过就诊卡号和医院id查询到医院下面的lis记录 + if (StringUtils.isNotEmpty(vcCardNo)) + { + model.setVcCardNo(vcCardNo); + List lises = lisService.queryLisDataByModel(model); + reportModelList.addAll(lises); + } + else if (StringUtils.isNotEmpty(phone)) + { + model.setVcCardNo(null); + model.setPhone(phone); + List lises = lisService.queryLisDataByModel(model); + reportModelList.addAll(lises); + + } + return reportModelList; + + } + + + /** * 返回小程序查询个人的lis报告 * 该接口由app服务器端调用 @@ -695,7 +735,7 @@ public class LisFacade { query.setTitles(titles); query.setHospitalId(hospitalId); query.setCheckTime(DateUtil.parseYMD(checkTime)); - List lises = queryLisData(vcCardNo,phone,query); + List lises = queryCheckLis(vcCardNo,phone,query); if (CollectionUtils.isNotEmpty(lises)) {