From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
index f2adb3a..083f3d5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiGetMethodService.java
@@ -282,22 +282,26 @@
         } else{
             response = JSONUtil.parseObj(responseJson);
         }
-        if (response.getStr(apiConfig.getResultCodeKey()).equals("0")) {
+        if (response.getStr(apiConfig.getResultCodeKey()).equals("1")) {
             AjaxResult ajaxResult = AjaxResult.success();
-            JSONArray resultData = response.getJSONArray(apiConfig.getResultDataKey());
-            List<Map<String, String>> list = new ArrayList<>();
-            for (Object resultDatum : resultData) {
-                JSONObject object = (JSONObject) resultDatum;
-                ajaxResult = save(object, type,apiConfig,JSONUtil.toJsonStr(params));
-                Map<String, String> map = new HashMap<>();
-                for (String key : object.keySet()) {
-                    String defaultVal = object.get(key).toString();
-                    String val = defaultVal.trim().replaceAll("\\s+", "");
-                    map.put(key, val);
+            if (response.getStr(apiConfig.getResultDataKey()) != null && StrUtil.isNotBlank(response.getStr(apiConfig.getResultDataKey()))){
+                JSONArray resultData = response.getJSONArray(apiConfig.getResultDataKey());
+                List<Map<String, String>> list = new ArrayList<>();
+                for (Object resultDatum : resultData) {
+                    JSONObject object = (JSONObject) resultDatum;
+                    ajaxResult = save(object, type,apiConfig,JSONUtil.toJsonStr(params));
+                    Map<String, String> map = new HashMap<>();
+                    for (String key : object.keySet()) {
+                        String defaultVal = object.get(key).toString();
+                        String val = defaultVal.trim().replaceAll("\\s+", "");
+                        map.put(key, val);
+                    }
+                    list.add(map);
                 }
-                list.add(map);
+                ajaxResult.put("data", list);
+            }else {
+                ajaxResult.put("data",response);
             }
-            ajaxResult.put("data", list);
             return ajaxResult;
         } else {
             return AjaxResult.error().put("result", JSONUtil.parseObj(responseJson));
@@ -450,7 +454,7 @@
      * @throws SQLException
      */
     @Transactional
-    private void insertDataNew(Connection connection, JSONObject jsonObject,Object hisApiConfig,String paramsJson,String code) throws SQLException {
+    public void insertDataNew(Connection connection, JSONObject jsonObject, Object hisApiConfig, String paramsJson, String code) throws SQLException {
         String tabName = "";
         List<String> primaryKesList;
         if (code.equals("lis") || code.equals("pacs")) {

--
Gitblit v1.8.0