Commit 9424940650e2dfab4f81db75a4c1b7672d0be6e7
1 parent
722257e09e
Exists in
master
and in
6 other branches
秦皇岛高危设置
Showing 2 changed files with 39 additions and 0 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
View file @
9424940
| ... | ... | @@ -24,6 +24,7 @@ |
| 24 | 24 | import net.sf.json.JSONArray; |
| 25 | 25 | import net.sf.json.JSONObject; |
| 26 | 26 | import org.apache.commons.collections.CollectionUtils; |
| 27 | +import org.apache.commons.lang.StringUtils; | |
| 27 | 28 | import org.codehaus.jackson.type.TypeReference; |
| 28 | 29 | import org.springframework.beans.factory.annotation.Autowired; |
| 29 | 30 | import org.springframework.beans.factory.annotation.Qualifier; |
| ... | ... | @@ -590,6 +591,20 @@ |
| 590 | 591 | } |
| 591 | 592 | if ("".equals(antExChuModel.getRh()) || antExChuModel.getRh() == null) {//RH血型 |
| 592 | 593 | antExChuModel1.setRh(getCodeValue(model, "RHDType")); |
| 594 | + | |
| 595 | + if ("216".equals(antExChuModel1.getHospitalId()) && "yin".equals(antExChuModel1.getRh())) | |
| 596 | + { | |
| 597 | + String risks = antExChuModel1.getHighrisk(); | |
| 598 | + if ( StringUtils.isNotEmpty(risks) && !"[]".equals(risks)) { | |
| 599 | + List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); | |
| 600 | + if (CollectionUtils.isNotEmpty(list2) && !list2.contains("5aab6d3d422b03d4ad2bf830")) | |
| 601 | + { | |
| 602 | + list2.add("5aab6d3d422b03d4ad2bf830s"); | |
| 603 | + antExChuModel1.setHighrisk(JsonUtil.array2JsonString(list2)); | |
| 604 | + } | |
| 605 | + } | |
| 606 | + | |
| 607 | + } | |
| 593 | 608 | } |
| 594 | 609 | if ("".equals(antExChuModel.getBloodSugar()) || antExChuModel.getBloodSugar() == null) {//血糖 |
| 595 | 610 | antExChuModel1.setBloodSugar(getCodeValue(model, "GLU")); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
9424940
| ... | ... | @@ -666,7 +666,17 @@ |
| 666 | 666 | |
| 667 | 667 | final String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 668 | 668 | |
| 669 | + if ("216".equals(hospitalId) && "yin".equals(excAddRequest.getRh())) | |
| 670 | + { | |
| 671 | + List risks = excAddRequest.getHighrisk(); | |
| 672 | + if (CollectionUtils.isNotEmpty(risks) && !risks.contains("5aab6d3d422b03d4ad2bf830")) | |
| 673 | + { | |
| 674 | + risks.add("5aab6d3d422b03d4ad2bf830s"); | |
| 675 | + excAddRequest.setHighrisk(risks); | |
| 676 | + } | |
| 677 | + } | |
| 669 | 678 | |
| 679 | + | |
| 670 | 680 | // //秦皇岛市山海关人民医院 零时处理 |
| 671 | 681 | // if (StringUtils.isNotEmpty(excAddRequest.getCheckTime()) && "1000000004".equals(hospitalId)) { |
| 672 | 682 | // if (!excAddRequest.getCheckTime().equals(DateUtil.getyyyy_MM_dd(new Date()))) |
| ... | ... | @@ -3045,6 +3055,20 @@ |
| 3045 | 3055 | } |
| 3046 | 3056 | if (StringUtils.isEmpty(antExChu.get(i).getRh())) {//RH血型 |
| 3047 | 3057 | antExChuModel.setRh(maps.get("rhxx")); |
| 3058 | + | |
| 3059 | + if ("216".equals(antExChuModel.getHospitalId()) && "yin".equals(antExChuModel.getRh())) | |
| 3060 | + { | |
| 3061 | + String risks = antExChuModel.getHighrisk(); | |
| 3062 | + if ( StringUtils.isNotEmpty(risks) && !"[]".equals(risks)) { | |
| 3063 | + List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); | |
| 3064 | + if (CollectionUtils.isNotEmpty(list2) && !list2.contains("5aab6d3d422b03d4ad2bf830")) | |
| 3065 | + { | |
| 3066 | + list2.add("5aab6d3d422b03d4ad2bf830s"); | |
| 3067 | + antExChuModel.setHighrisk(JsonUtil.array2JsonString(list2)); | |
| 3068 | + } | |
| 3069 | + } | |
| 3070 | + | |
| 3071 | + } | |
| 3048 | 3072 | } |
| 3049 | 3073 | if (StringUtils.isEmpty(antExChu.get(i).getBloodSugar())) {//血糖 |
| 3050 | 3074 | antExChuModel.setBloodSugar(maps.get("xt")); |