fix(微问诊): 修复data返回结果不是json对象时，代码报错的问题

aidea-modules/prescription-module/src/main/java/com/cftech/cdfortis/service/impl/CdfortisServiceImpl.java

@@ -77,20 +77,23 @@ public class CdfortisServiceImpl implements CdfortisService {
             param.put("drugInfo", cdfortisDrugList);
             RequestBody body = RequestBody.create(MEDIA_TYPE_JSON, param.toJSONString());
             // 请求获取数据
-            JSONObject data = CdfortisResponseUtil.request(uploadUrl, CdfortisConstant.METHOD_POST,
+            Object data = CdfortisResponseUtil.request(uploadUrl, CdfortisConstant.METHOD_POST,
                     null, null, body, rtnJson);
             if (data == null) {
                 return rtnJson;
             }
-
-            boolean isAllSuccess = data.getBooleanValue("isAllSuccess");
-            if (!isAllSuccess) {
-                JSONArray failedDataArr = data.getJSONArray("failedData");
-                //TODO 更新药物上传状态
-
-                rtnJson.put("errorNo", "0");
-                rtnJson.put("data", failedDataArr);
-                return rtnJson;
+            // 判断数据是否正确
+            if (data instanceof JSONObject) {
+                JSONObject dataJsonObj = (JSONObject) data;
+                boolean isAllSuccess = dataJsonObj.getBooleanValue("isAllSuccess");
+                if (!isAllSuccess) {
+                    JSONArray failedDataArr = dataJsonObj.getJSONArray("failedData");
+                    //TODO 更新药物上传状态
+
+                    rtnJson.put("errorNo", "0");
+                    rtnJson.put("data", failedDataArr);
+                    return rtnJson;
+                }
             }
 
             rtnJson.put("errorNo", "0");
@@ -126,7 +129,7 @@ public class CdfortisServiceImpl implements CdfortisService {
             urlParam.put("startTime", startTime);
             urlParam.put("endTime", endTime);
             // 请求获取数据
-            JSONObject data = CdfortisResponseUtil.request(getFbusiListUrl, CdfortisConstant.METHOD_GET, urlParam,
+            Object data = CdfortisResponseUtil.request(getFbusiListUrl, CdfortisConstant.METHOD_GET, urlParam,
                     null, null, rtnJson);
             if (data == null) {
                 return rtnJson;
@@ -156,7 +159,7 @@ public class CdfortisServiceImpl implements CdfortisService {
             urlParam.put("token", cdfortisTokenUtil.getToken());
             urlParam.put("presId", presId);
             // 请求获取数据
-            JSONObject data = CdfortisResponseUtil.request(getFbusiInfoUrl, CdfortisConstant.METHOD_GET, urlParam,
+            Object data = CdfortisResponseUtil.request(getFbusiInfoUrl, CdfortisConstant.METHOD_GET, urlParam,
                     null, null, rtnJson);
             if (data == null) {
                 return rtnJson;
@@ -186,7 +189,7 @@ public class CdfortisServiceImpl implements CdfortisService {
             urlParam.put("token", cdfortisTokenUtil.getToken());
             urlParam.put("presId", presId);
             // 请求获取数据
-            JSONObject data = CdfortisResponseUtil.request(getFbusiPicUrl, CdfortisConstant.METHOD_GET, urlParam,
+            Object data = CdfortisResponseUtil.request(getFbusiPicUrl, CdfortisConstant.METHOD_GET, urlParam,
                     null, null, rtnJson);
             if (data == null) {
                 return rtnJson;

aidea-modules/prescription-module/src/main/java/com/cftech/cdfortis/util/CdfortisResponseUtil.java

@@ -56,7 +56,7 @@ public class CdfortisResponseUtil {
      * @return
      * @throws Exception
      */
-    public static JSONObject request(String url, String method, Map<String, String> queryParams, Map<String, String> headers, RequestBody body, JSONObject rtnJson) throws Exception {
+    public static Object request(String url, String method, Map<String, String> queryParams, Map<String, String> headers, RequestBody body, JSONObject rtnJson) throws Exception {
         HttpUrl.Builder urlBuild = HttpUrl.parse(url).newBuilder();
         // 处理query参数
         if (queryParams != null) {
@@ -92,7 +92,7 @@ public class CdfortisResponseUtil {
             JSONObject retObj = JSONObject.parseObject(retStr);
             // 插件结果
             checkResponse(retObj);
-            return retObj.getJSONObject("data");
+            return retObj.get("data");
         } catch (Exception e) {
             throw new Exception(e.getMessage());
         }