From cb332e4c01c40ea18d9d32c9d076c74389b69eaf Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 5 Sep 2017 14:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/BabyModel.java | 9 +++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 4 ++-- .../com/lyms/platform/operate/web/facade/ViewFacade.java | 8 ++++++-- .../operate/web/request/BabyBookbuildingAddRequest.java | 10 ++++++++++ .../lyms/platform/operate/web/result/BabyBuildResult.java | 10 ++++++++++ .../lyms/platform/operate/web/result/BabyPageResult.java | 9 +++++++++ .../com/lyms/platform/operate/web/utils/MongoUtil.java | 15 +++++++++++++++ 7 files changed, 61 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index cba5538..6a4982d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -17,6 +17,15 @@ import java.util.List; public class BabyModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid(); + + // 儿童高危因素标记 + private List babyHighRiskReason; + public List getBabyHighRiskReason() { + return babyHighRiskReason; + } + public void setBabyHighRiskReason(List babyHighRiskReason) { + this.babyHighRiskReason = babyHighRiskReason; + } // 母亲高危因素 List mHighRiskReason; 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 a676f02..0f181ef 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 @@ -1041,6 +1041,7 @@ public class BabyBookbuildingFacade { private BabyModel getBabyModel(BabyBookbuildingAddRequest b,boolean isAdd) { // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段 BabyModel bm = new BabyModel(); + bm.setBabyHighRiskReason(b.getBabyHighRiskReason()); bm.setmHighRiskReason(b.getmHighRiskReason()); bm.setYn(YnEnums.YES.getId()); @@ -1219,9 +1220,8 @@ public class BabyBookbuildingFacade { */ private BabyBuildResult getBabyBuildResult(BabyModel model) { BabyBuildResult result = new BabyBuildResult(); -// result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); - result.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason())); + result.setBabyHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason())); result.setId(model.getId()); result.setPid(model.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 8b0b1dd..4f03f9a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -1079,6 +1079,7 @@ public class ViewFacade { return map; } + /** * 初诊查询 * @@ -1118,8 +1119,10 @@ public class ViewFacade { Map map = new HashMap<>(); - map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); - map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); +// map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); +// map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2())); + map.put("treatmentOpinion2Types", data.getTreatmentOpinion2Types()); + map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2())); map.put("quickenRemark",data.getQuickenRemark()); /* 基本信息 */ @@ -2843,6 +2846,7 @@ public class ViewFacade { result = result.convertToResult(model); result.setmHighRiskReason(mongoUtil.findNames(model.getmHighRiskReason())); + result.setBabyHighRiskReason(mongoUtil.findNames(model.getBabyHighRiskReason())); String homeAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index 953b575..95a5f54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -13,6 +13,16 @@ import java.util.Map; @Form public class BabyBookbuildingAddRequest { /***********母亲基本信息***********/ + // 儿童高危因素标记 + private List babyHighRiskReason; + + public List getBabyHighRiskReason() { + return babyHighRiskReason; + } + + public void setBabyHighRiskReason(List babyHighRiskReason) { + this.babyHighRiskReason = babyHighRiskReason; + } // 母亲高危因素 private List mHighRiskReason; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index ad43402..f534c8c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -9,6 +9,16 @@ import java.util.Map; public class BabyBuildResult { // 母亲高危因素 private List> mHighRiskReason; + // 儿童高危因素标记 + private List> babyHighRiskReason; + + public List> getBabyHighRiskReason() { + return babyHighRiskReason; + } + + public void setBabyHighRiskReason(List> babyHighRiskReason) { + this.babyHighRiskReason = babyHighRiskReason; + } private List mHighRiskReason2; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 8a14b0e..8e87cdc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -20,6 +20,15 @@ import java.util.Map; */ public class BabyPageResult implements IBasicResultConvert { + // 儿童高危因素标记 + private List babyHighRiskReason; + public List getBabyHighRiskReason() { + return babyHighRiskReason; + } + public void setBabyHighRiskReason(List babyHighRiskReason) { + this.babyHighRiskReason = babyHighRiskReason; + } + // 母亲高危因素 List mHighRiskReason; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index f83fbdf..d4ada24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -359,6 +359,21 @@ public class MongoUtil { return plantformConfig.getValue(); } + public List findPlatList2(Map> ids) { + List list = new ArrayList<>(); + if(MapUtils.isEmpty(ids)) { + return list; + } + Iterator>> iterator = ids.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry> next = iterator.next(); + StringBuilder sb = new StringBuilder(); + sb.append(next.getKey()).append(": ").append(org.apache.commons.lang.StringUtils.join(next.getValue().toArray(), ",")); + list.add(sb.toString()); + } + return list; + } + public List findPlatList(Map> ids) { List list = new ArrayList<>(); if(MapUtils.isEmpty(ids)) { -- 1.8.3.1