From 12b17904b6f03266c459bfa556975269410cf503 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 16 Mar 2023 08:53:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=8C=BA=E5=9F=9F=E5=A6=87=E5=B9=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86---=E5=85=A8=E9=83=A8=E5=AD=95=E5=A6=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86---=E5=85=A8=E9=83=A8=E4=BA=A7=E5=A6=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E4=B8=80=E6=A0=8F=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E2=80=9C=E9=A2=86=E5=88=B8=E7=A4=BE=E5=8C=BA=E2=80=9D?= =?UTF-8?q?,=E6=8A=8A=E7=8E=B0=E6=9C=89=E5=9C=A8=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E5=8C=BB=E9=99=A2=E9=87=8C=E7=9A=84=E9=A2=86?= =?UTF-8?q?=E5=8A=B5=E7=A4=BE=E5=8C=BA=E5=92=8C=E5=BB=BA=E6=A1=A3=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E5=8C=BA=E5=88=86=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/result/QuanChanResult.java | 25 ++++++++++++++++++++++ .../operate/web/result/QuanPatientsResult.java | 12 ++++++++++- .../operate/web/worker/QuanChanPatientWorker.java | 15 ++++++++++++- .../operate/web/worker/QuanPatientWorker.java | 16 +++++++++++++- 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index 98d7f4a..fe19cc2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -117,6 +117,31 @@ public class QuanChanResult implements IBasicResultConvert> { for (Patients patients : patientses) { StopWatch stopWatch = new StopWatch("QuanChanPatientWorker -" + patients.getId()); QuanChanResult chanResult = new QuanChanResult(); + /*********************************************************/ + /** + * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表 + */ + if (patients.getFirstCheckTime() != null){ + chanResult.setFirstCheckTime(patients.getFirstCheckTime()); + } + /*********************************************************/ chanResult.setVcCardNo(patients.getVcCardNo()); chanResult.setCardNo(patients.getCardNo()); chanResult.setRemark(patients.getMremark()); @@ -230,8 +237,14 @@ public class QuanChanPatientWorker implements Callable > { } else { chanResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); } + String hname = chanResult.getFirstBH(); + if ((hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { + chanResult.setFirstBH(""); + chanResult.setCouponCommunity(hname); + } } catch (Exception e) { chanResult.setFirstBH(""); + chanResult.setCouponCommunity(""); } //乡镇/街道 chanResult.setStreet(CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService)); 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 7a44063..c5bca8d 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 @@ -75,6 +75,14 @@ public class QuanPatientWorker implements Callable> { try { StopWatch stopWatch = new StopWatch("QuanPatientWorker -" + patients.getId()); QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); + /*********************************************************/ + /** + * 秦皇岛需求 在区域妇幼管理---全部孕妇管理---全部产妇管理、全部孕妇管理两个界面，首次建档医院后面加初诊日期一栏列表 + */ + if (patients.getFirstCheckTime() != null){ + quanPatientsResult.setFirstCheckTime(DateUtil.getyyyy_MM_dd(patients.getFirstCheckTime())); + } + /*********************************************************/ quanPatientsResult.setVcCardNo(patients.getVcCardNo()); quanPatientsResult.setCardNo(patients.getCardNo()); quanPatientsResult.setRemark(patients.getMremark()); @@ -252,9 +260,15 @@ public class QuanPatientWorker implements Callable> { quanPatientsResult.setRegisterAddr(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService)); quanPatientsResult.setAddr(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); try { - quanPatientsResult.setFirstBH(organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName()); + String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName(); + if (!(hname.contains("卫生服务站") || hname.contains("卫生服务中心") || hname.contains("卫生院"))) { + quanPatientsResult.setFirstBH(hname); + } else { + quanPatientsResult.setCouponCommunity(hname); + } } catch (Exception e) { quanPatientsResult.setFirstBH(""); + quanPatientsResult.setCouponCommunity(""); } quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType())); -- 1.8.3.1