From 094ca037ca8de1469da427230d694a82148a3fb6 Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 17 Jul 2020 12:46:31 +0800 Subject: [PATCH] update --- .../operate/web/controller/SieveController.java | 2 +- .../platform/operate/web/facade/SieveFacade.java | 2 +- .../web/worker/SieveRegionalCqsievesWorker.java | 145 +++++++++++---------- 3 files changed, 80 insertions(+), 69 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index 3dae3ac..3ae6aa5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -269,7 +269,7 @@ public class SieveController extends BaseController { @TokenRequired public BaseResponse regionalCqsievesList(@Valid CqSieveQueryRequest cqSieveQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.regionalCqsievesList(cqSieveQueryRequest, loginState.getId(), "true", false); + return sieveFacade.regionalCqsievesList(cqSieveQueryRequest, loginState.getId(), "true", true); } /** * 区域 产筛申请统计导出 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 f92c7c3..0037613 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 @@ -3147,7 +3147,7 @@ public class SieveFacade { } public void exportRegionalCqsievesList(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) { try { - BaseListResponse listResponse = (BaseListResponse) regionalCqsievesList(cqSieveQueryRequest, id, "true", true); + BaseListResponse listResponse = (BaseListResponse) regionalCqsievesList(cqSieveQueryRequest, id, null, true); List list = listResponse.getData(); List> datas = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveRegionalCqsievesWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveRegionalCqsievesWorker.java index 874a869..010c2f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveRegionalCqsievesWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveRegionalCqsievesWorker.java @@ -60,80 +60,91 @@ public class SieveRegionalCqsievesWorker implements Callable results = new ArrayList<>(); for (SieveModel sieveModel : list) { - SieveListResult sieveListResult = new SieveListResult(); - //申请孕周 - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(sieveModel.getHospitalId()); - antExQuery.setParentId(sieveModel.getParentId()); + SieveResultModel resultModel = null; + try { + SieveListResult sieveListResult = new SieveListResult(); + //申请孕周 + AntExQuery antExQuery = new AntExQuery(); + antExQuery.setYn(YnEnums.YES.getId()); + antExQuery.setHospitalId(sieveModel.getHospitalId()); + antExQuery.setParentId(sieveModel.getParentId()); - //获取产筛申请数据 - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); - sieveApplyOrderQuery.setSort("created descc"); - sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); - sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId()); - sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); - sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId()); + //获取产筛申请数据 + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setSort("created descc"); + sieveApplyOrderQuery.setParentId(sieveModel.getParentId()); + sieveApplyOrderQuery.setHospitalId(sieveModel.getHospitalId()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery.setLymsSieveId(sieveModel.getId()); - //产筛结果 - SieveResultQuery sieveResultQuery = new SieveResultQuery(); - sieveResultQuery.setSort("created descc"); - sieveResultQuery.setParentId(sieveModel.getParentId()); - sieveResultQuery.setYn(YnEnums.YES.getId()); - List resultModels = sieveService.queryListSieveResult(sieveResultQuery); - if (CollectionUtils.isNotEmpty(resultModels)) { - SieveResultModel resultModel = resultModels.get(0); - if(StringUtils.isNotEmpty(resultModel.getTszhz())){ - sieveListResult.setTszhz(SieveEnums.getTitle(Integer.parseInt(resultModel.getTszhz())));//21 -三体 + //产筛结果 + SieveResultQuery sieveResultQuery = new SieveResultQuery(); + sieveResultQuery.setSort("created descc"); + sieveResultQuery.setParentId(sieveModel.getParentId()); + sieveResultQuery.setYn(YnEnums.YES.getId()); + List resultModels = sieveService.queryListSieveResult(sieveResultQuery); + if (CollectionUtils.isNotEmpty(resultModels)) { + resultModel = resultModels.get(0); + if(StringUtils.isNotEmpty(resultModel.getTszhz())){ + sieveListResult.setTszhz(SieveEnums.getTitle(Integer.parseInt(resultModel.getTszhz())));//21 -三体 + } + if(StringUtils.isNotEmpty(resultModel.getSbst())){ + sieveListResult.setSbst(SieveEnums.getTitle(Integer.parseInt(resultModel.getSbst())));// 18-三体 + } + if(StringUtils.isNotEmpty(resultModel.getSjgjx())){ + if(resultModel.getSjgjx().contains("/") ){ + String sjgjx = resultModel.getSjgjx(); + sjgjx= sjgjx.substring(0,sjgjx.indexOf("/")); + sieveListResult.setSjgjx(SieveEnums.getTitle(Integer.parseInt(sjgjx)));// 神经管畸形 + }else { + sieveListResult.setSjgjx(SieveEnums.getTitle(Integer.parseInt(resultModel.getSjgjx())));// 神经管畸形 + } + } } - if(StringUtils.isNotEmpty(resultModel.getSbst())){ - sieveListResult.setSbst(SieveEnums.getTitle(Integer.parseInt(resultModel.getSbst())));// 18-三体 + List applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + if(CollectionUtils.isEmpty(applyOrderModels)){ + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setSort("created descc"); + sieveApplyOrderQuery1.setParentId(sieveModel.getParentId()); + sieveApplyOrderQuery1.setHospitalId(sieveModel.getHospitalId()); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); } - if(StringUtils.isNotEmpty(resultModel.getSjgjx())){ - sieveListResult.setSjgjx(SieveEnums.getTitle(Integer.parseInt(resultModel.getSjgjx())));// 神经管畸形 - } - } - List applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); - if(CollectionUtils.isEmpty(applyOrderModels)){ - SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); - sieveApplyOrderQuery1.setSort("created descc"); - sieveApplyOrderQuery1.setParentId(sieveModel.getParentId()); - sieveApplyOrderQuery1.setHospitalId(sieveModel.getHospitalId()); - sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); - applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); - } - sieveListResult.setName(sieveModel.getName()); //姓名 - //采血日期 - if (CollectionUtils.isNotEmpty(applyOrderModels)) { - SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0); + sieveListResult.setName(sieveModel.getName()); //姓名 //采血日期 - sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd(sieveApplyOrderModel.getCollectionDate())); - } - Patients patients = patientsService.findOnePatientById(sieveModel.getParentId()); - if (null != patients) { - sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1"); - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) - sieveListResult.setcDueWeek("终止妊娠"); - else if (patients.getType() == 3) { - sieveListResult.setcDueWeek("已分娩"); + if (CollectionUtils.isNotEmpty(applyOrderModels)) { + SieveApplyOrderModel sieveApplyOrderModel = applyOrderModels.get(0); + //采血日期 + sieveListResult.setCollectionDate(DateUtil.getyyyy_MM_dd(sieveApplyOrderModel.getCollectionDate())); } - //年龄 - sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); - //户籍地 - sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), - patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); - } - sieveListResult.setApplyTime(DateUtil.getyyyy_MM_dd(sieveModel.getApplyDate())); //申请时间 - sieveListResult.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(sieveModel.getDueWeek()));//申请孕周 - if (StringUtils.isNotEmpty(sieveModel.getApplyHospitalId())) { - Organization organization = organizationService.getOrganization(Integer.parseInt(sieveModel.getApplyHospitalId())); - sieveListResult.setApplyHospital(organization.getName()); //申请医院 + Patients patients = patientsService.findOnePatientById(sieveModel.getParentId()); + if (null != patients) { + sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1"); + if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) + sieveListResult.setcDueWeek("终止妊娠"); + else if (patients.getType() == 3) { + sieveListResult.setcDueWeek("已分娩"); + } + //年龄 + sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); + //户籍地 + sieveListResult.setPlaceDomicile(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), + patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); + } + sieveListResult.setApplyTime(DateUtil.getyyyy_MM_dd(sieveModel.getApplyDate())); //申请时间 + sieveListResult.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(sieveModel.getDueWeek()));//申请孕周 + if (StringUtils.isNotEmpty(sieveModel.getApplyHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(sieveModel.getApplyHospitalId())); + sieveListResult.setApplyHospital(organization.getName()); //申请医院 + } + sieveListResult.setSieveTypeStr(SieveEnums.SieveTypeEnums.getNameById(sieveModel.getSieveType()));//筛查类型 1 血清学筛查 2/无创基因筛查 3/二者都用 + sieveListResult.setStatusText(SieveStatusEnums.getStrById(sieveModel.getStatus()));//产筛状态 + sieveListResult.setCostTypeStr(SieveEnums.CostTypeEnums.getNameById(sieveModel.getCostType())); // 费用类型 1/免费 2/自费 + sieveListResult.setZtfxText(SieveEnums.getTitle(sieveModel.getZtfx()));//整体风险 + results.add(sieveListResult); + } catch (NumberFormatException e) { + e.printStackTrace(); } - sieveListResult.setSieveTypeStr(SieveEnums.SieveTypeEnums.getNameById(sieveModel.getSieveType()));//筛查类型 1 血清学筛查 2/无创基因筛查 3/二者都用 - sieveListResult.setStatusText(SieveStatusEnums.getStrById(sieveModel.getStatus()));//产筛状态 - sieveListResult.setCostTypeStr(SieveEnums.CostTypeEnums.getNameById(sieveModel.getCostType())); // 费用类型 1/免费 2/自费 - sieveListResult.setZtfxText(SieveEnums.getTitle(sieveModel.getZtfx()));//整体风险 - results.add(sieveListResult); } return results; } -- 1.8.3.1