jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a44cc29c6553c7455bf0ddd267f0d4d75dfeced1

Authored by wangbo
1 parent 8791f3133a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

年报bug修改

Showing 2 changed files with 9 additions and 8 deletions

platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java View file @ a44cc29
... ... @@ -451,13 +451,13 @@
451 451  
452 452 if (StringUtils.isNotEmpty(queryNo)) {
453 453 MongoCondition c = MongoCondition.newInstance();
454   - MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
  454 + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
455 455 MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
456 456 MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
457   - if(c1!=null) {
458   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria());
459   - }else {
460   - c1 = c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria();
  457 + if (c1 != null) {
  458 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria());
  459 + } else {
  460 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
461 461 }
462 462 }
463 463  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java View file @ a44cc29
... ... @@ -334,6 +334,7 @@
334 334 List<Integer> sieveList = new ArrayList<>();
335 335 sieveList.add(2);
336 336 sieveList.add(3);
  337 + sieveList.add(4);
337 338 List<Integer> sieveGWList = new ArrayList<>();
338 339 sieveGWList.add(3);
339 340 sieveGWList.add(4);
340 341  
341 342  
... ... @@ -593,14 +594,14 @@
593 594 SieveQuery sieveQuery = new SieveQuery();
594 595 sieveQuery.setYn(1);
595 596 if (StringUtils.isNotEmpty(time)) {
596   - sieveQuery.setCreatedStart(DateUtil.getSNDate(time)[0]);
597   - sieveQuery.setCreatedEnd(DateUtil.getSNDate(time)[1]);
  597 + sieveQuery.setResultTimeStart(DateUtil.getSNDate(time)[0]);
  598 + sieveQuery.setResultTimeEnd(DateUtil.getSNDate(time)[1]);
598 599 }
599 600 sieveQuery.setHospitalIds(entry.getValue());
600 601 sieveQuery.setStatuses(sieveList);
601 602 int sieveCount = sieveService.queryListCount(sieveQuery);
  603 + System.out.println("========>" + entry.getKey() + "=======>" + sieveCount);
602 604 map.put("sieveCount", String.valueOf(sieveCount));
603   -
604 605 map.put("sievePervent", this.division(sieveCount, antexMap.size()));
605 606 //高危人数
606 607 SieveQuery sieveGwQuery = new SieveQuery();