Commit 80391d5fe299515c27deee6572042ea64acb7e05
1 parent
f82de98eca
Exists in
master
and in
6 other branches
聊城妇幼产检增加字段
Showing 1 changed file with 31 additions and 10 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
80391d5
| ... | ... | @@ -1377,16 +1377,37 @@ |
| 1377 | 1377 | if (CollectionUtils.isNotEmpty(data.getAntExcAddOthers())) { |
| 1378 | 1378 | List<AntExcAddOther> antExcAddOthers = data.getAntExcAddOthers(); |
| 1379 | 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); | |
| 1380 | + for (Object obj : antExcAddOthers) { | |
| 1381 | + if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { | |
| 1382 | + Map<String, Object> otherMap = (Map<String, Object>) obj; | |
| 1383 | + if (MapUtils.isNotEmpty(otherMap)) { | |
| 1384 | + Map<String, Object> mapData = new HashMap<>(); | |
| 1385 | + | |
| 1386 | + if (otherMap.containsKey("gestaMonth")) { | |
| 1387 | + String gestaMonth = GestaMonthEnums.getTitle(Integer.parseInt(otherMap.get("gestaMonth").toString())); | |
| 1388 | + mapData.put("gestaMonth", gestaMonth); | |
| 1389 | + } | |
| 1390 | + if (otherMap.get("gestaDate") != null) { | |
| 1391 | + mapData.put("gestaDate", otherMap.get("gestaDate")); | |
| 1392 | + } | |
| 1393 | + if (otherMap.containsKey("fmType")) { | |
| 1394 | + String fmType = CZFmTypeEnums.getTitle(Integer.parseInt(otherMap.get("fmType").toString())); | |
| 1395 | + mapData.put("fmType", fmType); | |
| 1396 | + } | |
| 1397 | + mapData.put("fmTypeRemark", otherMap.get("fmTypeRemark")); | |
| 1398 | + if (otherMap.containsKey("fitness")) { | |
| 1399 | + String fitness = FitnessEnums.getTitle(Integer.parseInt(otherMap.get("fitness").toString())); | |
| 1400 | + mapData.put("fitness", fitness); | |
| 1401 | + } | |
| 1402 | + if (otherMap.get("fitnessRemark") != null) { | |
| 1403 | + mapData.put("fitnessRemark", otherMap.get("fitnessRemark")); | |
| 1404 | + } | |
| 1405 | + if (otherMap.get("newborWeight") != null) { | |
| 1406 | + mapData.put("newborWeight", otherMap.get("newborWeight")); | |
| 1407 | + } | |
| 1408 | + antExcAddOthersList.add(map); | |
| 1409 | + } | |
| 1410 | + } | |
| 1390 | 1411 | } |
| 1391 | 1412 | } |
| 1392 | 1413 | } |