Commit bb0e2ddf61fd30d525da11dc4e6c329f433ede6c
1 parent
10ff1ffba1
Exists in
master
and in
6 other branches
增加儿童畸形搜索条件
Showing 4 changed files with 77 additions and 5 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/BabyDeformityEnums.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
platform-common/src/main/java/com/lyms/platform/common/enums/BabyDeformityEnums.java
View file @
bb0e2dd
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +/** | |
4 | + * @auther yangfei | |
5 | + * @createTime 2018年03月27日 17时23分 | |
6 | + * @discription 新生儿畸形信息 | |
7 | + */ | |
8 | +public enum BabyDeformityEnums { | |
9 | + A1("jxWn","无脑畸形"), | |
10 | + A2("jxJzl","脊柱裂"), | |
11 | + A3("jxNpc","脑彭出"), | |
12 | + A4("jxNjs","先天性脑积水"), | |
13 | + A5("jxEl","腭裂"), | |
14 | + A6("jxCl","唇裂"), | |
15 | + A7("jxClhb","唇裂合并腭裂"), | |
16 | + A8("jxXe","小耳(包括无耳)"), | |
17 | + A9("jxWe","外耳其他畸形(小耳、无耳除外)"), | |
18 | + A10("jxSdbs","食道闭锁或狭窄"), | |
19 | + A11("jxZcgm","直肠肛门闭锁或狭窄(包括无肛)"), | |
20 | + A12("jxNdxl","尿道下裂"), | |
21 | + A13("jxPwwf","膀胱外翻"), | |
22 | + A14("jxMtn","马蹄内翻足"), | |
23 | + A15("jxDz","多指"), | |
24 | + A16("jxDc","多趾"), | |
25 | + A17("jxBz","并指"), | |
26 | + A18("jxBc","并趾"), | |
27 | + A19("jxZtds","肢体短缩包括缺指(趾)、裂手(足)]"), | |
28 | + A20("jxXtxe","先天性隔疝"), | |
29 | + A21("jxQpc","脐膨出"), | |
30 | + A22("jxFl","腹裂"), | |
31 | + A23("jxLtst","联体双胎"), | |
32 | + A24("jxTszh","唐氏综合征(21-三体综合征)"), | |
33 | + A25("jxXtx","先天性心脏病"); | |
34 | + | |
35 | + private BabyDeformityEnums(String id, String name) { | |
36 | + this.id= id; | |
37 | + this.name = name; | |
38 | + } | |
39 | + | |
40 | + private String id; | |
41 | + private String name; | |
42 | + | |
43 | + public String getId() { | |
44 | + return id; | |
45 | + } | |
46 | + | |
47 | + public void setId(String id) { | |
48 | + this.id = id; | |
49 | + } | |
50 | + | |
51 | + public String getName() { | |
52 | + return name; | |
53 | + } | |
54 | + | |
55 | + public void setName(String name) { | |
56 | + this.name = name; | |
57 | + } | |
58 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
View file @
bb0e2dd
1 | 1 | package com.lyms.platform.operate.web; |
2 | 2 | |
3 | -import com.lyms.platform.common.utils.DateUtil; | |
3 | +import com.lyms.platform.common.enums.BabyDeformityEnums; | |
4 | +import com.lyms.platform.common.utils.EnumUtil; | |
4 | 5 | import com.lyms.platform.pojo.BasicConfig; |
5 | 6 | import net.sourceforge.pinyin4j.PinyinHelper; |
6 | 7 | import org.apache.log4j.Logger; |
7 | 8 | |
8 | 9 | import java.util.Comparator; |
9 | -import java.util.Date; | |
10 | 10 | import java.util.List; |
11 | 11 | import java.util.Map; |
12 | 12 | |
... | ... | @@ -23,8 +23,9 @@ |
23 | 23 | // List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); |
24 | 24 | // System.out.println(jctc); |
25 | 25 | |
26 | - int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date()); | |
27 | - System.out.println(day); | |
26 | + System.out.println(EnumUtil.toJson(BabyDeformityEnums.class)); | |
27 | + // int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date()); | |
28 | + // System.out.println(day); | |
28 | 29 | |
29 | 30 | // String yl = DateUtil.getBabyMonthAge(DateUtil.parseYMD("2018-04-10"),new Date()); |
30 | 31 | // System.out.println(yl); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
bb0e2dd
... | ... | @@ -1083,6 +1083,9 @@ |
1083 | 1083 | map.put("getFmDzEnums", getFmDzEnums()); |
1084 | 1084 | map.put("getRenShenJieJuEnums", getRenShenJieJuEnums()); |
1085 | 1085 | map.put("organizations", convert()); |
1086 | + // 新生儿畸形 | |
1087 | + List<Map<String, Object>> deformity = EnumUtil.toJson(BabyDeformityEnums.class); | |
1088 | + map.put("deformity", deformity); | |
1086 | 1089 | map.put("cTime", DateUtil.getyyyy_MM_dd(new Date())); |
1087 | 1090 | return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
1088 | 1091 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
View file @
bb0e2dd
... | ... | @@ -184,6 +184,16 @@ |
184 | 184 | //档案编号 滦平需求 |
185 | 185 | private String fileCode; |
186 | 186 | |
187 | + private String hospitalId; | |
188 | + | |
189 | + public String getHospitalId() { | |
190 | + return hospitalId; | |
191 | + } | |
192 | + | |
193 | + public void setHospitalId(String hospitalId) { | |
194 | + this.hospitalId = hospitalId; | |
195 | + } | |
196 | + | |
187 | 197 | public String getFileCode() { |
188 | 198 | return fileCode; |
189 | 199 | } |
... | ... | @@ -606,7 +616,7 @@ |
606 | 616 | setBabyDiagnosis(destModel.getBabyDiagnosis()); |
607 | 617 | setVcCardNo(destModel.getVcCardNo()); |
608 | 618 | setBlNo(destModel.getBlNo()); |
609 | - | |
619 | + setHospitalId(destModel.getHospitalId()); | |
610 | 620 | setBuildDate(DateUtil.getyyyy_MM_dd(destModel.getBuildDate())); |
611 | 621 | setRemark(destModel.getMremark()); |
612 | 622 | setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus())); |