From 19e85db6467550850602ba48feb859862b5d6ebf Mon Sep 17 00:00:00 2001 From: "jesse.wang" Date: Fri, 7 Apr 2023 16:52:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=BC=E4=BF=9D=E5=81=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=92=8C=E5=85=A8=E9=83=A8=E5=84=BF=E7=AB=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=20=E4=BA=A7=E6=A3=80=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E5=92=8C=E5=AE=9E=E9=99=85=E4=B8=8D=E7=AC=A6=E6=9C=AC=E9=99=A2?= =?UTF-8?q?+=E5=A4=96=E9=99=A2=EF=BC=8C=E9=83=BD=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E7=9A=84=20=E3=80=90=E5=8C=BA=E5=9F=9F=E5=A6=87=E5=B9=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=80=91---=E3=80=90=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E5=A6=87=E5=B9=BC=E7=BB=9F=E8=AE=A1=E3=80=91---=E3=80=90?= =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E4=BC=98=E6=83=A0=E5=88=B8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E3=80=91---=E3=80=90=E5=8F=91=E6=94=BE=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E7=BB=9F=E8=AE=A1=E3=80=91---=E3=80=90=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E5=88=86=E5=A8=A9=E5=8C=BB=E9=99=A2=E2=80=94=E6=B2=B3?= =?UTF-8?q?=E5=8C=97=E7=9C=81=E2=80=94=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=B8=82?= =?UTF-8?q?=E2=80=94=E6=B5=B7=E6=B8=AF=E5=8C=BA=E2=80=94=E7=A7=A6=E7=9A=87?= =?UTF-8?q?=E5=B2=9B=E5=B8=82=E6=B5=B7=E6=B8=AF=E5=8C=BA=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E3=80=91=E3=80=82=E5=88=86=E5=A8=A9=E5=8C=BB=E9=99=A2=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E4=BA=86=E4=B8=80=E4=BE=8B=E4=BF=A1=E6=81=AF=E4=B8=8D?= =?UTF-8?q?=E5=90=BB=E5=90=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/LhBabyEyeCheckFacade.java | 3 +- .../web/service/impl/ReportServiceImpl.java | 3 ++ .../operate/web/worker/QuanPatientWorker.java | 40 +++++++++++++++++++--- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java index a90bd73..f807842 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java @@ -304,7 +304,8 @@ public class LhBabyEyeCheckFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); babyModelQuery.setNeed("true"); babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setLheyeCheckYn(YnEnums.YES.getId()); + //眼保健管理和全部儿童数据同步 +// babyModelQuery.setLheyeCheckYn(YnEnums.YES.getId()); babyModelQuery.setHospitalId(hospitalId); //结束日期加上时分秒 if (babyModelQuery.getLhEyeCheckTimeEnd() != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index dcc961f..ab493e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -5454,6 +5454,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService PatientsQuery patientsQuery2 = new PatientsQuery(); patientsQuery2.setYn(YnEnums.YES.getId()); patientsQuery2.setPid(bookbuildingCoupon.get("userid").toString()); + if (StringUtils.isNotEmpty(query.getYyzyfmHospitalId())) { + patientsQuery2.setYyzyfmHospitalId(query.getYyzyfmHospitalId()); + } List patients =patientsService.queryPatient(patientsQuery2); if(CollectionUtils.isEmpty(patients)){ continue; 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 c5bca8d..34964ee 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 @@ -10,6 +10,7 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.facade.PatientFacade; +import com.lyms.platform.operate.web.result.AntData; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.QuanPatientsResult; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -23,6 +24,7 @@ import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; +import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -75,14 +77,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()); @@ -220,9 +222,37 @@ public class QuanPatientWorker implements Callable> { } } } - - quanPatientsResult.setcTimes(i + ichu); - + //统计产检次数 + List patientIds = new ArrayList <>(); + patientIds.add(patients.getId()); + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setSource(patients.getId()); + patientsQuery.setBuildType(1); + List patients1 = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patients1)) { + for (Patients ps : patients1) { + patientIds.add(ps.getId()); + } + } + int chuzhen = 0; + int fuzhen = 0; + //初诊记录 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setParentIds(patientIds); + List antExChuModels = antExService.queryAntExChu(antExChuQuery); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + chuzhen = antExChuModels.size(); + } + //复诊记录 + AntExQuery antExQuery1 = new AntExQuery(); + antExQuery1.setYn(YnEnums.YES.getId()); + antExQuery1.setParentIds(patientIds); + List list1 = antExService.queryAntenatalExamination(antExQuery1.convertToQuery()); + if (CollectionUtils.isNotEmpty(list1)) { + fuzhen = list1.size(); + } + quanPatientsResult.setcTimes(chuzhen + fuzhen); antExQuery.setHospitalId(hospital); //本院初诊 -- 1.8.3.1