From 69eaee85a1645d489ea7a4daf9d96d7b3b62c9c9 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 9 Jul 2024 15:04:18 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E4=BA=A7=E6=A3=80?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=B7=B2=E5=88=A0=E9=99=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?null=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/TrackDownFacade.java | 2 +- .../java/com/lyms/platform/operate/web/facade/ViewFacade.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 2543ed3..54833f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -543,7 +543,7 @@ public class TrackDownFacade { patientsQuery.setHospitalId(hospitalId); //patientsQuery.setType(3); patientsQuery.setQueryNo(downQueryRequest.getKey()); - System.out.println("过滤条件：" + patientsQuery.convertToQuery().convertToMongoQuery()); + //System.out.println("过滤条件：" + patientsQuery.convertToQuery().convertToMongoQuery()); List patientses = patientsService.queryPatient(patientsQuery); if (CollectionUtils.isEmpty(patientses)) { throw new Exception("没有找到数据"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 84c2b58..b177dcb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -2593,7 +2593,9 @@ public class ViewFacade { String[] arrs = data.getConfigItemId().split(","); for (String checkItemId : arrs) { String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId)); - nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem); + if (StringUtils.isNotEmpty(checkItem)){ + nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem); + } } } map.put("nextCheckItem", nextCheckItem); @@ -3542,7 +3544,9 @@ public class ViewFacade { String[] arrs = data.getConfigItemId().split(","); for (String checkItemId : arrs) { String checkItem = checkItemService.getOne(Integer.parseInt(checkItemId)); - nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem); + if (StringUtils.isNotEmpty(checkItem)){ + nextCheckItem += StringUtils.isEmpty(nextCheckItem) ? checkItem : ("," + checkItem); + } } } map.put("nextCheckItem", nextCheckItem); -- 1.8.3.1