liquanyu / regional-platform

Download as
Browse Code »

Commit b9551ab2604f6316706ba4d030c117b6d9fe2177

Authored by yangfei
1 parent ec32f3778e
Exists in master and in 1 other branch dev

追访..

Showing 1 changed file with 10 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ b9551ab
... ... @@ -949,26 +949,27 @@
949 949 sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
950 950  
951 951 if (type == 2) {//查看报告
952   - Map<String, Object> sieveResultEditInfo = new HashMap<>();
  952 +
  953 + Map<String, Object> sieveResultEditInfo = new HashMap<>();
  954 + List<SieveApplyOrderModel> sieveApplyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
  955 + if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) {
  956 + SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
  957 + String hostName = CommonsHelper.getHospitalName(sieveApply.getSieveHospitalId(), organizationService);
  958 + sieveResultEditInfo.put("reportHostName",hostName);
  959 + }
953 960 SieveResultQuery sieveResultQuery = new SieveResultQuery();
954 961 sieveResultQuery.setParentId(parentId);
955 962 sieveResultQuery.setYn(YnEnums.YES.getId());
956 963 List<SieveResultModel> list = sieveService.queryListSieveResult(sieveResultQuery);
957 964 if (CollectionUtils.isNotEmpty(list)) {
958 965 SieveResultModel model = list.get(0);
  966 +
  967 +
959 968 sieveResultEditInfo.put("patientInfo", patientBaseResult);
960 969 sieveResultEditInfo.put("id", model.getId());
961   - sieveResultEditInfo.put("hcg", model.getHcg() != null ? model.getHcg() : "");
962   - sieveResultEditInfo.put("hcgMom", model.getHcgMom() != null ? model.getHcgMom() : "");
963   - sieveResultEditInfo.put("hafp", model.getHafp() != null ? model.getHafp() : "");
964   - sieveResultEditInfo.put("hafpMom", model.getHafpMom() != null ? model.getHafpMom() : "");
965 970 sieveResultEditInfo.put("examineId", model.getExamineId());
966 971 sieveResultEditInfo.put("checkerId", model.getCheckerId());
967 972 sieveResultEditInfo.put("resultTime", DateUtil.getyyyy_MM_dd(model.getResultTime()));
968   - sieveResultEditInfo.put("tszhz", model.getTszhz());
969   - sieveResultEditInfo.put("sbst", model.getSbst());
970   - sieveResultEditInfo.put("stzhz13", model.getStzhz13());
971   - sieveResultEditInfo.put("sjgjx", model.getSjgjx());
972 973 sieveResultEditInfo.put("tszhzValue", model.getTszhzValue());
973 974 sieveResultEditInfo.put("sbstValue", model.getSbstValue());
974 975 sieveResultEditInfo.put("stzhz13Value", model.getStzhz13Value());