diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index fe9a8a4..5a2c221 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -784,20 +784,17 @@ public class PatientFacade extends BaseServiceImpl { } //根据建档时间查询 - String bookbuildingDate=null; if (StringUtils.isNotEmpty(riskPatientsQueryRequest.getBookbuildingDate())) { //根据建档时间查询整理传来的时间 Date bookbuildingDateStart=null; Date bookbuildingDateEnd=null; - if (StringUtils.isNotEmpty(bookbuildingDate)) { - String[] dates = bookbuildingDate.split(" - "); - bookbuildingDateStart=DateUtil.parseYMD(dates[0]); - if (dates.length == 2) { + String[] dates = riskPatientsQueryRequest.getBookbuildingDate().split(" - "); + bookbuildingDateStart=DateUtil.parseYMD(dates[0]); + if (dates.length == 2) { bookbuildingDateEnd=new Date(DateUtil.parseYMD(dates[1]).getTime() + 24 * 60 * 60 * 1000 - 1); - } } //根据建档时间查询 拼查询语句 - if(null!=bookbuildingDateStart&&null!=bookbuildingDateEnd){ + if(null!=bookbuildingDateStart && null!=bookbuildingDateEnd){ criteria=criteria.and("buildDate").gte(bookbuildingDateStart).lte(bookbuildingDateEnd); }else { if(null!=bookbuildingDateStart){