From d2a61ff025635c055c392ac43e5584877c248e8f Mon Sep 17 00:00:00 2001 From: "jesse.wang" Date: Wed, 19 Apr 2023 00:07:15 +0800 Subject: [PATCH] 4.18 --- .../web/facade/AntenatalExaminationFacade.java | 12 ++++++----- .../web/service/impl/ReportServiceImpl.java | 24 +++++++++++++++++----- .../operate/web/worker/QuanPatientWorker.java | 4 ---- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 0b1da9d..8796dad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -23,9 +23,11 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; -import com.lyms.platform.operate.web.service.TeamService; import com.lyms.platform.operate.web.utils.*; -import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.PatientService; +import com.lyms.platform.permission.model.PatientServiceQuery; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.PatientServiceService; @@ -1933,9 +1935,9 @@ public class AntenatalExaminationFacade { patientsQuery.setBuildType(1); patientsQuery.setSort("created"); //在区域组的时候不用查询隐藏档案，但是这里看不见转诊过来的数据 - if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) { - patientsQuery.setExtEnable(false); - } +// if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) { +// patientsQuery.setExtEnable(false); +// } System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery()); //获取所有的建档记录 List list = patientsService.queryPatient(patientsQuery); 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 aff231e..bb41328 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 @@ -5440,8 +5440,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(CollectionUtils.isNotEmpty(patientpIds)){ query.setPersonIds(patientpIds); } - //分页数据 - query.mysqlBuild(couponMapper.bookbuildingCouponCount(query)); + int sum = couponMapper.bookbuildingCouponCount(query); //查询mysql 优惠券记录 List bookbuildingCouponList=couponMapper.bookbuildingCoupon(query); @@ -5456,6 +5455,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService } List patients =patientsService.queryPatient(patientsQuery2); if(CollectionUtils.isEmpty(patients)){ + sum=sum-1; continue; } Patients patientsModel=patients.get(0); @@ -5465,11 +5465,25 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService String address=CommonsHelper.getResidence(patientsModel.getProvinceRegisterId(), patientsModel.getCityRegisterId(), patientsModel.getAreaRegisterId(), patientsModel.getStreetRegisterId(),patientsModel.getVillageRegister() + patientsModel.getAddressRegister(), basicConfigService); map.put("address", address); map.put("hospitalName", bookbuildingCoupon.get("hospitalname")); - String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); + String yyzyfmHospitalId_name = ""; + for (Patients patient : patients) { + if (StringUtils.isNotEmpty(patient.getYyzyfmHospitalId())) { + yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); + + map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); + } else { + map.put("yyzyfmHospitalId",""); + } + } if (StringUtils.isNotEmpty(yyzyfmHospitalId_name)&&yyzyfmHospitalId_name.equals("秦皇岛军工医院")) { + sum=sum-1; continue; } - map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); +// String yyzyfmHospitalId_name = couponMapper.findHospitalNameById(patientsModel.getYyzyfmHospitalId()); +// if (StringUtils.isNotEmpty(yyzyfmHospitalId_name)&&yyzyfmHospitalId_name.equals("秦皇岛军工医院")) { +// continue; +// } +// map.put("yyzyfmHospitalId", StringUtils.isNotEmpty(yyzyfmHospitalId_name)?yyzyfmHospitalId_name:""); //初诊医院 String firstVisitHospital=""; AntExChuQuery antExChuQuery = new AntExChuQuery(); @@ -5489,7 +5503,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService result.add(map); } - + query.mysqlBuild(sum); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); objectResponse.setData(result); 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 1c513c9..213f006 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,7 +10,6 @@ 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; @@ -186,9 +185,6 @@ public class QuanPatientWorker implements Callable> { } } - //系统初诊次数 - int ichu = CollectionUtils.isEmpty(chu) ? 0 : chu.size(); - //系统复诊次数 int i = 0; if (CollectionUtils.isNotEmpty(ant)) { -- 1.8.3.1