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); //本院初诊