diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index 950fffb..6e6fda5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3443,11 +3443,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { hospitalDate.put("data14",data13_data8+"%"); //孕13周之前建册的人数 + PatientsQuery patientsQuery=new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(hospitalId); patientsQuery.setBuildDaysStart(0); - patientsQuery.setBuildDaysEnd(13*7); + patientsQuery.setBuildDaysEnd(13*7-1); patientsQuery.setDueStatus(0); patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setExtEnable(false); @@ -3455,6 +3456,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); patientsQuery.setBookbuildingDateEnd(endDate); patientsQuery.setType(3); //产妇 + System.out.println("55555555555"+patientsQuery.convertToQuery().convertToMongoQuery().toString()); int data15 = patientsService.queryPatientCount(patientsQuery); int lastDate15= null==hospitalDate.get("data15")?0:Integer.parseInt(hospitalDate.get("data15").toString()); hospitalDate.put("data15",data15+lastDate15); @@ -3942,7 +3944,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalList(hospitalIds); patientsQuery.setBuildDaysStart(0); - patientsQuery.setBuildDaysEnd(13*7); + patientsQuery.setBuildDaysEnd(13*7-1); patientsQuery.setDueStatus(0); patientsQuery.setIsAutoFm(YnEnums.NO.getId()); patientsQuery.setExtEnable(false); @@ -3955,7 +3957,7 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { patientsQuery.setNeed("Need"); List datas = patientsService.queryPatient(patientsQuery); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + System.out.println("55555555555"+patientsQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(datas)) { for (Patients model : datas)