Commit 69eaee85a1645d489ea7a4daf9d96d7b3b62c9c9

Authored by zhangchao
1 parent 5d875d9ca4
Exists in dev

#fix:优化产检项目已删除显示null的问题

Showing 2 changed files with 7 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 69eaee8
... ... @@ -543,7 +543,7 @@
543 543 patientsQuery.setHospitalId(hospitalId);
544 544 //patientsQuery.setType(3);
545 545 patientsQuery.setQueryNo(downQueryRequest.getKey());
546   - System.out.println("过滤条件:" + patientsQuery.convertToQuery().convertToMongoQuery());
  546 + //System.out.println("过滤条件:" + patientsQuery.convertToQuery().convertToMongoQuery());
547 547 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
548 548 if (CollectionUtils.isEmpty(patientses)) {
549 549 throw new Exception("没有找到数据");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 69eaee8
... ... @@ -2593,7 +2593,9 @@
2593 2593 String[] arrs = data.getConfigItemId().split(",");
2594 2594 for (String checkItemId : arrs) {
2595 2595 String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId));
2596   - nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem);
  2596 + if (StringUtils.isNotEmpty(checkItem)){
  2597 + nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem);
  2598 + }
2597 2599 }
2598 2600 }
2599 2601 map.put("nextCheckItem", nextCheckItem);
... ... @@ -3542,7 +3544,9 @@
3542 3544 String[] arrs = data.getConfigItemId().split(",");
3543 3545 for (String checkItemId : arrs) {
3544 3546 String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId));
3545   - nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem);
  3547 + if (StringUtils.isNotEmpty(checkItem)){
  3548 + nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem);
  3549 + }
3546 3550 }
3547 3551 }
3548 3552 map.put("nextCheckItem", nextCheckItem);