diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index 567a8d5..2521ddb 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -451,13 +451,13 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(queryNo)) { MongoCondition c = MongoCondition.newInstance(); - MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE); MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); - if(c1!=null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria()); - }else { - c1 = c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria(); + if (c1 != null) { + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria()); + } else { + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java index 8069356..fdc6430 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java @@ -334,6 +334,7 @@ public class annualReportFacade { List sieveList = new ArrayList<>(); sieveList.add(2); sieveList.add(3); + sieveList.add(4); List sieveGWList = new ArrayList<>(); sieveGWList.add(3); sieveGWList.add(4); @@ -593,14 +594,14 @@ public class annualReportFacade { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(1); if (StringUtils.isNotEmpty(time)) { - sieveQuery.setCreatedStart(DateUtil.getSNDate(time)[0]); - sieveQuery.setCreatedEnd(DateUtil.getSNDate(time)[1]); + sieveQuery.setResultTimeStart(DateUtil.getSNDate(time)[0]); + sieveQuery.setResultTimeEnd(DateUtil.getSNDate(time)[1]); } sieveQuery.setHospitalIds(entry.getValue()); sieveQuery.setStatuses(sieveList); int sieveCount = sieveService.queryListCount(sieveQuery); + System.out.println("========>" + entry.getKey() + "=======>" + sieveCount); map.put("sieveCount", String.valueOf(sieveCount)); - map.put("sievePervent", this.division(sieveCount, antexMap.size())); //高危人数 SieveQuery sieveGwQuery = new SieveQuery();