From 54ca34607e8f2cfbd41e395bec9c050ad161d871 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 10 Nov 2022 10:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=8D=AB=E7=94=9F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/BabyCheckModelQuery.java | 2 +- .../platform/operate/web/facade/PatientSyncMysqlFacade.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java index da184cb..ec34cae 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java @@ -219,7 +219,7 @@ public class BabyCheckModelQuery extends BaseQuery implements IConvertToNativeQu condition=condition.and("lhdsl", lhdsl, MongoOper.EXISTS); } if(null!=hospitalIds){ - condition=condition.and("hospitalId", hospitalIds, MongoOper.IS); + condition=condition.and("hospitalId", hospitalIds, MongoOper.IN); } if(null!=tcType){ condition=condition.and("tcType", tcType, MongoOper.IS); 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 33fa19a..0b54859 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 @@ -3469,11 +3469,12 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { hospitalDate.put("data22",data19_data2+"%"); //中医指导的人次 + end1 = DateUtil.addDay(DateUtil.addMonth(currentDate1, -36 - 1), 1); BabyCheckModelQuery checkModelQuery1 = new BabyCheckModelQuery(); checkModelQuery1.setHospitalId(hospitalId); checkModelQuery1.setYn(YnEnums.YES.getId()); - checkModelQuery1.setBirthStart(start1); - checkModelQuery1.setBirthEnd(end1); + checkModelQuery1.setBirthStart(end1); + checkModelQuery1.setBirthEnd(start1); checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5)); checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); checkModelQuery1.setCheckDateEnd(endDate); @@ -3566,15 +3567,15 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { checkModelQuery1.setHospitalIds(hospitalIds); checkModelQuery1.setYn(YnEnums.YES.getId()); - checkModelQuery1.setBirthStart(start1); - checkModelQuery1.setBirthEnd(end1); + checkModelQuery1.setBirthStart(end1); + checkModelQuery1.setBirthEnd(start1); checkModelQuery1.setArticleTypes(Arrays.asList(1,2,3,4,5)); checkModelQuery1.setCheckDateStart(DateUtil.addYear(new Date(),-20)); checkModelQuery1.setCheckDateEnd(endDate); checkModelQuery1.setPage(page); checkModelQuery1.setLimit(limit); checkModelQuery1.setNeed("true"); - + System.out.println(checkModelQuery1.convertToQuery().convertToMongoQuery().toString()); List babyCheckModelList = babyCheckService.queryBabyCheckRecord(checkModelQuery1); List > list = new ArrayList(); for (BabyCheckModel babyCheckModel : babyCheckModelList) { -- 1.8.3.1