diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyExceptionEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyExceptionEnums.java new file mode 100644 index 0000000..f68775a --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyExceptionEnums.java @@ -0,0 +1,56 @@ +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 PregnancyExceptionEnums { + + //妊娠剧吐 先兆流产 接触放射性及毒物 病毒感染 发热 孕期患病 应用药物 + RSJT(1,"妊娠剧吐"),XZLC(2,"先兆流产"),FSX(3,"接触放射性及毒物"),BDGR(4,"病毒感染"),FR(5,"发热"),YQHB(6,"孕期患病"),YYYW(7,"应用药物"); + + private PregnancyExceptionEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getNameById(int id){ + for(PregnancyExceptionEnums sex : values()){ + if(id==sex.id){ + return sex.getName(); + } + } + return ""; + } + + public static List getExpEnums() { + List list = new ArrayList<>(); + for (PregnancyExceptionEnums e : PregnancyExceptionEnums.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/PregnancyMethodEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyMethodEnums.java new file mode 100644 index 0000000..7c25375 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PregnancyMethodEnums.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 PregnancyMethodEnums { + + RSSY(1,"妊娠实验"),BC(2,"B超"),FKJC(3,"妇科检查"); + + private PregnancyMethodEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getNameById(int id){ + for(PregnancyMethodEnums sex : values()){ + if(id==sex.id){ + return sex.getName(); + } + } + return ""; + } + + public static List getExpEnums() { + List list = new ArrayList<>(); + for (PregnancyMethodEnums e : PregnancyMethodEnums.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/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 93b7d67..62047b0 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 @@ -359,6 +359,39 @@ public class AntExChuModel extends BaseModel { */ private String configItemId; + + //妊娠方法 + private Integer pregnancyMethod; + //符合月份 1是 2否 + private Integer monthCompliance; + + //妊娠异常 + private Integer pregnancyExcpetion; + + public Integer getPregnancyExcpetion() { + return pregnancyExcpetion; + } + + public void setPregnancyExcpetion(Integer pregnancyExcpetion) { + this.pregnancyExcpetion = pregnancyExcpetion; + } + + public Integer getPregnancyMethod() { + return pregnancyMethod; + } + + public void setPregnancyMethod(Integer pregnancyMethod) { + this.pregnancyMethod = pregnancyMethod; + } + + public Integer getMonthCompliance() { + return monthCompliance; + } + + public void setMonthCompliance(Integer monthCompliance) { + this.monthCompliance = monthCompliance; + } + public String getConfigItemId() { return configItemId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 6264a5b..8d308e7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -17,7 +17,6 @@ public class Test { private static org.apache.log4j.Logger log = Logger.getLogger("HTTP-INVOKE"); public static void main(String[] args) throws Exception { - } 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 d704cc1..f5e8a28 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 @@ -3412,6 +3412,10 @@ public class AntenatalExaminationFacade { map.put("gestaMonth", InitDataUtils.getGestaMonth()); //分娩方式 map.put("fmType", InitDataUtils.getCZFmType()); + //妊娠方法 + map.put("pregnancyMethod", InitDataUtils.getPregnancyMethodEnums()); + //妊娠异常 + map.put("pregnancyException", InitDataUtils.getPregnancyExceptionEnums()); //健康 map.put("fitness", InitDataUtils.getFitness()); map.put("getHighRisk", basicConfigFacade.getHighRisk()); 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 e854014..79e9f3d 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 @@ -2126,6 +2126,10 @@ public class ViewFacade { map.put("first", (data.getFirst() == null || data.getFirst() == 1) ? "否" : "是"); map.put("sieveStatus", sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId())); + map.put("monthCompliance",data.getMonthCompliance() == null ? "" : data.getMonthCompliance() == 1 ? "是" : "否"); + map.put("pregnancyMethod", data.getPregnancyMethod() == null ? "" : PregnancyMethodEnums.getNameById(data.getPregnancyMethod())); + map.put("pregnancyMethod", data.getPregnancyExcpetion() == null ? "" : PregnancyExceptionEnums.getNameById(data.getPregnancyExcpetion())); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(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 aec60ae..bf6105f 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 @@ -352,6 +352,39 @@ public class AntExcAddRequest implements IBasicRequestConvert { */ private String configItemId; + + //妊娠方法 + private Integer pregnancyMethod; + //符合月份 1是 2否 + private Integer monthCompliance; + + //妊娠异常 + private Integer pregnancyExcpetion; + + public Integer getPregnancyExcpetion() { + return pregnancyExcpetion; + } + + public void setPregnancyExcpetion(Integer pregnancyExcpetion) { + this.pregnancyExcpetion = pregnancyExcpetion; + } + + public Integer getPregnancyMethod() { + return pregnancyMethod; + } + + public void setPregnancyMethod(Integer pregnancyMethod) { + this.pregnancyMethod = pregnancyMethod; + } + + public Integer getMonthCompliance() { + return monthCompliance; + } + + public void setMonthCompliance(Integer monthCompliance) { + this.monthCompliance = monthCompliance; + } + public String getConfigItemId() { return configItemId; } @@ -1850,9 +1883,10 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setYljzxs(yljzxs); antExChuModel.setJzxgyhwmkt(jzxgyhwmkt); antExChuModel.setEdema(edema); - antExChuModel.setFirst(first); - + antExChuModel.setPregnancyMethod(pregnancyMethod); + antExChuModel.setMonthCompliance(monthCompliance); + antExChuModel.setPregnancyExcpetion(pregnancyExcpetion); return antExChuModel; } 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 d3d2ee0..ab6fc85 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 @@ -255,4 +255,34 @@ public class InitDataUtils { } return list; } + + /** + * 妊娠方法 + * @return + */ + public static List getPregnancyMethodEnums() { + List list = new ArrayList<>(); + for (PregnancyMethodEnums enums : PregnancyMethodEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } + + /** + * 妊娠异常 + * @return + */ + public static List getPregnancyExceptionEnums() { + List list = new ArrayList<>(); + for (PregnancyExceptionEnums enums : PregnancyExceptionEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } }