From a211fcdbeb3c66abe193f5cb2d76b9fdbf2fa266 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Tue, 15 Nov 2022 23:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataSyncConfigServiceImpl.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index a10b033255..d77a248ffd 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 import java.util.Date;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -1108,14 +1109,24 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         if (CollectionUtils.isNotEmpty(vaccineList)) {
             vaccineList.forEach(v -> {
                 if (v.containsKey("data")){
-                    Map<String, Object> data = (Map<String, Object>) v.get("data");
-                    if (data.containsKey("vaccineList")){
-                        List<YTVaccineListDTO> vaccineList1 = JSON.parseArray(data.get("vaccineList").toString(), YTVaccineListDTO.class);
+                    JSONObject jo = JSON.parseObject((String) v.get("data"));
+                    if (jo.containsKey("vaccineList")) {
+                        JSONArray vaccineListJA = jo.getJSONArray("vaccineList");
+                        List<YTVaccineListDTO> vaccineList1 = vaccineListJA.toJavaList(YTVaccineListDTO.class);
                         vaccineList1.forEach(v1 -> {
                             v1.setCardno(v.get("cardno").toString());
                         });
                         ytVaccineListDTOS.addAll(vaccineList1);
                     }
+
+                    //Map<String, Object> data = (Map<String, Object>) v.get("data");
+                    //if (data.containsKey("vaccineList")){
+                    //    List<YTVaccineListDTO> vaccineList1 = JSON.parseArray(data.get("vaccineList").toString(), YTVaccineListDTO.class);
+                    //    vaccineList1.forEach(v1 -> {
+                    //        v1.setCardno(v.get("cardno").toString());
+                    //    });
+                    //    ytVaccineListDTOS.addAll(vaccineList1);
+                    //}
                 }
             });
             List<IcVaccineEntity> entities = new ArrayList<>();