Commit 5ced1f2cf9fadb6225b9fa23c98d639f07f48fe1
1 parent
30819a661d
Exists in
master
and in
6 other branches
公共卫生统计
Showing 1 changed file with 11 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
5ced1f2
| ... | ... | @@ -3478,11 +3478,16 @@ |
| 3478 | 3478 | hospitalDate.put("data16",data15_data2+"%"); |
| 3479 | 3479 | //孕产妇健康管理人数 |
| 3480 | 3480 | PatientsQuery patientsQuery2=new PatientsQuery(); |
| 3481 | - patientsQuery2.setYn(YnEnums.YES.getId()); | |
| 3482 | 3481 | patientsQuery2.setHospitalId(hospitalId); |
| 3482 | + patientsQuery2.setDueStatus(0); | |
| 3483 | + patientsQuery2.setExtEnable(false); | |
| 3484 | + patientsQuery2.setBuildTypeNot(1); | |
| 3485 | + patientsQuery2.setIsAutoFm(YnEnums.NO.getId()); | |
| 3486 | + patientsQuery2.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); | |
| 3483 | 3487 | patientsQuery2.setBookbuildingDateEnd(endDate); |
| 3484 | - patientsQuery2.setFirstCheckId2(true); | |
| 3485 | - patientsQuery2.setType(3); | |
| 3488 | + patientsQuery2.setYn(YnEnums.YES.getId()); | |
| 3489 | + patientsQuery2.setExistLastCheckEmployeeId(true); | |
| 3490 | + patientsQuery.setType(3); | |
| 3486 | 3491 | int data17 = patientsService.queryPatientCount(patientsQuery2); |
| 3487 | 3492 | int lastDate17= null==hospitalDate.get("data17")?0:Integer.parseInt(hospitalDate.get("data17").toString()); |
| 3488 | 3493 | hospitalDate.put("data17",data17+lastDate17); |
| 3489 | 3494 | |
| 3490 | 3495 | |
| ... | ... | @@ -4249,18 +4254,15 @@ |
| 4249 | 4254 | PatientsQuery patientsQuery=new PatientsQuery(); |
| 4250 | 4255 | if (CollectionUtils.isNotEmpty(hospitalIds)) |
| 4251 | 4256 | { |
| 4252 | - patientsQuery.setHospitalList(hospitalIds); | |
| 4253 | 4257 | patientsQuery.setDueStatus(0); |
| 4258 | + patientsQuery.setExtEnable(false); | |
| 4259 | + patientsQuery.setBuildTypeNot(1); | |
| 4254 | 4260 | patientsQuery.setIsAutoFm(YnEnums.NO.getId()); |
| 4255 | 4261 | patientsQuery.setBookbuildingDateStart(DateUtil.addYear(new Date(),-20)); |
| 4256 | 4262 | patientsQuery.setBookbuildingDateEnd(endDate); |
| 4257 | 4263 | patientsQuery.setYn(YnEnums.YES.getId()); |
| 4258 | 4264 | patientsQuery.setHospitalList(hospitalIds); |
| 4259 | - patientsQuery.setFirstCheckId2(true); | |
| 4260 | - List<Integer> buildType = new ArrayList<Integer>(); | |
| 4261 | - buildType.add(0); | |
| 4262 | - buildType.add(2); | |
| 4263 | - patientsQuery.setBuildTypeList(buildType); | |
| 4265 | + patientsQuery.setExistLastCheckEmployeeId(true); | |
| 4264 | 4266 | patientsQuery.setType(3); |
| 4265 | 4267 | patientsQuery.setPage(page); |
| 4266 | 4268 | patientsQuery.setLimit(limit); |