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 e711269..826d02e 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 @@ -3291,13 +3291,18 @@ public class BabyBookbuildingFacade { if (request.getHighRiskType() == 1) {//高危 // babyQuery.setLastHighRisk(1); // babyQuery.setHighRisk(1); - for (String s : babyQuery.getHospitalIdList()) { - if(Integer.valueOf(s)==2100001605||Integer.valueOf(s)==2100001452){//隆化县,围场妇幼,儿童管理 1:高危页面高危与体弱合并显示 - babyQuery.setHighRiskAndWeakSon(1);//BabyModelQuery类 highRiskAndWeakSon自定义标识字段合并查询 - }else{ - babyQuery.setHighRisk(1); + if(null!=babyQuery.getHospitalIdList()){ + for (String s : babyQuery.getHospitalIdList()) { + if(Integer.valueOf(s)==2100001605||Integer.valueOf(s)==2100001452){//隆化县,围场妇幼,儿童管理 1:高危页面高危与体弱合并显示 + babyQuery.setHighRiskAndWeakSon(1);//BabyModelQuery类 highRiskAndWeakSon自定义标识字段合并查询 + }else{ + babyQuery.setHighRisk(1); + } } + }else { + babyQuery.setHighRisk(1); } + } else if (request.getHighRiskType() == 3) {//体弱 babyQuery.setWeakSon(1); } else if (request.getHighRiskType() == 0) {