Commit 4fcea70b3957489c56abd131f18ac4cc7b87cff6
1 parent
b2ad6b6e17
Exists in
master
and in
6 other branches
测量
Showing 2 changed files with 11 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java
View file @
4fcea70
| ... | ... | @@ -441,8 +441,14 @@ |
| 441 | 441 | map.put("ALB",antExChuModel.getAlbumin()); |
| 442 | 442 | map.put("TBI",antExChuModel.getTotalBilirubin()); |
| 443 | 443 | if(StringUtils.isNotEmpty(antExChuModel.getJhBilirubin()) && StringUtils.isNotEmpty(antExChuModel.getTotalBilirubin())){ |
| 444 | - double jh = Double.parseDouble(antExChuModel.getTotalBilirubin()) - Double.parseDouble(antExChuModel.getJhBilirubin()); | |
| 445 | - map.put("DBIL",String.valueOf(jh).substring(0,4)); | |
| 444 | + try { | |
| 445 | + double jh = Double.parseDouble(antExChuModel.getTotalBilirubin()) - Double.parseDouble(antExChuModel.getJhBilirubin()); | |
| 446 | + map.put("DBIL",String.valueOf(jh).substring(0,4)); | |
| 447 | + }catch (Exception e) | |
| 448 | + { | |
| 449 | + map.put("DBIL",""); | |
| 450 | + } | |
| 451 | + | |
| 446 | 452 | } |
| 447 | 453 | map.put("BUN",antExChuModel.getXnsd()); |
| 448 | 454 | map.put("SCR",antExChuModel.getXqjq()); |
| ... | ... | @@ -1072,7 +1078,7 @@ |
| 1072 | 1078 | map.put("BABYCHEST",null); |
| 1073 | 1079 | map.put("BABYHEIGHT",babyModel.getBabyHeight()); |
| 1074 | 1080 | map.put("BABYHEADSIZE",babyModel.getBabyHead()); |
| 1075 | - if(1 == babyModel.getMalformation()){ | |
| 1081 | + if(babyModel.getMalformation() != null && 1 == babyModel.getMalformation()){ | |
| 1076 | 1082 | map.put("BABYMALFORMATION","2"); |
| 1077 | 1083 | } |
| 1078 | 1084 | if(babyModel.getApgarScore() != null){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
4fcea70
| ... | ... | @@ -839,7 +839,8 @@ |
| 839 | 839 | patientsQuery.setVcCardNo(certNo); |
| 840 | 840 | } |
| 841 | 841 | |
| 842 | - patientsQuery.setHospitalId(hospitalId); | |
| 842 | + //patientsQuery.setHospitalId(hospitalId); | |
| 843 | + patientsQuery.setType(1); | |
| 843 | 844 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 844 | 845 | List<Patients> patientses = patientsService.queryPatient(patientsQuery); |
| 845 | 846 | if (CollectionUtils.isEmpty(patientses)) { |