From 7ae41923fba93d1b536e2620d185273c0597eef5 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 19 Jan 2022 13:06:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D=E6=A3=80=E6=9F=A5-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=AB=98=E5=8D=B1=E8=AF=A6=E6=83=85BUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/BabyCheckFacade.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 10d8c55..da4b19c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -615,7 +615,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setDevelopAssess(StringUtils.isNotEmpty(request.getDevelopAssess())?request.getDevelopAssess():""); model.setScreeningOther(StringUtils.isNotEmpty(request.getScreeningOther())?request.getScreeningOther():""); //秦皇岛-儿保检查-高危儿详情 - model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null); + model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():new ArrayList>()); //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养 if(null!=request.getFhfz()){ model.setFhfz(request.getFhfz()); @@ -754,7 +754,7 @@ public class BabyCheckFacade extends BaseServiceImpl { bm.setLastCheckDoctor(request.getCheckDoctor()); bm.setDiseases(request.getDiseases()); //秦皇岛-高危儿详情添加到儿童档案 - bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null); + bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():new ArrayList>()); babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); syncMaster(request.getBuildId()); BabyCheckModel model = getBabyCheckModel(request); @@ -1111,7 +1111,7 @@ public class BabyCheckFacade extends BaseServiceImpl { // Criteria criterBabyCheck=Criteria.where("id").is(list.get(list.size()-1).get("id")); // Query queryBabyCheck=Query.query(criterBabyCheck); // BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class); -// resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():""); +// resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():new ArrayList>()); // }else { // resMap.put("qhdHighRiskInfo",""); // } @@ -1758,7 +1758,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Criteria criterBabyCheck=Criteria.where("id").is(babyCheckList.get(0).getId()); Query queryBabyCheck=Query.query(criterBabyCheck); BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class); - base.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():null); + base.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():new ArrayList>()); }else { base.setQhdHighRiskInfo(null); } @@ -2007,7 +2007,7 @@ public class BabyCheckFacade extends BaseServiceImpl { //分娩孕周 result.setDueWeek(model.getDueWeek()); //秦皇岛-高危儿详情 - result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null); + result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():new ArrayList>()); List list = new ArrayList <>(); if (listMap.get(model.getPid()) != null) { list = listMap.get(model.getPid()); @@ -2508,7 +2508,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():""); model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():""); //秦皇岛-新高危儿详情 - model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():null); + model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():new ArrayList>()); //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养 if(null!=checkModel.getFhfz()){ model.setFhfz(checkModel.getFhfz()); -- 1.8.3.1