From 3e2e76ede77d4db47ca1187947708edae845e159 Mon Sep 17 00:00:00 2001 From: jishenfei Date: Sun, 23 Apr 2023 08:10:03 +0800 Subject: [PATCH] =?UTF-8?q?4.23=E7=A7=A6=E7=9A=87=E5=B2=9B=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/OrganizationController.java | 22 ++++++------- .../operate/web/facade/BookbuildingFacade.java | 4 ++- .../operate/web/facade/CancerScreeningFacade.java | 2 ++ .../operate/web/result/QuanPatientsResult.java | 13 +++++++- .../operate/web/worker/QuanChanPatientWorker.java | 18 +++++------ .../operate/web/worker/QuanPatientWorker.java | 36 ++++++++++++++++++++-- .../lyms/platform/operate/web/worker/WorkHR.java | 2 +- 7 files changed, 71 insertions(+), 26 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 6d94527..407a10e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -460,34 +460,34 @@ public class OrganizationController extends BaseController { // continue; // } String hname = organization.getName(); - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { + if (!(hname.contains("医院") ) || hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院")) { if (!hname.equals("秦皇岛市妇幼保健院")){ continue; } } } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("2")) { String hname = organization.getName(); -// if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { -// continue; -// } - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { - if (!hname.equals("秦皇岛市妇幼保健院")){ - continue; - } + if (!( hname.contains("卫生服务中心") || hname.contains("卫生院"))) { + continue; } +// if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { +// if (!hname.equals("秦皇岛市妇幼保健院")){ +// continue; +// } +// } } else if (StringUtils.isNotEmpty(isMaternityManagement) && isMaternityManagement.equalsIgnoreCase("3")) { String hname = organization.getName(); // if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { // continue; -// } - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { +// }|| hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") + if (!(hname.contains("医院") ) || hname.equals("青龙满族自治县生殖保健医院") || hname.equals("吉星里港口医院社区卫生服务站")) { if (!hname.equals("秦皇岛市妇幼保健院")){ continue; } } }else if (users.getOrgId()==216){ String hname = organization.getName(); - if (!(hname.contains("医院") || hname.equals("吉星里港口医院社区卫生服务站")) || hname.equals("青龙满族自治县生殖保健医院") ) { + if (!(hname.contains("医院") ) || hname.equals("吉星里港口医院社区卫生服务站") || hname.equals("青龙满族自治县生殖保健医院") ) { if (!hname.equals("秦皇岛市妇幼保健院")){ continue; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index a9f8ec0..880d929 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -230,7 +230,9 @@ public class BookbuildingFacade { */ public BaseObjectResponse addPregnantBookbuilding( YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) { - yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors())); + if (yunRequest.getBooksuifangDoctors()!=null){ + yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctors())); + } if (StringUtils.isNotEmpty(yunRequest.getOrgName())) { OrganizationQuery organizationQuery = new OrganizationQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 8fa39a6..33b69b0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -242,6 +242,8 @@ public class CancerScreeningFacade { } map.put("rxxtLevel", rxxtLevel);//乳腺X检查等级 + //预约下次检查时间 + map.put("nextDate",DateUtil.getyyyy_MM_dd(model.getNextDate())); map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期 map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null)); map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java index 3d53a4a..bb1cd93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java @@ -49,7 +49,10 @@ public class QuanPatientsResult implements IBasicResultConvert> { List data = new ArrayList <>(); AntExQuery antExQuery = new AntExQuery(); AntExChuQuery antExChuQuery1 = new AntExChuQuery();//初诊 - antExChuQuery1.setYn(YnEnums.YES.getId()); + antExChuQuery1.setYn(YnEnums.YES.getId()); try { for (Patients patients : patientses) { @@ -238,15 +238,15 @@ public class QuanChanPatientWorker implements Callable > { chanResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); chanResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); try { - if (StringUtils.isNotEmpty(patients.getSource())) { - Patients pat = patientsService.findOnePatientById(patients.getSource()); - chanResult.setRemark(pat.getMremark()); - chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName()); - } else { - chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); - } +// if (StringUtils.isNotEmpty(patients.getSource())) { +// Patients pat = patientsService.findOnePatientById(patients.getSource()); +// chanResult.setRemark(pat.getMremark()); +// chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(pat.getHospitalId())).getName()); +// } else { +// chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); +// } String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); - if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ + if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ chanResult.setFirstBH(hname); } else { chanResult.setCouponCommunity(hname); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index 213f006..4b2dfab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -150,7 +150,6 @@ public class QuanPatientWorker implements Callable> { } ant = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); } - //唐山滦县判断复诊是否是本院 if(CollectionUtils.isNotEmpty(ant)){ for(int k = 0;k < ant.size();k++){ @@ -236,7 +235,7 @@ public class QuanPatientWorker implements Callable> { List patients1 = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isNotEmpty(patients1)) { for (Patients ps : patients1) { - patientIds.add(ps.getId()); + patientIds.add(ps.getPid()); } } int chuzhen = 0; @@ -266,6 +265,7 @@ public class QuanPatientWorker implements Callable> { //本院复诊 int chb = capLocalHospital(hospital, ant); quanPatientsResult.setcHTimes(chi + chb); + quanPatientsResult.setrFactor(patientsQuery.getrFactor()); stopWatch.stop(); String nextCheckTime = ""; stopWatch.start("query antex list"); @@ -296,7 +296,7 @@ public class QuanPatientWorker implements Callable> { quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); try { String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); - if ((hname.contains("医院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ + if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) {/* if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) {*/ quanPatientsResult.setFirstBH(hname); } else { quanPatientsResult.setCouponCommunity(hname); @@ -305,6 +305,36 @@ public class QuanPatientWorker implements Callable> { quanPatientsResult.setFirstBH(""); quanPatientsResult.setCouponCommunity(""); } + //高危因素 + List factor = patients.getRiskFactorId(); + + if (CollectionUtils.isNotEmpty(factor)) { + StringBuilder sb = new StringBuilder(56); + for (String srt : factor) { + if (StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { + sb.append(basicConfig.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + quanPatientsResult.setrFactor(sb.substring(0, sb.length() - 1)); + } else { + quanPatientsResult.setrFactor(sb.toString()); + } + + if (!"-".equals(quanPatientsResult.getrFactor()) && StringUtils.isNotEmpty(patients.getoRiskFactor())) { + quanPatientsResult.setrFactor(quanPatientsResult.getrFactor()+","+patients.getoRiskFactor()); + }else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + quanPatientsResult.setrFactor(patients.getoRiskFactor()); + } + } + else if (StringUtils.isNotEmpty(patients.getoRiskFactor())) + { + quanPatientsResult.setrFactor(patients.getoRiskFactor()); + } quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); quanPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index 73378a7..dd3bbb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -193,7 +193,7 @@ public class WorkHR implements Callable> { riskPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); try { String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); - if ((hname.contains("医院"))) { + if ((hname.contains("医院")) || (hname.contains("秦皇岛市妇幼保健院"))) { // if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { riskPatientsResult.setFirstBH(hname); } else { -- 1.8.3.1