Commit 217cc8c3c66ab7562e55ee8a0249733358b80577
1 parent
3fd4442d3d
Exists in
master
and in
6 other branches
查询号bug修改
Showing 1 changed file with 49 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
217cc8c
| ... | ... | @@ -260,7 +260,7 @@ |
| 260 | 260 | AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4]; |
| 261 | 261 | AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id); |
| 262 | 262 | Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId()); |
| 263 | - if (num < 3) { | |
| 263 | + if (num < 4) { | |
| 264 | 264 | exData[num - 1] = antenatalExaminationModel; |
| 265 | 265 | } else {//全部 |
| 266 | 266 | String patientsId = antenatalExaminationModel.getParentId(); |
| ... | ... | @@ -274,7 +274,6 @@ |
| 274 | 274 | exData[1] = list.get(1); |
| 275 | 275 | exData[2] = list.get(2); |
| 276 | 276 | exData[3] = list.get(3); |
| 277 | - | |
| 278 | 277 | } |
| 279 | 278 | |
| 280 | 279 | // Map<String, Object> map = new HashMap<>(); |
| ... | ... | @@ -1458,6 +1457,16 @@ |
| 1458 | 1457 | } |
| 1459 | 1458 | map.put("bp", UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG)); |
| 1460 | 1459 | map.put("gongGao", UnitUtils.unitSplice(data.getGongGao(), UnitConstants.CM)); |
| 1460 | + | |
| 1461 | + if (StringUtils.isNotEmpty(data.getGongGaoSelect())) { | |
| 1462 | + map.put("gongGaoSelect", GongJingEnums.getGongGaoNameById(data.getGongGaoSelect())); | |
| 1463 | + } | |
| 1464 | + | |
| 1465 | + if (StringUtils.isNotEmpty(data.getGongGaoType())) { | |
| 1466 | + map.put("gongGaoType", GongJingEnums.getHengZhiNameById(data.getGongGaoType())); | |
| 1467 | + } | |
| 1468 | + | |
| 1469 | + | |
| 1461 | 1470 | map.put("abdominalCircumference", UnitUtils.unitSplice(data.getAbdominalCircumference(), UnitConstants.CM)); |
| 1462 | 1471 | String edema = ""; |
| 1463 | 1472 | if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getEdema())) { |
| ... | ... | @@ -1486,6 +1495,44 @@ |
| 1486 | 1495 | tireMap.put("fetalPosition", FetalPositionEnums.getTitle(fetalPosition)); |
| 1487 | 1496 | tireMap.put("fetalPresentation", FetalEnums.getTitle(fetalPresentation)); |
| 1488 | 1497 | tireMap.put("join", JoinEnums.getTitle(join)); |
| 1498 | + if (tire.get("xlwz")!=null) { | |
| 1499 | + tireMap.put("xlwz", GongJingEnums.getXLWeiZhiNameById(String.valueOf(tire.get("xlwz")))); | |
| 1500 | + } | |
| 1501 | + if (tire.get("gjwz")!=null) { | |
| 1502 | + tireMap.put("gjwz", GongJingEnums.getWeiZhiNameById(String.valueOf(tire.get("gjwz")))); | |
| 1503 | + } | |
| 1504 | + | |
| 1505 | + if (tire.get("gjyd")!=null) { | |
| 1506 | + tireMap.put("gjyd", GongJingEnums.getYinDuNameById(String.valueOf(tire.get("gjyd")))); | |
| 1507 | + } | |
| 1508 | + | |
| 1509 | + if (tire.get("tm")!=null) { | |
| 1510 | + tireMap.put("tm", TaiShuEnums.getTmNameById(String.valueOf(tire.get("tm")))); | |
| 1511 | + } | |
| 1512 | + | |
| 1513 | + if (tire.get("ydjc")!=null) { | |
| 1514 | + tireMap.put("ydjc", GongJingEnums.getYDJianCeNameById(String.valueOf(tire.get("ydjc")))); | |
| 1515 | + } | |
| 1516 | + | |
| 1517 | + if (tire.get("gjkd") != null) { | |
| 1518 | + tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM)); | |
| 1519 | + } | |
| 1520 | + | |
| 1521 | + if (tire.get("gjrs") != null) { | |
| 1522 | + tireMap.put("gjrs", UnitUtils.unitSplice(tire.get("gjrs"), UnitConstants.BF)); | |
| 1523 | + } | |
| 1524 | + | |
| 1525 | + if (tire.get("gjwzOther")!=null) { | |
| 1526 | + tireMap.put("gjwzOther", tire.get("gjwzOther")); | |
| 1527 | + } | |
| 1528 | + | |
| 1529 | + if (tire.get("gjydOther")!=null) { | |
| 1530 | + tireMap.put("gjydOther", tire.get("gjydOther")); | |
| 1531 | + } | |
| 1532 | + | |
| 1533 | + if (tire.get("yszs") != null) { | |
| 1534 | + tireMap.put("yszs", UnitUtils.unitSplice(tire.get("yszs"), UnitConstants.CM)); | |
| 1535 | + } | |
| 1489 | 1536 | tireList.add(tireMap); |
| 1490 | 1537 | } |
| 1491 | 1538 | } |