Commit f6995f094eb61e656459b4d3af283c933415eefc
1 parent
9074ef0e69
Exists in
master
and in
6 other branches
聊城妇幼产检增加字段
Showing 9 changed files with 407 additions and 2 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/FitnessEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/GestaMonthEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java
platform-common/src/main/java/com/lyms/platform/common/enums/CZFmTypeEnums.java
View file @
f6995f0
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +/** | |
4 | + * @auther yangfei | |
5 | + * @createTime 2017年07月21日 16时01分 | |
6 | + * @discription 分娩方式 | |
7 | + */ | |
8 | +public enum CZFmTypeEnums { | |
9 | + O("顺产", 1), | |
10 | + O1("剖宫产", 2), | |
11 | + O2("引产", 3), | |
12 | + O3("人工流产", 4), | |
13 | + O4("药物流产", 5); | |
14 | + private CZFmTypeEnums(String name, int id) { | |
15 | + this.id = id; | |
16 | + this.name = name; | |
17 | + } | |
18 | + private int id; | |
19 | + private String name; | |
20 | + | |
21 | + public int getId() { | |
22 | + return id; | |
23 | + } | |
24 | + | |
25 | + public void setId(int id) { | |
26 | + this.id = id; | |
27 | + } | |
28 | + | |
29 | + public String getName() { | |
30 | + return name; | |
31 | + } | |
32 | + | |
33 | + public void setName(String name) { | |
34 | + this.name = name; | |
35 | + } | |
36 | + public static String getTitle(int id) { | |
37 | + if (id == 0) { | |
38 | + return ""; | |
39 | + } | |
40 | + for (CZFmTypeEnums cfEnums : CZFmTypeEnums.values()) { | |
41 | + if (id == cfEnums.getId()) { | |
42 | + return cfEnums.getName(); | |
43 | + } | |
44 | + } | |
45 | + return ""; | |
46 | + } | |
47 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/FitnessEnums.java
View file @
f6995f0
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +/** | |
4 | + * @auther yangfei | |
5 | + * @createTime 2017年07月21日 16时05分 | |
6 | + * @discription 健康状况 | |
7 | + */ | |
8 | +public enum FitnessEnums { | |
9 | + O("健康", 1), | |
10 | + O1("不健康", 2), | |
11 | + O2("其他", 3); | |
12 | + private FitnessEnums(String name, int id) { | |
13 | + this.id = id; | |
14 | + this.name = name; | |
15 | + } | |
16 | + private int id; | |
17 | + private String name; | |
18 | + | |
19 | + public int getId() { | |
20 | + return id; | |
21 | + } | |
22 | + | |
23 | + public void setId(int id) { | |
24 | + this.id = id; | |
25 | + } | |
26 | + | |
27 | + public String getName() { | |
28 | + return name; | |
29 | + } | |
30 | + | |
31 | + public void setName(String name) { | |
32 | + this.name = name; | |
33 | + } | |
34 | + | |
35 | + public static String getTitle(int id) { | |
36 | + if (id == 0) { | |
37 | + return ""; | |
38 | + } | |
39 | + for (FitnessEnums cfEnums : FitnessEnums.values()) { | |
40 | + if (id == cfEnums.getId()) { | |
41 | + return cfEnums.getName(); | |
42 | + } | |
43 | + } | |
44 | + return ""; | |
45 | + } | |
46 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/GestaMonthEnums.java
View file @
f6995f0
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +/** | |
4 | + * @auther yangfei | |
5 | + * @createTime 2017年07月21日 15时17分 | |
6 | + * @discription 分娩月份 | |
7 | + */ | |
8 | +public enum GestaMonthEnums { | |
9 | + OM("1月", 1), | |
10 | + TM("2月", 2), | |
11 | + TRM("3月", 3), | |
12 | + FM("4月", 4), | |
13 | + FIM("5月", 5), | |
14 | + SM("6月", 6), | |
15 | + SEM("7月", 7), | |
16 | + EM("8月", 8), | |
17 | + ZM("足月", 9); | |
18 | + GestaMonthEnums(String name, int value) { | |
19 | + this.name = name; | |
20 | + this.value = value; | |
21 | + } | |
22 | + private String name; | |
23 | + private int value; | |
24 | + | |
25 | + public String getName() { | |
26 | + return name; | |
27 | + } | |
28 | + | |
29 | + public void setName(String name) { | |
30 | + this.name = name; | |
31 | + } | |
32 | + | |
33 | + public int getValue() { | |
34 | + return value; | |
35 | + } | |
36 | + | |
37 | + public void setValue(int value) { | |
38 | + this.value = value; | |
39 | + } | |
40 | + | |
41 | + public static String getTitle(int id) { | |
42 | + if (id == 0) { | |
43 | + return ""; | |
44 | + } | |
45 | + for (GestaMonthEnums cfEnums : GestaMonthEnums.values()) { | |
46 | + if (id == cfEnums.getValue()) { | |
47 | + return cfEnums.getName(); | |
48 | + } | |
49 | + } | |
50 | + return ""; | |
51 | + } | |
52 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
View file @
f6995f0
... | ... | @@ -6,7 +6,6 @@ |
6 | 6 | |
7 | 7 | import java.util.Date; |
8 | 8 | import java.util.List; |
9 | -import java.util.Map; | |
10 | 9 | |
11 | 10 | /** |
12 | 11 | * 产前检查初诊模型 |
... | ... | @@ -68,6 +67,18 @@ |
68 | 67 | private Integer stillbirth; |
69 | 68 | //死产 |
70 | 69 | private Integer stillChan ; |
70 | + //妊娠月份 | |
71 | + private Integer gestaMonth; | |
72 | + //妊娠时间 | |
73 | + private String gestaDate; | |
74 | + //分娩方式 | |
75 | + private Integer fmType; | |
76 | + //分娩方式备注 | |
77 | + private String fmTypeRemark; | |
78 | + //健康状况 | |
79 | + private Integer fitness; | |
80 | + //健康状况备注 | |
81 | + private String fitnessRemark; | |
71 | 82 | // 身高 |
72 | 83 | private String height; |
73 | 84 | //体重 |
... | ... | @@ -185,6 +196,55 @@ |
185 | 196 | |
186 | 197 | public String getYljzxs() { |
187 | 198 | return yljzxs; |
199 | + } | |
200 | + | |
201 | + public Integer getGestaMonth() { | |
202 | + return gestaMonth; | |
203 | + } | |
204 | + | |
205 | + public void setGestaMonth(Integer gestaMonth) { | |
206 | + this.gestaMonth = gestaMonth; | |
207 | + } | |
208 | + | |
209 | + public Integer getFmType() { | |
210 | + return fmType; | |
211 | + } | |
212 | + | |
213 | + public void setFmType(Integer fmType) { | |
214 | + this.fmType = fmType; | |
215 | + } | |
216 | + | |
217 | + public String getFmTypeRemark() { | |
218 | + return fmTypeRemark; | |
219 | + } | |
220 | + | |
221 | + public void setFmTypeRemark(String fmTypeRemark) { | |
222 | + this.fmTypeRemark = fmTypeRemark; | |
223 | + } | |
224 | + | |
225 | + public Integer getFitness() { | |
226 | + return fitness; | |
227 | + } | |
228 | + | |
229 | + public void setFitness(Integer fitness) { | |
230 | + this.fitness = fitness; | |
231 | + } | |
232 | + | |
233 | + public String getGestaDate() { | |
234 | + return gestaDate; | |
235 | + } | |
236 | + | |
237 | + public void setGestaDate(String gestaDate) { | |
238 | + this.gestaDate = gestaDate; | |
239 | + } | |
240 | + | |
241 | + | |
242 | + public String getFitnessRemark() { | |
243 | + return fitnessRemark; | |
244 | + } | |
245 | + | |
246 | + public void setFitnessRemark(String fitnessRemark) { | |
247 | + this.fitnessRemark = fitnessRemark; | |
188 | 248 | } |
189 | 249 | |
190 | 250 | public void setYljzxs(String yljzxs) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
f6995f0
... | ... | @@ -2298,6 +2298,14 @@ |
2298 | 2298 | //横指 |
2299 | 2299 | map.put("getHengZhi",InitDataUtils. getHengZhi()); |
2300 | 2300 | map.put("getSyjg", InitDataUtils.getSyjg()); |
2301 | + //妊娠月份 | |
2302 | + map.put("gestaMonth", InitDataUtils.getGestaMonth()); | |
2303 | + //妊娠月份 | |
2304 | + map.put("gestaMonth", InitDataUtils.getGestaMonth()); | |
2305 | + //分娩方式 | |
2306 | + map.put("fmType", InitDataUtils.getCZFmType()); | |
2307 | + //健康 | |
2308 | + map.put("fitness", InitDataUtils.getFitness()); | |
2301 | 2309 | map.put("getHighRisk", basicConfigFacade.getHighRisk()); |
2302 | 2310 | map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID)); |
2303 | 2311 | map.put("xx", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING)); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
f6995f0
... | ... | @@ -1132,6 +1132,27 @@ |
1132 | 1132 | map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
1133 | 1133 | map.put("mremark", patients.getMremark()); |
1134 | 1134 | |
1135 | + //妊娠月份 | |
1136 | + if(data.getGestaMonth()!=null){ | |
1137 | + map.put("gestaMonth", GestaMonthEnums.getTitle(data.getGestaMonth())); | |
1138 | + } | |
1139 | + | |
1140 | + | |
1141 | + //妊娠时间 | |
1142 | + map.put("gestaDate", data.getGestaDate()); | |
1143 | + //分娩方式 | |
1144 | + if(data.getFmType()!=null){ | |
1145 | + map.put("fmType", CZFmTypeEnums.getTitle(data.getFmType())); | |
1146 | + } | |
1147 | + //分娩方式备注 | |
1148 | + map.put("fmTypeRemark", data.getFmTypeRemark()); | |
1149 | + //健康状况 | |
1150 | + if(data.getFitness()!=null){ | |
1151 | + map.put("fitness", FitnessEnums.getTitle(data.getFitness())); | |
1152 | + } | |
1153 | + //健康状况备注 | |
1154 | + map.put("fitnessRemark", data.getFitnessRemark()); | |
1155 | + | |
1135 | 1156 | //处理高危因素 |
1136 | 1157 | getRisk(data.getHighrisk(), data.getOtherHighRisk(), map); |
1137 | 1158 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
f6995f0
... | ... | @@ -132,7 +132,20 @@ |
132 | 132 | private String nextCheckTime; |
133 | 133 | //前端计算出来的孕周 |
134 | 134 | private String cDueWeek; |
135 | + //妊娠月份 | |
136 | + private String gestaMonth; | |
137 | + //妊娠时间 | |
138 | + private String gestaDate; | |
139 | + //分娩方式 | |
140 | + private String fmType; | |
141 | + //分娩方式备注 | |
142 | + private String fmTypeRemark; | |
143 | + //健康状况 | |
144 | + private String fitness; | |
145 | + //健康状况备注 | |
146 | + private String fitnessRemark; | |
135 | 147 | |
148 | + | |
136 | 149 | /** |
137 | 150 | * 辅助检查结果录入 |
138 | 151 | **/ |
... | ... | @@ -969,6 +982,54 @@ |
969 | 982 | this.highriskSocre = highriskSocre; |
970 | 983 | } |
971 | 984 | |
985 | + public String getGestaMonth() { | |
986 | + return gestaMonth; | |
987 | + } | |
988 | + | |
989 | + public void setGestaMonth(String gestaMonth) { | |
990 | + this.gestaMonth = gestaMonth; | |
991 | + } | |
992 | + | |
993 | + public String getGestaDate() { | |
994 | + return gestaDate; | |
995 | + } | |
996 | + | |
997 | + public void setGestaDate(String gestaDate) { | |
998 | + this.gestaDate = gestaDate; | |
999 | + } | |
1000 | + | |
1001 | + public String getFmType() { | |
1002 | + return fmType; | |
1003 | + } | |
1004 | + | |
1005 | + public void setFmType(String fmType) { | |
1006 | + this.fmType = fmType; | |
1007 | + } | |
1008 | + | |
1009 | + public String getFmTypeRemark() { | |
1010 | + return fmTypeRemark; | |
1011 | + } | |
1012 | + | |
1013 | + public void setFmTypeRemark(String fmTypeRemark) { | |
1014 | + this.fmTypeRemark = fmTypeRemark; | |
1015 | + } | |
1016 | + | |
1017 | + public String getFitness() { | |
1018 | + return fitness; | |
1019 | + } | |
1020 | + | |
1021 | + public void setFitness(String fitness) { | |
1022 | + this.fitness = fitness; | |
1023 | + } | |
1024 | + | |
1025 | + public String getFitnessRemark() { | |
1026 | + return fitnessRemark; | |
1027 | + } | |
1028 | + | |
1029 | + public void setFitnessRemark(String fitnessRemark) { | |
1030 | + this.fitnessRemark = fitnessRemark; | |
1031 | + } | |
1032 | + | |
972 | 1033 | public String getNextCheckTime() { |
973 | 1034 | return nextCheckTime; |
974 | 1035 | } |
... | ... | @@ -1102,6 +1163,14 @@ |
1102 | 1163 | @Override |
1103 | 1164 | public AntExChuModel convertToDataModel() { |
1104 | 1165 | AntExChuModel antExChuModel = new AntExChuModel(); |
1166 | + | |
1167 | + antExChuModel.setGestaMonth(gestaMonth); | |
1168 | + antExChuModel.setGestaDate(gestaDate); | |
1169 | + antExChuModel.setFmType(fmType); | |
1170 | + antExChuModel.setFmTypeRemark(fmTypeRemark); | |
1171 | + antExChuModel.setFitness(fitness); | |
1172 | + antExChuModel.setFitnessRemark(fitnessRemark); | |
1173 | + | |
1105 | 1174 | antExChuModel.setYinchan(yinchan); |
1106 | 1175 | antExChuModel.setGongwaiyun(gongwaiyun); |
1107 | 1176 | antExChuModel.setYaowu(yaowu); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
View file @
f6995f0
... | ... | @@ -71,6 +71,18 @@ |
71 | 71 | private Map fksxHistory; |
72 | 72 | // 叶酸服用 |
73 | 73 | private Map ysfyHistory; |
74 | + //妊娠月份 | |
75 | + private Integer gestaMonth; | |
76 | + //妊娠时间 | |
77 | + private String gestaDate; | |
78 | + //分娩方式 | |
79 | + private Integer fmType; | |
80 | + //分娩方式备注 | |
81 | + private String fmTypeRemark; | |
82 | + //健康状况 | |
83 | + private Integer fitness; | |
84 | + //健康状况备注 | |
85 | + private String fitnessRemark; | |
74 | 86 | |
75 | 87 | private Map hHealthInfo; |
76 | 88 | //传染病史 |
... | ... | @@ -1044,6 +1056,54 @@ |
1044 | 1056 | return ymjzHistory; |
1045 | 1057 | } |
1046 | 1058 | |
1059 | + public Integer getGestaMonth() { | |
1060 | + return gestaMonth; | |
1061 | + } | |
1062 | + | |
1063 | + public void setGestaMonth(Integer gestaMonth) { | |
1064 | + this.gestaMonth = gestaMonth; | |
1065 | + } | |
1066 | + | |
1067 | + public String getGestaDate() { | |
1068 | + return gestaDate; | |
1069 | + } | |
1070 | + | |
1071 | + public void setGestaDate(String gestaDate) { | |
1072 | + this.gestaDate = gestaDate; | |
1073 | + } | |
1074 | + | |
1075 | + public Integer getFmType() { | |
1076 | + return fmType; | |
1077 | + } | |
1078 | + | |
1079 | + public void setFmType(Integer fmType) { | |
1080 | + this.fmType = fmType; | |
1081 | + } | |
1082 | + | |
1083 | + public String getFmTypeRemark() { | |
1084 | + return fmTypeRemark; | |
1085 | + } | |
1086 | + | |
1087 | + public void setFmTypeRemark(String fmTypeRemark) { | |
1088 | + this.fmTypeRemark = fmTypeRemark; | |
1089 | + } | |
1090 | + | |
1091 | + public Integer getFitness() { | |
1092 | + return fitness; | |
1093 | + } | |
1094 | + | |
1095 | + public void setFitness(Integer fitness) { | |
1096 | + this.fitness = fitness; | |
1097 | + } | |
1098 | + | |
1099 | + public String getFitnessRemark() { | |
1100 | + return fitnessRemark; | |
1101 | + } | |
1102 | + | |
1103 | + public void setFitnessRemark(String fitnessRemark) { | |
1104 | + this.fitnessRemark = fitnessRemark; | |
1105 | + } | |
1106 | + | |
1047 | 1107 | public void setYmjzHistory(Map ymjzHistory) { |
1048 | 1108 | this.ymjzHistory = ymjzHistory; |
1049 | 1109 | } |
... | ... | @@ -1106,6 +1166,13 @@ |
1106 | 1166 | |
1107 | 1167 | public AntexChuResult convertToResult(AntExChuModel antExChuModel) { |
1108 | 1168 | if (null != antExChuModel) { |
1169 | + setGestaMonth(antExChuModel.getGestaMonth()); | |
1170 | + setGestaDate(antExChuModel.getGestaDate()); | |
1171 | + setFmType(antExChuModel.getFmType()); | |
1172 | + setFmTypeRemark(antExChuModel.getFmTypeRemark()); | |
1173 | + setFitness(antExChuModel.getFitness()); | |
1174 | + setFitnessRemark(antExChuModel.getFitnessRemark()); | |
1175 | + | |
1109 | 1176 | setDiagnosisOther(antExChuModel.getDiagnosisOther()); |
1110 | 1177 | setBarCode(antExChuModel.getBarCode()); |
1111 | 1178 | setId(antExChuModel.getId()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java
View file @
f6995f0
... | ... | @@ -122,7 +122,6 @@ |
122 | 122 | } |
123 | 123 | |
124 | 124 | |
125 | - | |
126 | 125 | //胎方位 |
127 | 126 | public static List<Object> getFetPosition() { |
128 | 127 | List<Object> list = new ArrayList<>(); |
... | ... | @@ -170,6 +169,42 @@ |
170 | 169 | } |
171 | 170 | return list; |
172 | 171 | } |
172 | + | |
173 | + public static List getGestaMonth(){ | |
174 | + List<Object> list = new ArrayList<>(); | |
175 | + for (GestaMonthEnums enums : GestaMonthEnums.values()) { | |
176 | + Map<String, Object> resultMap = new HashMap<>(); | |
177 | + resultMap.put("id", enums.getValue()); | |
178 | + resultMap.put("name", enums.getName()); | |
179 | + list.add(resultMap); | |
180 | + } | |
181 | + return list; | |
182 | + } | |
183 | + | |
184 | + | |
185 | + public static List getCZFmType(){ | |
186 | + List<Object> list = new ArrayList<>(); | |
187 | + for (CZFmTypeEnums enums : CZFmTypeEnums.values()) { | |
188 | + Map<String, Object> resultMap = new HashMap<>(); | |
189 | + resultMap.put("id", enums.getId()); | |
190 | + resultMap.put("name", enums.getName()); | |
191 | + list.add(resultMap); | |
192 | + } | |
193 | + return list; | |
194 | + } | |
195 | + | |
196 | + | |
197 | + public static List getFitness(){ | |
198 | + List<Object> list = new ArrayList<>(); | |
199 | + for (FitnessEnums enums : FitnessEnums.values()) { | |
200 | + Map<String, Object> resultMap = new HashMap<>(); | |
201 | + resultMap.put("id", enums.getId()); | |
202 | + resultMap.put("name", enums.getName()); | |
203 | + list.add(resultMap); | |
204 | + } | |
205 | + return list; | |
206 | + } | |
207 | + | |
173 | 208 | public static List getSyjg(){ |
174 | 209 | List<Object> list = new ArrayList<>(); |
175 | 210 | for (SYJGEums enums : SYJGEums.values()) { |