Commit 54ca34607e8f2cfbd41e395bec9c050ad161d871
1 parent
4a8b90f257
Exists in
master
and in
6 other branches
公共卫生统计
Showing 2 changed files with 7 additions and 6 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java
View file @
54ca346
| ... | ... | @@ -219,7 +219,7 @@ |
| 219 | 219 | condition=condition.and("lhdsl", lhdsl, MongoOper.EXISTS); |
| 220 | 220 | } |
| 221 | 221 | if(null!=hospitalIds){ |
| 222 | - condition=condition.and("hospitalId", hospitalIds, MongoOper.IS); | |
| 222 | + condition=condition.and("hospitalId", hospitalIds, MongoOper.IN); | |
| 223 | 223 | } |
| 224 | 224 | if(null!=tcType){ |
| 225 | 225 | condition=condition.and("tcType", tcType, MongoOper.IS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java
View file @
54ca346
| ... | ... | @@ -3469,11 +3469,12 @@ |
| 3469 | 3469 | hospitalDate.put("data22",data19_data2+"%"); |
| 3470 | 3470 | |
| 3471 | 3471 | //中医指导的人次 |
| 3472 | + end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); | |
| 3472 | 3473 | BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); |
| 3473 | 3474 | checkModelQuery1.setHospitalId(hospitalId); |
| 3474 | 3475 | checkModelQuery1.setYn(YnEnums.YES.getId()); |
| 3475 | - checkModelQuery1.setBirthStart(start1); | |
| 3476 | - checkModelQuery1.setBirthEnd(end1); | |
| 3476 | + checkModelQuery1.setBirthStart(end1); | |
| 3477 | + checkModelQuery1.setBirthEnd(start1); | |
| 3477 | 3478 | checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5)); |
| 3478 | 3479 | checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); |
| 3479 | 3480 | checkModelQuery1.setCheckDateEnd(endDate); |
| 3480 | 3481 | |
| ... | ... | @@ -3566,15 +3567,15 @@ |
| 3566 | 3567 | |
| 3567 | 3568 | checkModelQuery1.setHospitalIds(hospitalIds); |
| 3568 | 3569 | checkModelQuery1.setYn(YnEnums.YES.getId()); |
| 3569 | - checkModelQuery1.setBirthStart(start1); | |
| 3570 | - checkModelQuery1.setBirthEnd(end1); | |
| 3570 | + checkModelQuery1.setBirthStart(end1); | |
| 3571 | + checkModelQuery1.setBirthEnd(start1); | |
| 3571 | 3572 | checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5)); |
| 3572 | 3573 | checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); |
| 3573 | 3574 | checkModelQuery1.setCheckDateEnd(endDate); |
| 3574 | 3575 | checkModelQuery1.setPage(page); |
| 3575 | 3576 | checkModelQuery1.setLimit(limit); |
| 3576 | 3577 | checkModelQuery1.setNeed("true"); |
| 3577 | - | |
| 3578 | + System.out.println(checkModelQuery1.convertToQuery().convertToMongoQuery().toString()); | |
| 3578 | 3579 | List <BabyCheckModel> babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1); |
| 3579 | 3580 | List <Map <String, Object>> list = new ArrayList(); |
| 3580 | 3581 | for (BabyCheckModel babyCheckModel : babyCheckModelList) { |