Commit 7fce7812770cce05eeab53ab414817fde379d9bf
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
7fce781
| ... | ... | @@ -934,7 +934,6 @@ |
| 934 | 934 | String parentId = jsonObject.getString("parentId"); |
| 935 | 935 | int type = jsonObject.getInt("type"); |
| 936 | 936 | |
| 937 | - Map<String, Object> map = new HashMap<>(); | |
| 938 | 937 | |
| 939 | 938 | Patients pat = patientsService.findOnePatientById(parentId); |
| 940 | 939 | HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(pat.getPid(), false); |
| ... | ... | @@ -945,7 +944,6 @@ |
| 945 | 944 | patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); |
| 946 | 945 | patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); |
| 947 | 946 | |
| 948 | - map.put("patientInfo", patientBaseResult); | |
| 949 | 947 | SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); |
| 950 | 948 | sieveApplyOrderQuery1.setParentId(parentId); |
| 951 | 949 | sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); |
| ... | ... | @@ -958,6 +956,7 @@ |
| 958 | 956 | List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery); |
| 959 | 957 | if (CollectionUtils.isNotEmpty(list)) { |
| 960 | 958 | SieveResultModel model = list.get(0); |
| 959 | + sieveResultEditInfo.put("patientInfo", patientBaseResult); | |
| 961 | 960 | sieveResultEditInfo.put("id", model.getId()); |
| 962 | 961 | sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : ""); |
| 963 | 962 | sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : ""); |
| 964 | 963 | |
| ... | ... | @@ -1017,13 +1016,13 @@ |
| 1017 | 1016 | } |
| 1018 | 1017 | sieveResultEditInfo.put("stzhz13", stzhz13); |
| 1019 | 1018 | } |
| 1020 | - map.put("sieveResultEditInfo", sieveResultEditInfo); | |
| 1019 | + baseResponse.setObject(sieveResultEditInfo); | |
| 1021 | 1020 | } else {//查看申请单 |
| 1022 | 1021 | List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); |
| 1023 | 1022 | if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { |
| 1024 | 1023 | Map<String, Object> result = new HashMap<>(); |
| 1025 | 1024 | SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); |
| 1026 | - | |
| 1025 | + result.put("patientInfo", patientBaseResult); | |
| 1027 | 1026 | result.put("weight", sieveApply.getWeight()); |
| 1028 | 1027 | result.put("lastMenstr", DateUtil.getyyyy_MM_dd(sieveApply.getLastMenses())); |
| 1029 | 1028 | result.put("bbh", sieveApply.getNumber()); |
| 1030 | 1029 | |
| ... | ... | @@ -1057,8 +1056,8 @@ |
| 1057 | 1056 | result.put("lastMenstr", chuModel.getLastMenses()); |
| 1058 | 1057 | result.put("polyember", isTire); |
| 1059 | 1058 | } |
| 1059 | + baseResponse.setObject(result); | |
| 1060 | 1060 | } |
| 1061 | - baseResponse.setObject(map); | |
| 1062 | 1061 | } |
| 1063 | 1062 | return baseResponse; |
| 1064 | 1063 | } |