Commit 63acd847db6515ba75985375d8e031181fa0d52b
1 parent
0978a51c5d
Exists in
master
and in
6 other branches
秦皇岛基本公卫修改
Showing 1 changed file with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
View file @
63acd84
| ... | ... | @@ -422,9 +422,9 @@ |
| 422 | 422 | map.put("AST",antExChuModel.getXqgczam()); |
| 423 | 423 | map.put("ALB",antExChuModel.getAlbumin()); |
| 424 | 424 | map.put("TBI",antExChuModel.getTotalBilirubin()); |
| 425 | - if(antExChuModel.getJhBilirubin() != null && antExChuModel.getTotalBilirubin() != null){ | |
| 425 | + if(StringUtils.isNotEmpty(antExChuModel.getJhBilirubin()) && StringUtils.isNotEmpty(antExChuModel.getTotalBilirubin())){ | |
| 426 | 426 | double jh = Double.parseDouble(antExChuModel.getTotalBilirubin()) - Double.parseDouble(antExChuModel.getJhBilirubin()); |
| 427 | - map.put("DBIL",String.valueOf(jh)); | |
| 427 | + map.put("DBIL",String.valueOf(jh).substring(0,4)); | |
| 428 | 428 | } |
| 429 | 429 | map.put("BUN",antExChuModel.getXnsd()); |
| 430 | 430 | map.put("SCR",antExChuModel.getXqjq()); |
| ... | ... | @@ -511,6 +511,12 @@ |
| 511 | 511 | familyHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); |
| 512 | 512 | } |
| 513 | 513 | map.put("REGISTERFAMILYHISTORY",familyHistory); |
| 514 | + String personalHistory=""; | |
| 515 | + if(StringUtils.isNotEmpty(antExChuModel.getPersonalHistory())){ | |
| 516 | + Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getFamilyHistory(), Map.class); | |
| 517 | + personalHistory = FunvCommonUtil.replace(map1, new StringBuilder(), basicConfigService); | |
| 518 | + } | |
| 519 | + map.put("personalHistory",personalHistory); | |
| 514 | 520 | String cestationInfo=""; |
| 515 | 521 | if(StringUtils.isNotEmpty(antExChuModel.getCestationInfo())){ |
| 516 | 522 | Map map1 = JsonUtil.jkstr2Obj(antExChuModel.getCestationInfo(), Map.class); |