diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index e5b550e..fb4faf7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -15,6 +15,8 @@ import com.lyms.platform.operate.web.request.SieveAddRequest; import com.lyms.platform.operate.web.result.SieveDetailResult; import com.lyms.platform.operate.web.result.SieveListResult; import com.lyms.platform.operate.web.result.SieveResult; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; @@ -29,6 +31,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; /** @@ -40,12 +43,13 @@ import java.util.List; public class SieveFacade { @Autowired private SieveService sieveService; - @Autowired - private PatientsService patientsService; + @Autowired private AutoMatchFacade autoMatchFacade; @Autowired private AntenatalExaminationService antenatalExaminationService; + @Autowired + private OrganizationService organizationService; /** * 增加一条产筛结果记录 @@ -85,8 +89,8 @@ public class SieveFacade { SieveResult sieveResult=new SieveResult(); if(CollectionUtils.isNotEmpty(sb)){ SieveResultModel sieveResultModel=sb.get(0); - Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId()); - sieveResult.convert(sieveResultModel,patients); +// Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId()); + sieveResult.convert(sieveResultModel,null); } return new BaseObjectResponse().setData(sieveResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -102,7 +106,19 @@ public class SieveFacade { SieveModel sieveModel= sieveModels.get(0); // Patients patients= patientsService.findOnePatientById(sieveModel.getParentId()); sieveDetailResult.convert(sieveModel); + java.util.Map map = new HashMap<>(); + String diaUnit= sieveModel.getDiaUnit(); + map.put("id","-1"); + map.put("name",diaUnit); + if(StringUtils.isNotEmpty(diaUnit)&&NumberUtils.isNumber(diaUnit)){ + Organization organization = organizationService.getOrganization(Integer.valueOf(diaUnit)); + if(null!=organization){ + map.put("id",organization.getId()+""); + map.put("name",organization.getName()); + } + } + sieveDetailResult.setDiaUnit(map); } return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java index 351af5c..490fdae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java @@ -10,6 +10,7 @@ import org.codehaus.jackson.annotate.JsonIgnore; import java.util.Date; import java.util.List; +import java.util.Map; /** *产前诊断结果 @@ -52,7 +53,7 @@ public class SieveDetailResult { // 诊断时间 private String diaTime; //诊断单位 - private String diaUnit; + private java.util.Map diaUnit; //录入人员 private String publishName; @@ -112,11 +113,11 @@ public class SieveDetailResult { this.diaTime = diaTime; } - public String getDiaUnit() { + public Map getDiaUnit() { return diaUnit; } - public void setDiaUnit(String diaUnit) { + public void setDiaUnit(Map diaUnit) { this.diaUnit = diaUnit; } @@ -177,13 +178,13 @@ public class SieveDetailResult { if(null!=sieveModel.getCqResult()){ setDiaresultText(ChanQResultEnums.getTitle(sieveModel.getCqResult())); } - setPregnancyOutcome(sieveModel.getRenShenResult()+""); + setPregnancyOutcome(sieveModel.getRenShenResult() + ""); if(null!=sieveModel.getRenShenResult()){ setPregnancyOutcomeText(RenShenJieJu1Enums.getTitle(sieveModel.getRenShenResult() + "")); } setStatus(sieveModel.getStatus()); setDiaTime(sieveModel.getDiaTime()); - setDiaUnit(sieveModel.getDiaUnit()); + setPublishName(sieveModel.getPublishName()); return this; }