From 894984ffed470f4eeab9e19555de623674f80a52 Mon Sep 17 00:00:00 2001 From: shiyang Date: Fri, 10 Sep 2021 09:57:06 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/BabyCheckModel.java | 15 +++++++++++++++ .../platform/operate/web/facade/BabyCheckFacade.java | 19 ++++++++++++------- .../operate/web/request/BabyCheckRequest.java | 15 +++++++++++++++ .../platform/operate/web/result/BabyBasicResult.java | 6 +++--- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index bd12711..2aa79a7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -583,6 +583,21 @@ public class BabyCheckModel extends BaseModel { /***********************************************/ + /************************************************* + * 秦皇岛-高危儿因素详情 + */ + + private List> qhdHighRiskInfo; + + public List> getQhdHighRiskInfo() { + return qhdHighRiskInfo; + } + + public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { + this.qhdHighRiskInfo = qhdHighRiskInfo; + } + /***********************************************************/ + public Integer getCheckDay() { return checkDay; } 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 9d34378..feb1af5 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 @@ -606,6 +606,8 @@ 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); return model; } @@ -1071,7 +1073,7 @@ public class BabyCheckFacade extends BaseServiceImpl { Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId); Query queryBabyCheck=Query.query(criterBabyCheck); BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class); - resMap.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo()); + resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():""); }else { resMap.put("qhdHighRiskInfo",""); } @@ -1264,7 +1266,7 @@ public class BabyCheckFacade extends BaseServiceImpl { map.put("height", babyCheckModel.getHeight()); map.put("weight", babyCheckModel.getWeight()); //秦皇岛需求，查询最后一次检查的高危详情 - map.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo()); + map.put("qhdHighRiskInfo",babyCheckModel.getQhdHighRiskInfo()); list.add(map); } @@ -1677,11 +1679,14 @@ public class BabyCheckFacade extends BaseServiceImpl { Criteria criterList=Criteria.where("buildId").is(id); Query queryList=Query.query(criterList).with(new Sort(Sort.Direction.DESC, "checkDate")); List babyCheckList=mongoTemplate.find(queryList, BabyCheckModel.class); - String babyCheckId=babyCheckList.get(0).getId(); - Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId); - Query queryBabyCheck=Query.query(criterBabyCheck); - BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class); - base.setQhdHighRiskInfo(babyCheckModel.getHighRiskInfo()); + if(CollectionUtils.isNotEmpty(babyCheckList)){ + 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); + }else { + base.setQhdHighRiskInfo(null); + } }else { base.setQhdHighRiskInfo(null); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 1b834ba..50ac3dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -545,6 +545,21 @@ public class BabyCheckRequest { /***********************************************/ + /************************************************* + * 秦皇岛-高危儿因素详情 + */ + + private List> qhdHighRiskInfo; + + public List> getQhdHighRiskInfo() { + return qhdHighRiskInfo; + } + + public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { + this.qhdHighRiskInfo = qhdHighRiskInfo; + } + /***********************************************************/ + public String getTcmGuide() { return tcmGuide; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java index 81d8c42..3ec70f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java @@ -130,13 +130,13 @@ public class BabyBasicResult { /*********************************************** *秦皇岛 儿保检查诊断位置用儿童高危详情替换 */ - private List qhdHighRiskInfo; + private List> qhdHighRiskInfo; - public List getQhdHighRiskInfo() { + public List> getQhdHighRiskInfo() { return qhdHighRiskInfo; } - public void setQhdHighRiskInfo(List qhdHighRiskInfo) { + public void setQhdHighRiskInfo(List> qhdHighRiskInfo) { this.qhdHighRiskInfo = qhdHighRiskInfo; } -- 1.8.3.1