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 fc4e8d3..102ca45 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 @@ -663,6 +663,9 @@ public class LisFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); LisReportQuery query = new LisReportQuery(); List titles = new ArrayList<>(); + Map> map = new HashMap<>(); + + boolean isQuery = false; //秦皇岛 if ("216".equals(hospitalId)) @@ -670,6 +673,7 @@ public class LisFacade { titles.add("尿常规"); titles.add("[丙]血常规(24项)"); titles.add("血常规(24项)"); + isQuery = true; } //青龙满族自治县医院 else if ("204".equals(hospitalId)) @@ -680,13 +684,19 @@ public class LisFacade { titles.add("血常规、血型"); titles.add("血常规5分类"); titles.add("小儿血常规5分类"); + isQuery = true; + } + //如果不为上面的医院就直接返回 + if (!isQuery) + { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); } query.setTitles(titles); query.setHospitalId(hospitalId); query.setCheckTime(DateUtil.parseYMD(checkTime)); List lises = queryLisData(vcCardNo,phone,query); - Map> map = new HashMap<>(); + if (CollectionUtils.isNotEmpty(lises)) { for(LisReportModel model : lises)