Commit 1d6724a4e3592ee81e2fdf6cad680008cfa6e6bf
1 parent
bb808b257e
Exists in
master
and in
6 other branches
公共卫生统计
Showing 1 changed file with 5 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
1d6724a
| ... | ... | @@ -3443,11 +3443,12 @@ |
| 3443 | 3443 | hospitalDate.put("data14",data13_data8+"%"); |
| 3444 | 3444 | |
| 3445 | 3445 | //孕13周之前建册的人数 |
| 3446 | + | |
| 3446 | 3447 | PatientsQuery patientsQuery=new PatientsQuery(); |
| 3447 | 3448 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 3448 | 3449 | patientsQuery.setHospitalId(hospitalId); |
| 3449 | 3450 | patientsQuery.setBuildDaysStart(0); |
| 3450 | - patientsQuery.setBuildDaysEnd(13*7); | |
| 3451 | + patientsQuery.setBuildDaysEnd(13*7-1); | |
| 3451 | 3452 | patientsQuery.setDueStatus(0); |
| 3452 | 3453 | patientsQuery.setIsAutoFm(YnEnums.NO.getId()); |
| 3453 | 3454 | patientsQuery.setExtEnable(false); |
| ... | ... | @@ -3455,6 +3456,7 @@ |
| 3455 | 3456 | patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); |
| 3456 | 3457 | patientsQuery.setBookbuildingDateEnd(endDate); |
| 3457 | 3458 | patientsQuery.setType(3); //产妇 |
| 3459 | + System.out.println("55555555555"+patientsQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 3458 | 3460 | int data15 = patientsService.queryPatientCount(patientsQuery); |
| 3459 | 3461 | int lastDate15= null==hospitalDate.get("data15")?0:Integer.parseInt(hospitalDate.get("data15").toString()); |
| 3460 | 3462 | hospitalDate.put("data15",data15+lastDate15); |
| ... | ... | @@ -3942,7 +3944,7 @@ |
| 3942 | 3944 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 3943 | 3945 | patientsQuery.setHospitalList(hospitalIds); |
| 3944 | 3946 | patientsQuery.setBuildDaysStart(0); |
| 3945 | - patientsQuery.setBuildDaysEnd(13*7); | |
| 3947 | + patientsQuery.setBuildDaysEnd(13*7-1); | |
| 3946 | 3948 | patientsQuery.setDueStatus(0); |
| 3947 | 3949 | patientsQuery.setIsAutoFm(YnEnums.NO.getId()); |
| 3948 | 3950 | patientsQuery.setExtEnable(false); |
| ... | ... | @@ -3955,7 +3957,7 @@ |
| 3955 | 3957 | patientsQuery.setNeed("Need"); |
| 3956 | 3958 | |
| 3957 | 3959 | List<Patients> datas = patientsService.queryPatient(patientsQuery); |
| 3958 | - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 3960 | + System.out.println("55555555555"+patientsQuery.convertToQuery().convertToMongoQuery().toString()); | |
| 3959 | 3961 | if (CollectionUtils.isNotEmpty(datas)) |
| 3960 | 3962 | { |
| 3961 | 3963 | for (Patients model : datas) |