Commit 491ae068865699d7bb50bc1809b75cfadfe2830a
1 parent
626f589999
Exists in
master
and in
6 other branches
妇科检查
Showing 1 changed file with 16 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
491ae06
| ... | ... | @@ -1404,14 +1404,24 @@ |
| 1404 | 1404 | mapData.put("gestaMonth", GestaMonthEnums.getTitle(antExcAddOther.getGestaMonth())); |
| 1405 | 1405 | } |
| 1406 | 1406 | mapData.put("gestaDate", antExcAddOther.getGestaDate()); |
| 1407 | - if(antExcAddOther.getFmType()!=null){ | |
| 1408 | - mapData.put("fmType", CZFmTypeEnums.getTitle(antExcAddOther.getFmType())+"，"+antExcAddOther.getFmTypeRemark()==null?"":antExcAddOther.getFmTypeRemark()); | |
| 1407 | + | |
| 1408 | + if (antExcAddOther.getFmType()!=null) { | |
| 1409 | + String fmType = CZFmTypeEnums.getTitle(antExcAddOther.getFmType()); | |
| 1410 | + if(antExcAddOther.getFmTypeRemark()!=null){ | |
| 1411 | + mapData.put("fmType", fmType+"，"+antExcAddOther.getFmTypeRemark()); | |
| 1412 | + }else{ | |
| 1413 | + mapData.put("fmType", fmType); | |
| 1414 | + } | |
| 1409 | 1415 | }else{ |
| 1410 | - mapData.put("fmTypeRemark", antExcAddOther.getFmTypeRemark()); | |
| 1416 | + mapData.put("fmType", antExcAddOther.getFmTypeRemark()); | |
| 1411 | 1417 | } |
| 1412 | - | |
| 1413 | - if(antExcAddOther.getFitness()!=null){ | |
| 1414 | - mapData.put("fitness", FitnessEnums.getTitle(antExcAddOther.getFitness())+"，"+antExcAddOther.getFitnessRemark()==null?"":antExcAddOther.getFitnessRemark()); | |
| 1418 | + if (antExcAddOther.getFitness()!=null) { | |
| 1419 | + String fitness = FitnessEnums.getTitle(Integer.parseInt(antExcAddOther.getFitness().toString())); | |
| 1420 | + if(antExcAddOther.getFitnessRemark()!=null){ | |
| 1421 | + mapData.put("fitness", fitness+"，"+antExcAddOther.getFitnessRemark()); | |
| 1422 | + }else { | |
| 1423 | + mapData.put("fitness", fitness); | |
| 1424 | + } | |
| 1415 | 1425 | }else{ |
| 1416 | 1426 | mapData.put("fitness", antExcAddOther.getFitnessRemark()); |
| 1417 | 1427 | } |