From e784b09f03e639aaac0c3bb12c263bdcb4ee82c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 26 Jun 2023 10:11:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BC=B3=E5=B7=9E=E4=B8=AD=E5=8C=BB=E9=99=A2?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF--=E6=99=BA=E4=B8=9A=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=20=E8=BD=AC=E6=8D=A2=E8=A7=84?=
 =?UTF-8?q?=E6=A0=BC=E5=9E=8B=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java
index 2dace89..65fe998 100644
--- a/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/zzzyy/ZzzyyClient.java
@@ -58,6 +58,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 漳州中医院客户端--智业接口对接
@@ -155,7 +156,8 @@ public class ZzzyyClient implements BaseHttpClient {
         response = parserResult(response);
         try {
             BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
-            List<ZzzyyProductsResponse> zzzyyProductsResponse = (List<ZzzyyProductsResponse>) baseResponse.getData();
+            Map map= (Map) baseResponse.getData();
+            List<ZzzyyProductsResponse> zzzyyProductsResponse= (List<ZzzyyProductsResponse>) map.get("list");
             for (ZzzyyProductsResponse productsResponse : zzzyyProductsResponse) {
                 //判断要是规格和型号一致就是取规格 不一致就合并
                 if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isNotEmpty(productsResponse.getStandard())) {
@@ -167,9 +169,10 @@ public class ZzzyyClient implements BaseHttpClient {
                 } else if (StrUtil.isNotEmpty(productsResponse.getModel_number()) && StrUtil.isBlank(productsResponse.getStandard())) {
                     productsResponse.setStandard(productsResponse.getModel_number());
                 }
-                baseResponse.setData("");
-                baseResponse.setData(zzzyyProductsResponse);
             }
+            map.put("list",zzzyyProductsResponse);
+            baseResponse.setData("");
+            baseResponse.setData(map);
             return baseResponse;
         } catch (Exception e) {
             log.error("解析漳州中医院智业接口返回产品信息字典数据异常，返回结果：{}", response);