From c8b9077dabba34aeddada5ed46a980f7d272dba3 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 16 Feb 2022 12:20:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E4=BA=A7=E5=A6=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E5=BB=BA=E6=A1=A3=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/service/impl/ReportServiceImpl.java | 38 +++++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) 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 59fbcfb..59803de 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 @@ -4414,7 +4414,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService //建档 Criteria criteria = Criteria.where("bookbuildingDate").gte(startDate).lte(endDate) .and("hospitalId").is(hospitalId) - .and("yn").is(YnEnums.YES.getId()); + .and("yn").is(YnEnums.YES.getId()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); List patientsList = mongoTemplate.find(Query.query(criteria), Patients.class); //初诊 Criteria criteria2 = Criteria.where("checkTime").gte(startDate).lte(endDate) @@ -4476,7 +4478,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Criteria criteria8 = Criteria.where("bookbuildingDate").gte(antExChuModel.getLastMenses()).lt(startDate) .and("parentId").is(antExChuModel.getParentId()) .and("hospitalId").is(hospitalId) - .and("yn").is(YnEnums.YES.getId()); + .and("yn").is(YnEnums.YES.getId()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); Patients patient = mongoTemplate.findOne(Query.query(criteria8), Patients.class); if(null!=patient){ filingBefore++; @@ -4489,7 +4493,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .gte(DateUtil.getMonthDay(startDate,-1,1)).lte(DateUtil.getMonthDay(startDate,-1,0)) .and("parentId").is(antExChuModel.getParentId()) .and("hospitalId").is(hospitalId) - .and("yn").is(YnEnums.YES.getId()); + .and("yn").is(YnEnums.YES.getId()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); Patients patient = mongoTemplate.findOne(Query.query(criteria9), Patients.class); if(null!=patient){ filingLastMonth++; @@ -4502,7 +4508,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .gte(antExChuModel.getLastMenses()).lt(DateUtil.getMonthDay(startDate,-1,1)) .and("parentId").is(antExChuModel.getParentId()) .and("hospitalId").is(hospitalId) - .and("yn").is(YnEnums.YES.getId()); + .and("yn").is(YnEnums.YES.getId()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); Patients patient = mongoTemplate.findOne(Query.query(criteria10), Patients.class); if(null!=patient){ filingEarly++; @@ -4582,7 +4590,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService int dueWeek12=0,dueWeek13=0,dueWeek20=0,dueWeek25=0,dueWeek29=0; Criteria criteria = Criteria.where("bookbuildingDate").gte(startDate).lte(endDate) .and("hospitalId").is(hospitalId) - .and("yn").is(YnEnums.YES.getId()); + .and("yn").is(YnEnums.YES.getId()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); List patientsList = mongoTemplate.find(Query.query(criteria), Patients.class); for (Patients patients : patientsList) { //避免末次月经字段空。但是这样统计结果不准确。前端该字段是必填。但是历史数据不保证。 @@ -4768,6 +4778,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService patientsQuery.setNeed("yse"); patientsQuery.setPage(page); patientsQuery.setLimit(limit); + patientsQuery.setExtEnable(false); + patientsQuery.setBuildTypeNot(1); patientsList = patientsService.queryPatientBySort(patientsQuery, "bookbuildingDate", "DESC"); for (Patients patient : patientsList) { Map map = new HashMap<>(); @@ -4989,7 +5001,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService //建档 Criteria criteria = Criteria.where("bookbuildingDate").gte(startDate).lte(endDate) .and("hospitalId").is(hospitalId) - .and("yn").is(YnEnums.YES.getId()); + .and("yn").is(YnEnums.YES.getId()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); List patientsList = mongoTemplate.find(Query.query(criteria), Patients.class); //建档未初诊(包含外院初诊) List antExChuNotList = new ArrayList<>(); @@ -5088,7 +5102,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .and("nextCheckTime").lt(new Date()) .and("type").is(1) .and("hospitalId").is(hospitalId) - .and("yn").is(1); + .and("yn").is(1) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); AggregationOperation match = Aggregation.match(criteria); AggregationOperation group = Aggregation.group("lastCheckEmployeeId").count().as("count"); Aggregation aggregation= Aggregation.newAggregation(match, group); @@ -5129,7 +5145,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .and("areaRegisterId").is(areaId) .and("type").is(1) .and("hospitalId").is(hospitalId) - .and("yn").is(1); + .and("yn").is(1) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); AggregationOperation match = Aggregation.match(criteria); AggregationOperation group = Aggregation.group("streetRegisterId").count().as("count"); Aggregation aggregation= Aggregation.newAggregation(match, group); @@ -5149,7 +5167,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService .and("type").is(1) .and("hospitalId").is(hospitalId) .and("yn").is(1) - .and("nextCheckTime").lt(new Date()); + .and("nextCheckTime").lt(new Date()) + .and("enable").nin(Arrays.asList("1","2")) + .and("buildType").ne(1); //逾期人数 long count = mongoTemplate.count(Query.query(criteria2), Patients.class); map.put("overdueCount", count); -- 1.8.3.1