diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index decf6d0..337e7af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -110,6 +110,8 @@ public class AntenatalExaminationFacade { @Autowired private MeasureInfoFacade measureInfoFacade; + @Autowired + private SieveFacade sieveFacade; /** * 处理区域隐藏建档 @@ -2078,12 +2080,20 @@ public class AntenatalExaminationFacade { antexListResult.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数 } - //测量数据 + if (patients != null) { + + //测量数据 antexListResult.setMeasureData(measureInfoFacade.getMeasureInfo(patients.getPcerteTypeId(),patients.getCardNo(),hospitalId)); + + //产筛状态 + antexListResult.setSieveStatus(sieveFacade.getSieveStatus(patients.getId(), hospitalId)); } + + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } 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 882854e..953f3df 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.OptActionEnums; +import com.lyms.platform.common.enums.SieveEnums; import com.lyms.platform.common.enums.TrackDownDateEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; @@ -236,6 +237,93 @@ public class SieveFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + + public String getSieveStatus(String patientId,String hospitalId) + { + + String siveStatus = ""; + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setHospitalId(hospitalId); + sieveQuery.setParentId(patientId); + //查询产筛list + List list = sieveService.queryList1(sieveQuery, "order"); + if (CollectionUtils.isNotEmpty(list)) + { + SieveModel model = list.get(0); + if (model.getZtfx() == null) + { + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setParentId(patientId); + sieveApplyOrderQuery1.setHospitalId(hospitalId); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isEmpty(list1)) + { + siveStatus = "未产筛"; + } + else + { + siveStatus = "已申请"; + } + } + else + { + siveStatus = SieveEnums.getTitle(model.getZtfx()); + } + } + else + { + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setParentId(patientId); + sieveApplyOrderQuery1.setHospitalId(hospitalId); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isEmpty(list1)) + { + siveStatus = "未产筛"; + } + else + { + SieveResultQuery sieveResultQuery = new SieveResultQuery(); + sieveResultQuery.setParentId(patientId); + sieveResultQuery.setYn(YnEnums.YES.getId()); + List resultModels = sieveService.queryListSieveResult(sieveResultQuery); + if (CollectionUtils.isNotEmpty(resultModels)) + { + + SieveResultModel resultModel = resultModels.get(0); + + List slist =new ArrayList<>(); + + if(StringUtils.isNotEmpty(resultModel.getTszhz())){ + slist.add(Integer.valueOf(resultModel.getTszhz())); + } + if(StringUtils.isNotEmpty(resultModel.getSjgjx())){ + slist.add(Integer.valueOf(resultModel.getSjgjx())); + } + if(StringUtils.isNotEmpty(resultModel.getSbst())){ + slist.add(Integer.valueOf(resultModel.getSbst())); + } + if(StringUtils.isNotEmpty(resultModel.getDzhpx())){ + slist.add(Integer.valueOf(resultModel.getDzhpx())); + } + if(StringUtils.isNotEmpty(resultModel.getStzhz13())){ + slist.add(Integer.valueOf(resultModel.getStzhz13())); + } + siveStatus = SieveEnums.getTitle(Collections.max(slist)); + } + else + { + siveStatus = "已申请"; + } + } + } + + return siveStatus; + } + + /** * 查询产筛列表数据 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 1f7a122..db97730 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -53,8 +53,10 @@ public class ViewFacade { private UsersService usersService; @Autowired private OrganizationService organizationService; + @Autowired - private CommonService commonService; + private SieveFacade sieveFacade; + @Autowired private MatDeliverService matDeliverService; @Autowired @@ -1811,6 +1813,7 @@ public class ViewFacade { map.put("highriskDesc", data.getHighriskDesc()); map.put("first", (data.getFirst() == null || data.getFirst() == 1) ? "否" : "是"); + map.put("sieveStatus", sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId())); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -2137,6 +2140,9 @@ public class ViewFacade { //补充高危因素 map.put("highriskDesc", data.getHighriskDesc()); + //产筛状态 + map.put("sieveStatus", sieveFacade.getSieveStatus(patients.getId(), patients.getHospitalId())); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 8d3ab96..e57c0d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -63,8 +63,20 @@ public class AntexListResult { private String vcCardNo; private String isSieve; private String isH = "0"; + + private String sieveStatus; + // + + public String getSieveStatus() { + return sieveStatus; + } + + public void setSieveStatus(String sieveStatus) { + this.sieveStatus = sieveStatus; + } + private Map measureData; public Map getMeasureData() { 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 490fdae..dd970e5 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 @@ -57,6 +57,17 @@ public class SieveDetailResult { //录入人员 private String publishName; + //诊断结果时间 + private String diagnosisTime; + + public String getDiagnosisTime() { + return diagnosisTime; + } + + public void setDiagnosisTime(String diagnosisTime) { + this.diagnosisTime = diagnosisTime; + } + public Integer getDiaresult() { return diaresult; } @@ -186,6 +197,7 @@ public class SieveDetailResult { setDiaTime(sieveModel.getDiaTime()); setPublishName(sieveModel.getPublishName()); + setDiagnosisTime(sieveModel.getDiagnosisTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveModel.getDiagnosisTime())); return this; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java index fa26ca1..143c3df 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java @@ -50,8 +50,6 @@ public class SieveResult { //结果录入时间 private String resultTime; - //诊断结果时间 - private String diagnosisTime; public String getResultTime() { return resultTime; @@ -61,13 +59,6 @@ public class SieveResult { this.resultTime = resultTime; } - public String getDiagnosisTime() { - return diagnosisTime; - } - - public void setDiagnosisTime(String diagnosisTime) { - this.diagnosisTime = diagnosisTime; - } public String getCspj() { return cspj; @@ -170,7 +161,6 @@ public class SieveResult { setSjgjx(sieveResultModel.getSjgjx()); setTszhz(sieveResultModel.getTszhz()); setStzhz13(sieveResultModel.getStzhz13()); - setDiagnosisTime(sieveResultModel.getDiagnosisTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveResultModel.getDiagnosisTime())); setResultTime(sieveResultModel.getResultTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); return this; }