diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BabyDeformityEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyDeformityEnums.java new file mode 100644 index 0000000..4f7d255 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BabyDeformityEnums.java @@ -0,0 +1,58 @@ +package com.lyms.platform.common.enums; + +/** + * @auther yangfei + * @createTime 2018年03月27日 17时23分 + * @discription 新生儿畸形信息 + */ +public enum BabyDeformityEnums { + A1("jxWn","无脑畸形"), + A2("jxJzl","脊柱裂"), + A3("jxNpc","脑彭出"), + A4("jxNjs","先天性脑积水"), + A5("jxEl","腭裂"), + A6("jxCl","唇裂"), + A7("jxClhb","唇裂合并腭裂"), + A8("jxXe","小耳(包括无耳)"), + A9("jxWe","外耳其他畸形(小耳、无耳除外)"), + A10("jxSdbs","食道闭锁或狭窄"), + A11("jxZcgm","直肠肛门闭锁或狭窄(包括无肛)"), + A12("jxNdxl","尿道下裂"), + A13("jxPwwf","膀胱外翻"), + A14("jxMtn","马蹄内翻足"), + A15("jxDz","多指"), + A16("jxDc","多趾"), + A17("jxBz","并指"), + A18("jxBc","并趾"), + A19("jxZtds","肢体短缩包括缺指(趾)、裂手(足)]"), + A20("jxXtxe","先天性隔疝"), + A21("jxQpc","脐膨出"), + A22("jxFl","腹裂"), + A23("jxLtst","联体双胎"), + A24("jxTszh","唐氏综合征(21-三体综合征)"), + A25("jxXtx","先天性心脏病"); + + private BabyDeformityEnums(String id, String name) { + this.id= id; + this.name = name; + } + + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} 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 3daad3c..6f13e60 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 @@ -1,12 +1,12 @@ package com.lyms.platform.operate.web; -import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.enums.BabyDeformityEnums; +import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.pojo.BasicConfig; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; import java.util.Comparator; -import java.util.Date; import java.util.List; import java.util.Map; @@ -23,8 +23,9 @@ public class Test { // List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); // System.out.println(jctc); - int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date()); - System.out.println(day); + System.out.println(EnumUtil.toJson(BabyDeformityEnums.class)); + // int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date()); + // System.out.println(day); // String yl = DateUtil.getBabyMonthAge(DateUtil.parseYMD("2018-04-10"),new Date()); // System.out.println(yl); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 293a767..e7abdd3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1083,6 +1083,9 @@ public class MatDeliverFacade { map.put("getFmDzEnums", getFmDzEnums()); map.put("getRenShenJieJuEnums", getRenShenJieJuEnums()); map.put("organizations", convert()); + // 新生儿畸形 + List> deformity = EnumUtil.toJson(BabyDeformityEnums.class); + map.put("deformity", deformity); map.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } 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 9627c0c..9614194 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 @@ -184,6 +184,16 @@ public class BabyPageResult implements IBasicResultConvert