From 02c0621db188c0524ac80b01a915beb2263fb9f6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 1 Jul 2016 16:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=84=BF=E7=AB=A5=E6=A3=80?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/FyTypeEnums.java | 55 ++++++++++++++++++++++ .../lyms/platform/common/enums/WyTypeEnums.java | 55 ++++++++++++++++++++++ .../com/lyms/platform/pojo/BabyCheckModel.java | 23 +++++++++ .../web/controller/BabyCheckController.java | 12 ++++- .../operate/web/facade/BabyCheckFacade.java | 41 ++++++++++++++-- .../operate/web/request/BabyCheckRequest.java | 31 ++++++++++-- .../operate/web/result/BabyCheckResult.java | 38 ++++++++++++--- 7 files changed, 241 insertions(+), 14 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java new file mode 100644 index 0000000..5f16170 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java @@ -0,0 +1,55 @@ +package com.lyms.platform.common.enums; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * + * 抚养方式 + * + * @author Administrator + * + */ +public enum FyTypeEnums { + + FQ(0,"父亲"),MQ(1,"母亲"),ZF(2,"祖父"),ZM(3,"祖母"),WZF(4,"祖父"),WZM(5,"祖母"),QT(6,"其它"); + + private FyTypeEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getNameById(int id){ + for(FyTypeEnums s : values()){ + if(id==s.id){ + return s.getName(); + } + } + return ""; + } + + public static List getFyTypeEnums() { + List list = new ArrayList<>(); + for (FyTypeEnums e : FyTypeEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + + private int id; + + private String name; + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java new file mode 100644 index 0000000..fe25a56 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java @@ -0,0 +1,55 @@ +package com.lyms.platform.common.enums; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * + * 喂养方式 + * + * @author Administrator + * + */ +public enum WyTypeEnums { + + MR(0,"纯母乳喂养"),HH(1,"混合喂养"),RG(2,"人工喂养"); + + private WyTypeEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getNameById(int id){ + for(WyTypeEnums s : values()){ + if(id==s.id){ + return s.getName(); + } + } + return ""; + } + + public static List getWyTypeEnums() { + List list = new ArrayList<>(); + for (WyTypeEnums e : WyTypeEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + + private int id; + + private String name; + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} \ No newline at end of file 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 851dcbf..04ca4f3 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 @@ -5,6 +5,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Field; import java.util.Date; +import java.util.Map; /** * 儿保检查 @@ -59,6 +60,9 @@ public class BabyCheckModel extends BaseModel { //发病情况 private String morbidity; + //药物过敏史 + private String drugGllergic; + /******问诊情况****/ /******一般检查****/ @@ -77,6 +81,8 @@ public class BabyCheckModel extends BaseModel { //身长别体重 private String heightWeight; + private String chestw; + //发育评价 @@ -213,6 +219,23 @@ public class BabyCheckModel extends BaseModel { //创建时间 private Date created; + + public String getDrugGllergic() { + return drugGllergic; + } + + public void setDrugGllergic(String drugGllergic) { + this.drugGllergic = drugGllergic; + } + + public String getChestw() { + return chestw; + } + + public void setChestw(String chestw) { + this.chestw = chestw; + } + public Date getModified() { return modified; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 2969282..3771b6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -134,7 +134,17 @@ public class BabyCheckController extends BaseController{ @ResponseBody public BaseObjectResponse queryGrowthEvaluate(@RequestParam(required = true) Double height,@RequestParam(required = true) Integer sex ,@RequestParam(required = true) String birth,@RequestParam(required = true) Double weight){ - return babyCheckFacade.queryGrowthEvaluate(height, sex,birth,weight); + return babyCheckFacade.queryGrowthEvaluate(height, sex, birth, weight); + + } + + /** + * 基础数据 + */ + @RequestMapping(value = "/getBaseConfig", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse getBaseConfig(){ + return babyCheckFacade.getBaseConfig(); } 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 bc13625..b703b2c 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 @@ -2,16 +2,18 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.SexEnum; -import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BabyCheckRequest; import com.lyms.platform.operate.web.result.BabyBasicResult; import com.lyms.platform.operate.web.result.BabyCheckResult; import com.lyms.platform.operate.web.result.BabyChooseResult; +import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.pojo.AwModel; import com.lyms.platform.pojo.BabyCheckModel; import com.lyms.platform.pojo.BabyModel; @@ -32,6 +34,7 @@ public class BabyCheckFacade { @Autowired private BabyBookbuildingService babyBookbuildingService; + private BaseObjectResponse baseConfig; /** * 更新检查 @@ -92,7 +95,7 @@ public class BabyCheckFacade { model.setBilirubinHead(request.getBilirubinHead()); model.setBilirubinChest(request.getBilirubinChest()); model.setBilirubinBelly(request.getBilirubinBelly()); - model.setBregma(request.getBregma()); + model.setBregma(JsonUtil.obj2JsonString(request.getBregma())); model.setTooth(request.getTooth()); model.setFaceColor(request.getFaceColor()); model.setSkin(request.getSkin()); @@ -130,6 +133,10 @@ public class BabyCheckFacade { model.setNextDate(DateUtil.parseYMD(request.getNextDate())); model.setHighRisk(request.getHighRisk()); + model.setDrugGllergic(JsonUtil.obj2JsonString(request.getDrugGllergic())); + model.setChestw(request.getChestw()); + + model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); return model; @@ -345,7 +352,7 @@ public class BabyCheckFacade { model.setBilirubinHead(checkModel.getBilirubinHead()); model.setBilirubinChest(checkModel.getBilirubinChest()); model.setBilirubinBelly(checkModel.getBilirubinBelly()); - model.setBregma(checkModel.getBregma()); + model.setBregma(JsonUtil.str2Obj(checkModel.getBregma(), Map.class)); model.setTooth(checkModel.getTooth()); model.setFaceColor(checkModel.getFaceColor()); model.setSkin(checkModel.getSkin()); @@ -383,6 +390,8 @@ public class BabyCheckFacade { model.setNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate())); model.setHighRisk(checkModel.getHighRisk()); + model.setDrugGllergic(JsonUtil.str2Obj(checkModel.getBregma(), Map.class)); + model.setChestw(checkModel.getChestw()); return model; @@ -534,4 +543,28 @@ public class BabyCheckFacade { br.setErrormsg("成功"); return br; } + + public BaseObjectResponse getBaseConfig() { + + Map map = new HashMap(); + + //抚养方式 + List fyType = FyTypeEnums.getFyTypeEnums(); + map.put("fyType", fyType); + + //喂养方式 + List wyType = WyTypeEnums.getWyTypeEnums(); + map.put("wyType", wyType); + + map.put("initCheckDate", DateUtil.getyyyy_MM_dd(new Date())); + + + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(map); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + + return objectResponse; + } } 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 ddf189c..c4ee731 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 @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.request; +import java.util.Map; + /** * Created by lqy on 2016/6/20. * 儿保检查 @@ -44,6 +46,9 @@ public class BabyCheckRequest { //发病情况 private String morbidity; + //药物过敏史 + private Map drugGllergic; + /******问诊情况****/ /******一般检查****/ @@ -59,6 +64,9 @@ public class BabyCheckRequest { //头围 private String head; + //胸围 + private String chestw; + //身长别体重 private String heightWeight; @@ -81,7 +89,8 @@ public class BabyCheckRequest { private String bilirubinBelly; //前卤 - private String bregma; + private Map bregma; + //牙齿 private String tooth; @@ -202,6 +211,14 @@ public class BabyCheckRequest { this.checkDate = checkDate; } + public String getChestw() { + return chestw; + } + + public void setChestw(String chestw) { + this.chestw = chestw; + } + /******诊断指导****/ @@ -414,11 +431,19 @@ public class BabyCheckRequest { this.nextDate = nextDate; } - public String getBregma() { + public Map getDrugGllergic() { + return drugGllergic; + } + + public void setDrugGllergic(Map drugGllergic) { + this.drugGllergic = drugGllergic; + } + + public Map getBregma() { return bregma; } - public void setBregma(String bregma) { + public void setBregma(Map bregma) { this.bregma = bregma; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 4b7c1be..732c85e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.result; +import java.util.Map; + /** * Created by Administrator on 2016/6/21. */ @@ -41,6 +43,10 @@ public class BabyCheckResult { //发病情况 private String morbidity; + //药物过敏史 + private Map drugGllergic; + + /******问诊情况****/ /******一般检查****/ @@ -59,6 +65,8 @@ public class BabyCheckResult { //身长别体重 private String heightWeight; + //胸围 + private String chestw; //发育评价 @@ -78,7 +86,7 @@ public class BabyCheckResult { private String bilirubinBelly; //前卤 - private String bregma; + private Map bregma; //牙齿 private String tooth; @@ -188,8 +196,30 @@ public class BabyCheckResult { //是否高危儿童 0 非高危 1高危 private Integer highRisk; + public Map getDrugGllergic() { + return drugGllergic; + } + + public void setDrugGllergic(Map drugGllergic) { + this.drugGllergic = drugGllergic; + } + + public String getChestw() { + return chestw; + } + + public void setChestw(String chestw) { + this.chestw = chestw; + } + + public void setBregma(Map bregma) { + this.bregma = bregma; + } + /******诊断指导****/ + + public String getId() { return id; } @@ -358,14 +388,10 @@ public class BabyCheckResult { this.bilirubinBelly = bilirubinBelly; } - public String getBregma() { + public Map getBregma() { return bregma; } - public void setBregma(String bregma) { - this.bregma = bregma; - } - public String getTooth() { return tooth; } -- 1.8.3.1