jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7ae41923fba93d1b536e2620d185273c0597eef5

Authored by shiyang
1 parent 3ba0a62291
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿保检查-修改高危详情BUG修复

Showing 1 changed file with 6 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 7ae4192
... ... @@ -615,7 +615,7 @@
615 615 model.setDevelopAssess(StringUtils.isNotEmpty(request.getDevelopAssess())?request.getDevelopAssess():"");
616 616 model.setScreeningOther(StringUtils.isNotEmpty(request.getScreeningOther())?request.getScreeningOther():"");
617 617 //秦皇岛-儿保检查-高危儿详情
618   - model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null);
  618 + model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():new ArrayList<Map<String, String>>());
619 619 //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养
620 620 if(null!=request.getFhfz()){
621 621 model.setFhfz(request.getFhfz());
... ... @@ -754,7 +754,7 @@
754 754 bm.setLastCheckDoctor(request.getCheckDoctor());
755 755 bm.setDiseases(request.getDiseases());
756 756 //秦皇岛-高危儿详情添加到儿童档案
757   - bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null);
  757 + bm.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():new ArrayList<Map<String, String>>());
758 758 babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
759 759 syncMaster(request.getBuildId());
760 760 BabyCheckModel model = getBabyCheckModel(request);
... ... @@ -1111,7 +1111,7 @@
1111 1111 // Criteria criterBabyCheck=Criteria.where("id").is(list.get(list.size()-1).get("id"));
1112 1112 // Query queryBabyCheck=Query.query(criterBabyCheck);
1113 1113 // BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
1114   -// resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():"");
  1114 +// resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():new ArrayList<Map<String, String>>());
1115 1115 // }else {
1116 1116 // resMap.put("qhdHighRiskInfo","");
1117 1117 // }
... ... @@ -1758,7 +1758,7 @@
1758 1758 Criteria criterBabyCheck=Criteria.where("id").is(babyCheckList.get(0).getId());
1759 1759 Query queryBabyCheck=Query.query(criterBabyCheck);
1760 1760 BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
1761   - base.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():null);
  1761 + base.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():new ArrayList<Map<String, String>>());
1762 1762 }else {
1763 1763 base.setQhdHighRiskInfo(null);
1764 1764 }
... ... @@ -2007,7 +2007,7 @@
2007 2007 //分娩孕周
2008 2008 result.setDueWeek(model.getDueWeek());
2009 2009 //秦皇岛-高危儿详情
2010   - result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():null);
  2010 + result.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(model.getQhdHighRiskInfo())?model.getQhdHighRiskInfo():new ArrayList<Map<String, String>>());
2011 2011 List <BabyChooseResult> list = new ArrayList <>();
2012 2012 if (listMap.get(model.getPid()) != null) {
2013 2013 list = listMap.get(model.getPid());
... ... @@ -2508,7 +2508,7 @@
2508 2508 model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():"");
2509 2509 model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():"");
2510 2510 //秦皇岛-新高危儿详情
2511   - model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():null);
  2511 + model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(checkModel.getQhdHighRiskInfo())?checkModel.getQhdHighRiskInfo():new ArrayList<Map<String, String>>());
2512 2512 //滦平-滦平-儿童检查3-6月龄套餐增加,氟化防龋治疗,一般细菌培养
2513 2513 if(null!=checkModel.getFhfz()){
2514 2514 model.setFhfz(checkModel.getFhfz());