jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 894984ffed470f4eeab9e19555de623674f80a52

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

update

Showing 4 changed files with 45 additions and 10 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java View file @ 894984f
... ... @@ -583,6 +583,21 @@
583 583  
584 584 /***********************************************/
585 585  
  586 + /*************************************************
  587 + * 秦皇岛-高危儿因素详情
  588 + */
  589 +
  590 + private List<Map<String,String>> qhdHighRiskInfo;
  591 +
  592 + public List<Map<String, String>> getQhdHighRiskInfo() {
  593 + return qhdHighRiskInfo;
  594 + }
  595 +
  596 + public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
  597 + this.qhdHighRiskInfo = qhdHighRiskInfo;
  598 + }
  599 + /***********************************************************/
  600 +
586 601 public Integer getCheckDay() {
587 602 return checkDay;
588 603 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 894984f
... ... @@ -606,6 +606,8 @@
606 606 //秦皇岛-发育筛查模块
607 607 model.setDevelopAssess(StringUtils.isNotEmpty(request.getDevelopAssess())?request.getDevelopAssess():"");
608 608 model.setScreeningOther(StringUtils.isNotEmpty(request.getScreeningOther())?request.getScreeningOther():"");
  609 + //秦皇岛-儿保检查-高危儿详情
  610 + model.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(request.getQhdHighRiskInfo())?request.getQhdHighRiskInfo():null);
609 611  
610 612 return model;
611 613 }
... ... @@ -1071,7 +1073,7 @@
1071 1073 Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId);
1072 1074 Query queryBabyCheck=Query.query(criterBabyCheck);
1073 1075 BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
1074   - resMap.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo());
  1076 + resMap.put("qhdHighRiskInfo",CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():"");
1075 1077 }else {
1076 1078 resMap.put("qhdHighRiskInfo","");
1077 1079 }
... ... @@ -1264,7 +1266,7 @@
1264 1266 map.put("height", babyCheckModel.getHeight());
1265 1267 map.put("weight", babyCheckModel.getWeight());
1266 1268 //秦皇岛需求，查询最后一次检查的高危详情
1267   - map.put("qhdHighRiskInfo",babyCheckModel.getHighRiskInfo());
  1269 + map.put("qhdHighRiskInfo",babyCheckModel.getQhdHighRiskInfo());
1268 1270  
1269 1271 list.add(map);
1270 1272 }
... ... @@ -1677,11 +1679,14 @@
1677 1679 Criteria criterList=Criteria.where("buildId").is(id);
1678 1680 Query queryList=Query.query(criterList).with(new Sort(Sort.Direction.DESC, "checkDate"));
1679 1681 List<BabyCheckModel> babyCheckList=mongoTemplate.find(queryList, BabyCheckModel.class);
1680   - String babyCheckId=babyCheckList.get(0).getId();
1681   - Criteria criterBabyCheck=Criteria.where("id").is(babyCheckId);
1682   - Query queryBabyCheck=Query.query(criterBabyCheck);
1683   - BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
1684   - base.setQhdHighRiskInfo(babyCheckModel.getHighRiskInfo());
  1682 + if(CollectionUtils.isNotEmpty(babyCheckList)){
  1683 + Criteria criterBabyCheck=Criteria.where("id").is(babyCheckList.get(0).getId());
  1684 + Query queryBabyCheck=Query.query(criterBabyCheck);
  1685 + BabyCheckModel babyCheckModel=mongoTemplate.findOne(queryBabyCheck,BabyCheckModel.class);
  1686 + base.setQhdHighRiskInfo(CollectionUtils.isNotEmpty(babyCheckModel.getQhdHighRiskInfo())?babyCheckModel.getQhdHighRiskInfo():null);
  1687 + }else {
  1688 + base.setQhdHighRiskInfo(null);
  1689 + }
1685 1690 }else {
1686 1691 base.setQhdHighRiskInfo(null);
1687 1692 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java View file @ 894984f
... ... @@ -545,6 +545,21 @@
545 545  
546 546 /***********************************************/
547 547  
  548 + /*************************************************
  549 + * 秦皇岛-高危儿因素详情
  550 + */
  551 +
  552 + private List<Map<String,String>> qhdHighRiskInfo;
  553 +
  554 + public List<Map<String, String>> getQhdHighRiskInfo() {
  555 + return qhdHighRiskInfo;
  556 + }
  557 +
  558 + public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
  559 + this.qhdHighRiskInfo = qhdHighRiskInfo;
  560 + }
  561 + /***********************************************************/
  562 +
548 563 public String getTcmGuide() {
549 564 return tcmGuide;
550 565 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java View file @ 894984f
... ... @@ -130,13 +130,13 @@
130 130 /***********************************************
131 131 *秦皇岛 儿保检查诊断位置用儿童高危详情替换
132 132 */
133   - private List<String> qhdHighRiskInfo;
  133 + private List<Map<String,String>> qhdHighRiskInfo;
134 134  
135   - public List<String> getQhdHighRiskInfo() {
  135 + public List<Map<String, String>> getQhdHighRiskInfo() {
136 136 return qhdHighRiskInfo;
137 137 }
138 138  
139   - public void setQhdHighRiskInfo(List<String> qhdHighRiskInfo) {
  139 + public void setQhdHighRiskInfo(List<Map<String, String>> qhdHighRiskInfo) {
140 140 this.qhdHighRiskInfo = qhdHighRiskInfo;
141 141 }
142 142