From 7efe38fa7d28adc03a0933edcaaf68b81c58bf39 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 12 Aug 2023 18:23:43 +0800 Subject: [PATCH] update --- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 3 --- .../platform/operate/web/service/impl/TrackDownServiceImpl.java | 9 +++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 7d2634b..f438ccb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -694,9 +694,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("isHistory", false, MongoOper.EXISTS); } - if (null != isDeliver) { - condition = condition.and("isDeliver", isDeliver, MongoOper.IS); - } if (null != isComplete) { condition = condition.and("isComplete", isComplete, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 0583e0c..60c9aae 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -149,7 +149,13 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setBookbuildingDateEnd(checkEnd); patientsQuery.setFmDateStart(fmStart); patientsQuery.setFmDateEnd(fmEnd); - patientsQuery.setTypeList(Arrays.asList(1, 3)); + if (StringUtils.isNotEmpty(isDeliver)){ + patientsQuery.setTypeList(isDeliver.equals("0") ? Arrays.asList(3) : Arrays.asList(1)); + }else + { + patientsQuery.setTypeList(Arrays.asList(1, 3)); + } + patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setNeed("need"); patientsQuery.setLimit(limit); @@ -165,7 +171,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS patientsQuery.setQueryNo(key); patientsQuery.setFollowupStatus(followupStatus); - patientsQuery.setIsDeliver(isDeliver); //排查儿童建档时的零时建档 patientsQuery.setBuildType(1); -- 1.8.3.1