Commit 20b8556482b3896b0fdf6a48b3ecf30cb67b158b
1 parent
10feb27ba8
Exists in
master
and in
1 other branch
聊城妇幼产检增加字段
Showing 6 changed files with 191 additions and 175 deletions
- 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/AntExcAddOther.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-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
View file @
20b8556
... | ... | @@ -67,18 +67,12 @@ |
67 | 67 | private Integer stillbirth; |
68 | 68 | //死产 |
69 | 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; | |
70 | + | |
71 | + //初诊其他信息 | |
72 | + private List antExcAddOthers; | |
73 | + //存活胎儿数 | |
74 | + private Integer survFetus; | |
75 | + | |
82 | 76 | // 身高 |
83 | 77 | private String height; |
84 | 78 | //体重 |
85 | 79 | |
86 | 80 | |
87 | 81 | |
... | ... | @@ -208,53 +202,20 @@ |
208 | 202 | return yljzxs; |
209 | 203 | } |
210 | 204 | |
211 | - public Integer getGestaMonth() { | |
212 | - return gestaMonth; | |
205 | + public List getAntExcAddOthers() { | |
206 | + return antExcAddOthers; | |
213 | 207 | } |
214 | 208 | |
215 | - public void setGestaMonth(Integer gestaMonth) { | |
216 | - this.gestaMonth = gestaMonth; | |
209 | + public void setAntExcAddOthers(List antExcAddOthers) { | |
210 | + this.antExcAddOthers = antExcAddOthers; | |
217 | 211 | } |
218 | 212 | |
219 | - public Integer getFmType() { | |
220 | - return fmType; | |
213 | + public Integer getSurvFetus() { | |
214 | + return survFetus; | |
221 | 215 | } |
222 | 216 | |
223 | - public void setFmType(Integer fmType) { | |
224 | - this.fmType = fmType; | |
225 | - } | |
226 | - | |
227 | - public String getFmTypeRemark() { | |
228 | - return fmTypeRemark; | |
229 | - } | |
230 | - | |
231 | - public void setFmTypeRemark(String fmTypeRemark) { | |
232 | - this.fmTypeRemark = fmTypeRemark; | |
233 | - } | |
234 | - | |
235 | - public Integer getFitness() { | |
236 | - return fitness; | |
237 | - } | |
238 | - | |
239 | - public void setFitness(Integer fitness) { | |
240 | - this.fitness = fitness; | |
241 | - } | |
242 | - | |
243 | - public String getGestaDate() { | |
244 | - return gestaDate; | |
245 | - } | |
246 | - | |
247 | - public void setGestaDate(String gestaDate) { | |
248 | - this.gestaDate = gestaDate; | |
249 | - } | |
250 | - | |
251 | - | |
252 | - public String getFitnessRemark() { | |
253 | - return fitnessRemark; | |
254 | - } | |
255 | - | |
256 | - public void setFitnessRemark(String fitnessRemark) { | |
257 | - this.fitnessRemark = fitnessRemark; | |
217 | + public void setSurvFetus(Integer survFetus) { | |
218 | + this.survFetus = survFetus; | |
258 | 219 | } |
259 | 220 | |
260 | 221 | public void setYljzxs(String yljzxs) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
20b8556
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
20b8556
... | ... | @@ -8,6 +8,7 @@ |
8 | 8 | import com.lyms.platform.common.utils.ExceptionUtils; |
9 | 9 | import com.lyms.platform.common.utils.JsonUtil; |
10 | 10 | import com.lyms.platform.common.utils.SystemConfig; |
11 | +import com.lyms.platform.operate.web.request.AntExcAddOther; | |
11 | 12 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
12 | 13 | import com.lyms.platform.operate.web.result.BabyCheckPageResult; |
13 | 14 | import com.lyms.platform.operate.web.result.BabyPageResult; |
14 | 15 | |
... | ... | @@ -321,10 +322,10 @@ |
321 | 322 | if (tire != null) { |
322 | 323 | String heartRate = tire.get("heartRate"); |
323 | 324 | String fetalPosition = tire.get("fetalPosition"); |
324 | - if(StringUtils.isNotEmpty(heartRate)){ | |
325 | + if (StringUtils.isNotEmpty(heartRate)) { | |
325 | 326 | hrateSb.append(UnitUtils.unitSplice(heartRate, UnitConstants.CIFEN) + "/"); |
326 | 327 | } |
327 | - if(StringUtils.isNotEmpty(fetalPosition)&&!"null".equals(fetalPosition)){ | |
328 | + if (StringUtils.isNotEmpty(fetalPosition) && !"null".equals(fetalPosition)) { | |
328 | 329 | fposiSb.append(FetalPositionEnums.getTitle(fetalPosition) + "/"); |
329 | 330 | } |
330 | 331 | } |
... | ... | @@ -368,7 +369,7 @@ |
368 | 369 | String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckDate()); |
369 | 370 | String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); |
370 | 371 | |
371 | - if (raom.getCreated().before(data.getCheckDate())||checkTime.equals(Created)) { | |
372 | + if (raom.getCreated().before(data.getCheckDate()) || checkTime.equals(Created)) { | |
372 | 373 | isZhuan = true; |
373 | 374 | continue; |
374 | 375 | } |
... | ... | @@ -383,7 +384,7 @@ |
383 | 384 | } catch (Exception e) { |
384 | 385 | |
385 | 386 | } |
386 | - }else{ | |
387 | + } else { | |
387 | 388 | map.put(numStr + "isZhuan", "1"); |
388 | 389 | } |
389 | 390 | } else { |
390 | 391 | |
... | ... | @@ -562,12 +563,10 @@ |
562 | 563 | {//7糖尿病 |
563 | 564 | jws.add("7"); |
564 | 565 | } |
565 | - if (pastHistory.contains("其他[")) | |
566 | - {//8其他 | |
566 | + if (pastHistory.contains("其他[")) {//8其他 | |
567 | 567 | map.put("jwsOther", pastHistory.substring(pastHistory.indexOf("其他") + 2, pastHistory.length())); |
568 | 568 | } |
569 | - if (CollectionUtils.isEmpty(jws)) | |
570 | - { | |
569 | + if (CollectionUtils.isEmpty(jws)) { | |
571 | 570 | jws.add("1");//无 |
572 | 571 | } |
573 | 572 | map.put("pastHistory", jws); |
... | ... | @@ -1009,8 +1008,7 @@ |
1009 | 1008 | map.put("ydqjd", "4"); |
1010 | 1009 | } |
1011 | 1010 | } |
1012 | - if (StringUtils.isNotEmpty(data.getbChao())) | |
1013 | - { | |
1011 | + if (StringUtils.isNotEmpty(data.getbChao())) { | |
1014 | 1012 | map.put("bChao", data.getbChao()); |
1015 | 1013 | } |
1016 | 1014 | |
... | ... | @@ -1025,7 +1023,7 @@ |
1025 | 1023 | for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 |
1026 | 1024 | String checkTime = DateUtil.getyyyy_MM_dd(data.getCheckTime()); |
1027 | 1025 | String Created = DateUtil.getyyyy_MM_dd(data.getCreated()); |
1028 | - if (raom.getCreated().before(data.getCheckTime())||checkTime.equals(Created)) { | |
1026 | + if (raom.getCreated().before(data.getCheckTime()) || checkTime.equals(Created)) { | |
1029 | 1027 | isZhuan = true; |
1030 | 1028 | continue; |
1031 | 1029 | } |
1032 | 1030 | |
1033 | 1031 | |
... | ... | @@ -1037,20 +1035,20 @@ |
1037 | 1035 | if (null != zhuanc1) { |
1038 | 1036 | map.put("zhuancl", zhuanc1.getName()); |
1039 | 1037 | map.put("isZhuan", "2"); |
1040 | - }else{ | |
1038 | + } else { | |
1041 | 1039 | map.put("isZhuan", "1"); |
1042 | 1040 | } |
1043 | 1041 | } catch (Exception e) { |
1044 | 1042 | e.printStackTrace(); |
1045 | 1043 | } |
1046 | - }else{ | |
1044 | + } else { | |
1047 | 1045 | // map.put("zhuancl", hospital); |
1048 | 1046 | map.put("isZhuan", 1); |
1049 | 1047 | } |
1050 | 1048 | } else { |
1051 | 1049 | map.put("isZhuan", "1"); |
1052 | 1050 | } |
1053 | - }else{ | |
1051 | + } else { | |
1054 | 1052 | map.put("isZhuan", "1"); |
1055 | 1053 | } |
1056 | 1054 | |
1057 | 1055 | |
... | ... | @@ -1132,27 +1130,7 @@ |
1132 | 1130 | map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); |
1133 | 1131 | map.put("mremark", patients.getMremark()); |
1134 | 1132 | |
1135 | - //妊娠月份 | |
1136 | - if(data.getGestaMonth()!=null){ | |
1137 | - map.put("gestaMonth", GestaMonthEnums.getTitle(data.getGestaMonth())); | |
1138 | - } | |
1139 | 1133 | |
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 | - | |
1156 | 1134 | //处理高危因素 |
1157 | 1135 | getRisk(data.getHighrisk(), data.getOtherHighRisk(), map); |
1158 | 1136 | |
... | ... | @@ -1195,8 +1173,8 @@ |
1195 | 1173 | //实验结果选择 |
1196 | 1174 | //hiv 抗体 |
1197 | 1175 | // private String hivktSelect; |
1198 | - map.put("syjgSelect", StringUtils.isNotEmpty(data.getSyjgSelect())?SYJGEums.getTitle(data.getSyjgSelect()):""); | |
1199 | - map.put("hivktSelect", StringUtils.isNotEmpty(data.getHivktSelect())?SYJGEums.getTitle(data.getHivktSelect()):""); | |
1176 | + map.put("syjgSelect", StringUtils.isNotEmpty(data.getSyjgSelect()) ? SYJGEums.getTitle(data.getSyjgSelect()) : ""); | |
1177 | + map.put("hivktSelect", StringUtils.isNotEmpty(data.getHivktSelect()) ? SYJGEums.getTitle(data.getHivktSelect()) : ""); | |
1200 | 1178 | // {\"yesOrNo\":\"yes\",\"yg\":true,\"bg\":true,\"azb\":true,\"md\":true,\"qt\":true,\"qtText\":\"bdfgsf\"} |
1201 | 1179 | map.put("infectDiseases", ""); |
1202 | 1180 | |
1203 | 1181 | |
1204 | 1182 | |
1205 | 1183 | |
1206 | 1184 | |
1207 | 1185 | |
1208 | 1186 | |
1209 | 1187 | |
1210 | 1188 | |
1211 | 1189 | |
1212 | 1190 | |
1213 | 1191 | |
1214 | 1192 | |
1215 | 1193 | |
1216 | 1194 | |
... | ... | @@ -1335,49 +1313,49 @@ |
1335 | 1313 | map.put("lungs", data.getLungs()); |
1336 | 1314 | |
1337 | 1315 | |
1338 | - if(StringUtils.isNotEmpty(data.getVulvaSele())){ | |
1339 | - if("2".equals(data.getVulvaSele())){ | |
1316 | + if (StringUtils.isNotEmpty(data.getVulvaSele())) { | |
1317 | + if ("2".equals(data.getVulvaSele())) { | |
1340 | 1318 | map.put("vulvaSele", "未见异常"); |
1341 | - }else if("1".equals(data.getVulvaSele())){ | |
1319 | + } else if ("1".equals(data.getVulvaSele())) { | |
1342 | 1320 | map.put("vulva", data.getVulva()); |
1343 | 1321 | } |
1344 | - }else{//空 | |
1322 | + } else {//空 | |
1345 | 1323 | map.put("vulva", data.getVulva()); |
1346 | 1324 | } |
1347 | - if(StringUtils.isNotEmpty(data.getVaginaSele())){ | |
1348 | - if("2".equals(data.getVaginaSele())){ | |
1325 | + if (StringUtils.isNotEmpty(data.getVaginaSele())) { | |
1326 | + if ("2".equals(data.getVaginaSele())) { | |
1349 | 1327 | map.put("vaginaSele", "未见异常"); |
1350 | - }else if("1".equals(data.getVaginaSele())){ | |
1328 | + } else if ("1".equals(data.getVaginaSele())) { | |
1351 | 1329 | map.put("vagina", data.getVagina()); |
1352 | 1330 | } |
1353 | - }else{//空 | |
1331 | + } else {//空 | |
1354 | 1332 | map.put("vagina", data.getVagina()); |
1355 | 1333 | } |
1356 | - if(StringUtils.isNotEmpty(data.getCervicalSele())){ | |
1357 | - if("2".equals(data.getCervicalSele())){ | |
1334 | + if (StringUtils.isNotEmpty(data.getCervicalSele())) { | |
1335 | + if ("2".equals(data.getCervicalSele())) { | |
1358 | 1336 | map.put("cervicalSele", "未见异常"); |
1359 | - }else if("1".equals(data.getCervicalSele())){ | |
1337 | + } else if ("1".equals(data.getCervicalSele())) { | |
1360 | 1338 | map.put("cervical", data.getCervical()); |
1361 | 1339 | } |
1362 | - }else{//空 | |
1340 | + } else {//空 | |
1363 | 1341 | map.put("cervical", data.getCervical()); |
1364 | 1342 | } |
1365 | - if(StringUtils.isNotEmpty(data.getUterusSele())){ | |
1366 | - if("2".equals(data.getUterusSele())){ | |
1343 | + if (StringUtils.isNotEmpty(data.getUterusSele())) { | |
1344 | + if ("2".equals(data.getUterusSele())) { | |
1367 | 1345 | map.put("uterusSele", "未见异常"); |
1368 | - }else if("1".equals(data.getUterusSele())){ | |
1346 | + } else if ("1".equals(data.getUterusSele())) { | |
1369 | 1347 | map.put("uterus", data.getUterus()); |
1370 | 1348 | } |
1371 | - }else{//空 | |
1349 | + } else {//空 | |
1372 | 1350 | map.put("uterus", data.getUterus()); |
1373 | 1351 | } |
1374 | - if(StringUtils.isNotEmpty(data.getFujianSele())){ | |
1375 | - if("1".equals(data.getFujianSele())){ | |
1352 | + if (StringUtils.isNotEmpty(data.getFujianSele())) { | |
1353 | + if ("1".equals(data.getFujianSele())) { | |
1376 | 1354 | map.put("fujian", data.getFujian()); |
1377 | - }else if("2".equals(data.getFujianSele())){ | |
1355 | + } else if ("2".equals(data.getFujianSele())) { | |
1378 | 1356 | map.put("fujianSele", "未见异常"); |
1379 | 1357 | } |
1380 | - }else{//空 | |
1358 | + } else {//空 | |
1381 | 1359 | map.put("fujian", data.getFujian()); |
1382 | 1360 | } |
1383 | 1361 | |
... | ... | @@ -1392,6 +1370,29 @@ |
1392 | 1370 | } |
1393 | 1371 | map.put("fuwei", UnitUtils.unitSplice(data.getFuwei(), UnitConstants.CM)); |
1394 | 1372 | map.put("tireNumber", TaiShuEnums.getTitle(data.getTireNumber())); |
1373 | + | |
1374 | + | |
1375 | + //妊娠信息 | |
1376 | + List<Map> antExcAddOthersList = new ArrayList<>(); | |
1377 | + if (CollectionUtils.isNotEmpty(data.getAntExcAddOthers())) { | |
1378 | + List<AntExcAddOther> antExcAddOthers = data.getAntExcAddOthers(); | |
1379 | + if (CollectionUtils.isNotEmpty(antExcAddOthers)) { | |
1380 | + for (AntExcAddOther obj : antExcAddOthers) { | |
1381 | + Map<String, Object> otherMap = new HashMap<>(); | |
1382 | + otherMap.put("gestaMonth", obj.getGestaMonth()); | |
1383 | + otherMap.put("gestaDate", obj.getGestaDate()); | |
1384 | + otherMap.put("fmType", obj.getFmType()); | |
1385 | + otherMap.put("fmTypeRemark", obj.getFmTypeRemark()); | |
1386 | + otherMap.put("fitness", obj.getFitness()); | |
1387 | + otherMap.put("fitnessRemark", obj.getFitnessRemark()); | |
1388 | + otherMap.put("newborWeight", obj.getNewborWeight()); | |
1389 | + antExcAddOthersList.add(otherMap); | |
1390 | + } | |
1391 | + } | |
1392 | + } | |
1393 | + map.put("antExcAddOthers", antExcAddOthersList); | |
1394 | + | |
1395 | + | |
1395 | 1396 | //胎儿情况 |
1396 | 1397 | List<Map> placetaList = new ArrayList<>(); |
1397 | 1398 | if (CollectionUtils.isNotEmpty(data.getPlacentas())) { |
... | ... | @@ -1639,6 +1640,7 @@ |
1639 | 1640 | * @param id |
1640 | 1641 | * @return |
1641 | 1642 | */ |
1643 | + | |
1642 | 1644 | public BaseObjectResponse findAntenatalExamination(String id) { |
1643 | 1645 | |
1644 | 1646 | BaseObjectResponse br = new BaseObjectResponse(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddOther.java
View file @
20b8556
1 | +package com.lyms.platform.operate.web.request; | |
2 | + | |
3 | +import java.io.Serializable; | |
4 | + | |
5 | +/** | |
6 | + * @auther yangfei | |
7 | + * @createTime 2017年07月22日 09时59分 | |
8 | + * @discription 初诊其他信息 | |
9 | + */ | |
10 | +public class AntExcAddOther implements Serializable { | |
11 | + //妊娠月份 | |
12 | + private Integer gestaMonth; | |
13 | + //妊娠时间 | |
14 | + private String gestaDate; | |
15 | + //分娩方式 | |
16 | + private Integer fmType; | |
17 | + //分娩方式备注 | |
18 | + private String fmTypeRemark; | |
19 | + //健康状况 | |
20 | + private Integer fitness; | |
21 | + //健康状况备注 | |
22 | + private String fitnessRemark; | |
23 | + //新生儿体重 | |
24 | + private String newborWeight; | |
25 | + | |
26 | + public Integer getGestaMonth() { | |
27 | + return gestaMonth; | |
28 | + } | |
29 | + | |
30 | + public void setGestaMonth(Integer gestaMonth) { | |
31 | + this.gestaMonth = gestaMonth; | |
32 | + } | |
33 | + | |
34 | + public String getGestaDate() { | |
35 | + return gestaDate; | |
36 | + } | |
37 | + | |
38 | + public void setGestaDate(String gestaDate) { | |
39 | + this.gestaDate = gestaDate; | |
40 | + } | |
41 | + | |
42 | + public Integer getFmType() { | |
43 | + return fmType; | |
44 | + } | |
45 | + | |
46 | + public void setFmType(Integer fmType) { | |
47 | + this.fmType = fmType; | |
48 | + } | |
49 | + | |
50 | + public String getFmTypeRemark() { | |
51 | + return fmTypeRemark; | |
52 | + } | |
53 | + | |
54 | + public void setFmTypeRemark(String fmTypeRemark) { | |
55 | + this.fmTypeRemark = fmTypeRemark; | |
56 | + } | |
57 | + | |
58 | + public Integer getFitness() { | |
59 | + return fitness; | |
60 | + } | |
61 | + | |
62 | + public void setFitness(Integer fitness) { | |
63 | + this.fitness = fitness; | |
64 | + } | |
65 | + | |
66 | + public String getFitnessRemark() { | |
67 | + return fitnessRemark; | |
68 | + } | |
69 | + | |
70 | + public void setFitnessRemark(String fitnessRemark) { | |
71 | + this.fitnessRemark = fitnessRemark; | |
72 | + } | |
73 | + | |
74 | + public String getNewborWeight() { | |
75 | + return newborWeight; | |
76 | + } | |
77 | + | |
78 | + public void setNewborWeight(String newborWeight) { | |
79 | + this.newborWeight = newborWeight; | |
80 | + } | |
81 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
20b8556
... | ... | @@ -142,19 +142,11 @@ |
142 | 142 | private String nextCheckTime; |
143 | 143 | //前端计算出来的孕周 |
144 | 144 | private String cDueWeek; |
145 | - //妊娠月份 | |
146 | - private Integer gestaMonth; | |
147 | - //妊娠时间 | |
148 | - private String gestaDate; | |
149 | - //分娩方式 | |
150 | - private Integer fmType; | |
151 | - //分娩方式备注 | |
152 | - private String fmTypeRemark; | |
153 | - //健康状况 | |
154 | - private Integer fitness; | |
155 | - //健康状况备注 | |
156 | - private String fitnessRemark; | |
157 | 145 | |
146 | + //初诊其他信息 | |
147 | + private List<AntExcAddOther> antExcAddOthers; | |
148 | + //存活胎儿数 | |
149 | + private Integer survFetus; | |
158 | 150 | |
159 | 151 | /** |
160 | 152 | * 辅助检查结果录入 |
161 | 153 | |
162 | 154 | |
163 | 155 | |
164 | 156 | |
... | ... | @@ -1032,54 +1024,22 @@ |
1032 | 1024 | this.highriskSocre = highriskSocre; |
1033 | 1025 | } |
1034 | 1026 | |
1035 | - public Integer getGestaMonth() { | |
1036 | - return gestaMonth; | |
1027 | + public List<AntExcAddOther> getAntExcAddOthers() { | |
1028 | + return antExcAddOthers; | |
1037 | 1029 | } |
1038 | 1030 | |
1039 | - public void setGestaMonth(Integer gestaMonth) { | |
1040 | - this.gestaMonth = gestaMonth; | |
1031 | + public void setAntExcAddOthers(List<AntExcAddOther> antExcAddOthers) { | |
1032 | + this.antExcAddOthers = antExcAddOthers; | |
1041 | 1033 | } |
1042 | 1034 | |
1043 | - public Integer getFmType() { | |
1044 | - return fmType; | |
1035 | + public Integer getSurvFetus() { | |
1036 | + return survFetus; | |
1045 | 1037 | } |
1046 | 1038 | |
1047 | - public void setFmType(Integer fmType) { | |
1048 | - this.fmType = fmType; | |
1039 | + public void setSurvFetus(Integer survFetus) { | |
1040 | + this.survFetus = survFetus; | |
1049 | 1041 | } |
1050 | 1042 | |
1051 | - public Integer getFitness() { | |
1052 | - return fitness; | |
1053 | - } | |
1054 | - | |
1055 | - public void setFitness(Integer fitness) { | |
1056 | - this.fitness = fitness; | |
1057 | - } | |
1058 | - | |
1059 | - public String getGestaDate() { | |
1060 | - return gestaDate; | |
1061 | - } | |
1062 | - | |
1063 | - public void setGestaDate(String gestaDate) { | |
1064 | - this.gestaDate = gestaDate; | |
1065 | - } | |
1066 | - | |
1067 | - public String getFmTypeRemark() { | |
1068 | - return fmTypeRemark; | |
1069 | - } | |
1070 | - | |
1071 | - public void setFmTypeRemark(String fmTypeRemark) { | |
1072 | - this.fmTypeRemark = fmTypeRemark; | |
1073 | - } | |
1074 | - | |
1075 | - public String getFitnessRemark() { | |
1076 | - return fitnessRemark; | |
1077 | - } | |
1078 | - | |
1079 | - public void setFitnessRemark(String fitnessRemark) { | |
1080 | - this.fitnessRemark = fitnessRemark; | |
1081 | - } | |
1082 | - | |
1083 | 1043 | public String getNextCheckTime() { |
1084 | 1044 | return nextCheckTime; |
1085 | 1045 | } |
... | ... | @@ -1214,12 +1174,8 @@ |
1214 | 1174 | public AntExChuModel convertToDataModel() { |
1215 | 1175 | AntExChuModel antExChuModel = new AntExChuModel(); |
1216 | 1176 | |
1217 | - antExChuModel.setGestaMonth(gestaMonth); | |
1218 | - antExChuModel.setGestaDate(gestaDate); | |
1219 | - antExChuModel.setFmType(fmType); | |
1220 | - antExChuModel.setFmTypeRemark(fmTypeRemark); | |
1221 | - antExChuModel.setFitness(fitness); | |
1222 | - antExChuModel.setFitnessRemark(fitnessRemark); | |
1177 | + antExChuModel.setAntExcAddOthers(antExcAddOthers); | |
1178 | + antExChuModel.setSurvFetus(survFetus); | |
1223 | 1179 | |
1224 | 1180 | antExChuModel.setVulvaSele(vulvaSele); |
1225 | 1181 | antExChuModel.setVaginaSele(vaginaSele); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
View file @
20b8556
... | ... | @@ -2,6 +2,7 @@ |
2 | 2 | |
3 | 3 | import com.lyms.platform.common.utils.DateUtil; |
4 | 4 | import com.lyms.platform.common.utils.JsonUtil; |
5 | +import com.lyms.platform.operate.web.request.AntExcAddOther; | |
5 | 6 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
6 | 7 | import com.lyms.platform.pojo.AntExChuModel; |
7 | 8 | |
... | ... | @@ -163,6 +164,11 @@ |
163 | 164 | private Map bp; |
164 | 165 | |
165 | 166 | private List<MatDeliverAddRequest.Placenta> placentas; |
167 | + //存活胎儿数 | |
168 | + private Integer survFetus; | |
169 | + | |
170 | + //初诊其他信息 | |
171 | + private List<AntExcAddOther> antExcAddOthers; | |
166 | 172 | /* //心率 |
167 | 173 | private double heartRate; |
168 | 174 | //胎方位 |
169 | 175 | |
170 | 176 | |
... | ... | @@ -1212,15 +1218,27 @@ |
1212 | 1218 | this.birthDefectTodo = birthDefectTodo; |
1213 | 1219 | } |
1214 | 1220 | |
1221 | + public Integer getSurvFetus() { | |
1222 | + return survFetus; | |
1223 | + } | |
1224 | + | |
1225 | + public void setSurvFetus(Integer survFetus) { | |
1226 | + this.survFetus = survFetus; | |
1227 | + } | |
1228 | + | |
1229 | + public List<AntExcAddOther> getAntExcAddOthers() { | |
1230 | + return antExcAddOthers; | |
1231 | + } | |
1232 | + | |
1233 | + public void setAntExcAddOthers(List<AntExcAddOther> antExcAddOthers) { | |
1234 | + this.antExcAddOthers = antExcAddOthers; | |
1235 | + } | |
1236 | + | |
1215 | 1237 | public AntexChuResult convertToResult(AntExChuModel antExChuModel) { |
1216 | 1238 | if (null != antExChuModel) { |
1217 | - setGestaMonth(antExChuModel.getGestaMonth()); | |
1218 | - setGestaDate(antExChuModel.getGestaDate()); | |
1219 | - setFmType(antExChuModel.getFmType()); | |
1220 | - setFmTypeRemark(antExChuModel.getFmTypeRemark()); | |
1221 | - setFitness(antExChuModel.getFitness()); | |
1222 | - setFitnessRemark(antExChuModel.getFitnessRemark()); | |
1223 | 1239 | |
1240 | + setSurvFetus(antExChuModel.getSurvFetus()); | |
1241 | + setAntExcAddOthers(antExChuModel.getAntExcAddOthers()); | |
1224 | 1242 | setDiagnosisOther(antExChuModel.getDiagnosisOther()); |
1225 | 1243 | setBarCode(antExChuModel.getBarCode()); |
1226 | 1244 | setId(antExChuModel.getId()); |