From f6995f094eb61e656459b4d3af283c933415eefc Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 21 Jul 2017 17:12:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=9F=8E=E5=A6=87=E5=B9=BC=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/common/enums/CZFmTypeEnums.java | 47 +++++++++++++++ .../lyms/platform/common/enums/FitnessEnums.java | 46 +++++++++++++++ .../platform/common/enums/GestaMonthEnums.java | 52 ++++++++++++++++ .../java/com/lyms/platform/pojo/AntExChuModel.java | 62 ++++++++++++++++++- .../web/facade/AntenatalExaminationFacade.java | 8 +++ .../platform/operate/web/facade/ViewFacade.java | 21 +++++++ .../operate/web/request/AntExcAddRequest.java | 69 ++++++++++++++++++++++ .../operate/web/result/AntexChuResult.java | 67 +++++++++++++++++++++ .../platform/operate/web/utils/InitDataUtils.java | 37 +++++++++++- 9 files changed, 407 insertions(+), 2 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/FitnessEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/GestaMonthEnums.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java new file mode 100644 index 0000000..8e44159 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java @@ -0,0 +1,47 @@ +package com.lyms.platform.common.enums; + +/** + * @auther yangfei + * @createTime 2017年07月21日 16时01分 + * @discription 分娩方式 + */ +public enum CZFmTypeEnums { + O("顺产", 1), + O1("剖宫产", 2), + O2("引产", 3), + O3("人工流产", 4), + O4("药物流产", 5); + private CZFmTypeEnums(String name, int id) { + this.id = id; + this.name = name; + } + private int id; + private String name; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public static String getTitle(int id) { + if (id == 0) { + return ""; + } + for (CZFmTypeEnums cfEnums : CZFmTypeEnums.values()) { + if (id == cfEnums.getId()) { + return cfEnums.getName(); + } + } + return ""; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FitnessEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FitnessEnums.java new file mode 100644 index 0000000..8afafcc --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FitnessEnums.java @@ -0,0 +1,46 @@ +package com.lyms.platform.common.enums; + +/** + * @auther yangfei + * @createTime 2017年07月21日 16时05分 + * @discription 健康状况 + */ +public enum FitnessEnums { + O("健康", 1), + O1("不健康", 2), + O2("其他", 3); + private FitnessEnums(String name, int id) { + this.id = id; + this.name = name; + } + private int id; + private String name; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public static String getTitle(int id) { + if (id == 0) { + return ""; + } + for (FitnessEnums cfEnums : FitnessEnums.values()) { + if (id == cfEnums.getId()) { + return cfEnums.getName(); + } + } + return ""; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/GestaMonthEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/GestaMonthEnums.java new file mode 100644 index 0000000..329a3b1 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/GestaMonthEnums.java @@ -0,0 +1,52 @@ +package com.lyms.platform.common.enums; + +/** + * @auther yangfei + * @createTime 2017年07月21日 15时17分 + * @discription 分娩月份 + */ +public enum GestaMonthEnums { + OM("1月", 1), + TM("2月", 2), + TRM("3月", 3), + FM("4月", 4), + FIM("5月", 5), + SM("6月", 6), + SEM("7月", 7), + EM("8月", 8), + ZM("足月", 9); + GestaMonthEnums(String name, int value) { + this.name = name; + this.value = value; + } + private String name; + private int value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public static String getTitle(int id) { + if (id == 0) { + return ""; + } + for (GestaMonthEnums cfEnums : GestaMonthEnums.values()) { + if (id == cfEnums.getValue()) { + return cfEnums.getName(); + } + } + return ""; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 20f5730..007953a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -6,7 +6,6 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; -import java.util.Map; /** * 产前检查初诊模型 @@ -68,6 +67,18 @@ public class AntExChuModel extends BaseModel { private Integer stillbirth; //死产 private Integer stillChan ; + //妊娠月份 + private Integer gestaMonth; + //妊娠时间 + private String gestaDate; + //分娩方式 + private Integer fmType; + //分娩方式备注 + private String fmTypeRemark; + //健康状况 + private Integer fitness; + //健康状况备注 + private String fitnessRemark; // 身高 private String height; //体重 @@ -187,6 +198,55 @@ public class AntExChuModel extends BaseModel { return yljzxs; } + public Integer getGestaMonth() { + return gestaMonth; + } + + public void setGestaMonth(Integer gestaMonth) { + this.gestaMonth = gestaMonth; + } + + public Integer getFmType() { + return fmType; + } + + public void setFmType(Integer fmType) { + this.fmType = fmType; + } + + public String getFmTypeRemark() { + return fmTypeRemark; + } + + public void setFmTypeRemark(String fmTypeRemark) { + this.fmTypeRemark = fmTypeRemark; + } + + public Integer getFitness() { + return fitness; + } + + public void setFitness(Integer fitness) { + this.fitness = fitness; + } + + public String getGestaDate() { + return gestaDate; + } + + public void setGestaDate(String gestaDate) { + this.gestaDate = gestaDate; + } + + + public String getFitnessRemark() { + return fitnessRemark; + } + + public void setFitnessRemark(String fitnessRemark) { + this.fitnessRemark = fitnessRemark; + } + public void setYljzxs(String yljzxs) { this.yljzxs = yljzxs; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 55107d1..5e985f3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2298,6 +2298,14 @@ public class AntenatalExaminationFacade { //横指 map.put("getHengZhi",InitDataUtils. getHengZhi()); map.put("getSyjg", InitDataUtils.getSyjg()); + //妊娠月份 + map.put("gestaMonth", InitDataUtils.getGestaMonth()); + //妊娠月份 + map.put("gestaMonth", InitDataUtils.getGestaMonth()); + //分娩方式 + map.put("fmType", InitDataUtils.getCZFmType()); + //健康 + map.put("fitness", InitDataUtils.getFitness()); map.put("getHighRisk", basicConfigFacade.getHighRisk()); map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); map.put("xx", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING)); 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 11fda76..d13b505 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 @@ -1132,6 +1132,27 @@ public class ViewFacade { map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("mremark", patients.getMremark()); + //妊娠月份 + if(data.getGestaMonth()!=null){ + map.put("gestaMonth", GestaMonthEnums.getTitle(data.getGestaMonth())); + } + + + //妊娠时间 + map.put("gestaDate", data.getGestaDate()); + //分娩方式 + if(data.getFmType()!=null){ + map.put("fmType", CZFmTypeEnums.getTitle(data.getFmType())); + } + //分娩方式备注 + map.put("fmTypeRemark", data.getFmTypeRemark()); + //健康状况 + if(data.getFitness()!=null){ + map.put("fitness", FitnessEnums.getTitle(data.getFitness())); + } + //健康状况备注 + map.put("fitnessRemark", data.getFitnessRemark()); + //处理高危因素 getRisk(data.getHighrisk(), data.getOtherHighRisk(), map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 0725587..4695b48 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -132,6 +132,19 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String nextCheckTime; //前端计算出来的孕周 private String cDueWeek; + //妊娠月份 + private String gestaMonth; + //妊娠时间 + private String gestaDate; + //分娩方式 + private String fmType; + //分娩方式备注 + private String fmTypeRemark; + //健康状况 + private String fitness; + //健康状况备注 + private String fitnessRemark; + /** * 辅助检查结果录入 @@ -969,6 +982,54 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.highriskSocre = highriskSocre; } + public String getGestaMonth() { + return gestaMonth; + } + + public void setGestaMonth(String gestaMonth) { + this.gestaMonth = gestaMonth; + } + + public String getGestaDate() { + return gestaDate; + } + + public void setGestaDate(String gestaDate) { + this.gestaDate = gestaDate; + } + + public String getFmType() { + return fmType; + } + + public void setFmType(String fmType) { + this.fmType = fmType; + } + + public String getFmTypeRemark() { + return fmTypeRemark; + } + + public void setFmTypeRemark(String fmTypeRemark) { + this.fmTypeRemark = fmTypeRemark; + } + + public String getFitness() { + return fitness; + } + + public void setFitness(String fitness) { + this.fitness = fitness; + } + + public String getFitnessRemark() { + return fitnessRemark; + } + + public void setFitnessRemark(String fitnessRemark) { + this.fitnessRemark = fitnessRemark; + } + public String getNextCheckTime() { return nextCheckTime; } @@ -1102,6 +1163,14 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + + antExChuModel.setGestaMonth(gestaMonth); + antExChuModel.setGestaDate(gestaDate); + antExChuModel.setFmType(fmType); + antExChuModel.setFmTypeRemark(fmTypeRemark); + antExChuModel.setFitness(fitness); + antExChuModel.setFitnessRemark(fitnessRemark); + antExChuModel.setYinchan(yinchan); antExChuModel.setGongwaiyun(gongwaiyun); antExChuModel.setYaowu(yaowu); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index cda9cf6..e71ad85 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -71,6 +71,18 @@ public class AntexChuResult { private Map fksxHistory; // 叶酸服用 private Map ysfyHistory; + //妊娠月份 + private Integer gestaMonth; + //妊娠时间 + private String gestaDate; + //分娩方式 + private Integer fmType; + //分娩方式备注 + private String fmTypeRemark; + //健康状况 + private Integer fitness; + //健康状况备注 + private String fitnessRemark; private Map hHealthInfo; //传染病史 @@ -1044,6 +1056,54 @@ public class AntexChuResult { return ymjzHistory; } + public Integer getGestaMonth() { + return gestaMonth; + } + + public void setGestaMonth(Integer gestaMonth) { + this.gestaMonth = gestaMonth; + } + + public String getGestaDate() { + return gestaDate; + } + + public void setGestaDate(String gestaDate) { + this.gestaDate = gestaDate; + } + + public Integer getFmType() { + return fmType; + } + + public void setFmType(Integer fmType) { + this.fmType = fmType; + } + + public String getFmTypeRemark() { + return fmTypeRemark; + } + + public void setFmTypeRemark(String fmTypeRemark) { + this.fmTypeRemark = fmTypeRemark; + } + + public Integer getFitness() { + return fitness; + } + + public void setFitness(Integer fitness) { + this.fitness = fitness; + } + + public String getFitnessRemark() { + return fitnessRemark; + } + + public void setFitnessRemark(String fitnessRemark) { + this.fitnessRemark = fitnessRemark; + } + public void setYmjzHistory(Map ymjzHistory) { this.ymjzHistory = ymjzHistory; } @@ -1106,6 +1166,13 @@ public class AntexChuResult { public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { + setGestaMonth(antExChuModel.getGestaMonth()); + setGestaDate(antExChuModel.getGestaDate()); + setFmType(antExChuModel.getFmType()); + setFmTypeRemark(antExChuModel.getFmTypeRemark()); + setFitness(antExChuModel.getFitness()); + setFitnessRemark(antExChuModel.getFitnessRemark()); + setDiagnosisOther(antExChuModel.getDiagnosisOther()); setBarCode(antExChuModel.getBarCode()); setId(antExChuModel.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java index 66f2c61..d3d2ee0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java @@ -122,7 +122,6 @@ public class InitDataUtils { } - //胎方位 public static List getFetPosition() { List list = new ArrayList<>(); @@ -170,6 +169,42 @@ public class InitDataUtils { } return list; } + + public static List getGestaMonth(){ + List list = new ArrayList<>(); + for (GestaMonthEnums enums : GestaMonthEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getValue()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + + public static List getCZFmType(){ + List list = new ArrayList<>(); + for (CZFmTypeEnums enums : CZFmTypeEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + + public static List getFitness(){ + List list = new ArrayList<>(); + for (FitnessEnums enums : FitnessEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + public static List getSyjg(){ List list = new ArrayList<>(); for (SYJGEums enums : SYJGEums.values()) { -- 1.8.3.1