From 7605ca3ab53371f94323b60ecbc59841a9b47337 Mon Sep 17 00:00:00 2001
From: cfl <chaifulai@163.com>
Date: Sun, 8 Oct 2023 14:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=AB=98=E5=8D=B1=E9=A3=8E?=
 =?UTF-8?q?=E9=99=A9=E5=9B=A0=E7=B4=A0=E7=AD=89=E7=BA=A7=E9=9D=9E=E6=95=B0?=
 =?UTF-8?q?=E7=BB=84=E6=A0=BC=E5=BC=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E7=A9=BA?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/common/utils/JsonUtil.java | 19 +++++++++++++++++++
 .../com/lyms/platform/operate/web/worker/WorkHR.java  | 13 +++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
index 48b3cb3..9fcd2c8 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/JsonUtil.java
@@ -44,6 +44,25 @@ public class JsonUtil {
         return null;
     }
 
+    /**
+     * 档案信息高危风险因素等级RiskLevelId转List专用方法
+     * @param patientRiskLevelId
+     * @return
+     */
+    public static List<String> patientRiskLevelIdToList(String patientRiskLevelId){
+        List<String> list = new ArrayList<>();
+        if (StringUtils.isEmpty(patientRiskLevelId) || "[]".equals(patientRiskLevelId)) {
+            return  list;
+        }
+        if(patientRiskLevelId.startsWith("[")){
+            list = jkstr2Obj(patientRiskLevelId, List.class);
+        }else{
+            list.add(patientRiskLevelId);
+        }
+
+        return list;
+    }
+
 //    public static <T> T jkstr2List(String content,
 //                                  TypeReference<?> typeReference) {
 //        ObjectMapper objectMapper = new ObjectMapper();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java
index b774361..c240c37 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java
@@ -259,9 +259,18 @@ public class WorkHR implements Callable<List<RiskPatientsResult>> {
             }
 
             List level = new ArrayList();
-            if (StringUtils.isNotEmpty(patients.getRiskLevelId())) {
+            if (StringUtils.isNotEmpty(patients.getRiskLevelId()) && !"[]".equals(patients.getRiskLevelId())) {
                 try {
-                    List<String> list = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
+                    //riskLevelId可能为非数组格式，故写了一个特殊方法
+                   /* List<String> list = null;
+                    if(patients.getRiskLevelId().startsWith("[")){
+                        list = JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
+                    }else{
+                        list = new ArrayList<>();
+                        list.add(patients.getRiskLevelId());
+                    }*/
+                    List<String> list = JsonUtil.patientRiskLevelIdToList(patients.getRiskLevelId());
+
                     for (String str : list) {
                         BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(str);
                         if (null != basicConfig) {
-- 
1.8.3.1