Commit 91849a2f36ce768ff573b09559fe7dfe84f52e86

Authored by wtt

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 91849a2
... ... @@ -842,7 +842,7 @@
842 842 condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
843 843 }
844 844  
845   - if (null != normal) {
  845 + if (StringUtils.isNotEmpty(normal)) {
846 846 if ("1".equals(normal))
847 847 {
848 848 MongoCondition c = MongoCondition.newInstance();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 91849a2
... ... @@ -2308,6 +2308,7 @@
2308 2308 sieveQuery.setNeed("true");
2309 2309 sieveQuery.setLimit(2000);
2310 2310 sieveQuery.setPage(1);
  2311 + sieveQuery.setApplyTimeStart(DateUtil.addDay(new Date(),-10));
2311 2312 List<SieveModel> list = sieveService.queryList(sieveQuery);
2312 2313  
2313 2314 if (CollectionUtils.isNotEmpty(list))