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 fc687a9..6b51038 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 @@ -842,7 +842,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN); } - if (null != normal) { + if (StringUtils.isNotEmpty(normal)) { if ("1".equals(normal)) { MongoCondition c = MongoCondition.newInstance(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 4d68891..a01e56e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -2308,6 +2308,7 @@ public class ApplyOrderFacade { sieveQuery.setNeed("true"); sieveQuery.setLimit(2000); sieveQuery.setPage(1); + sieveQuery.setApplyTimeStart(DateUtil.addDay(new Date(),-10)); List list = sieveService.queryList(sieveQuery); if (CollectionUtils.isNotEmpty(list))