From de05cea058d6e09ac65d41d8f4d78317c61242a8 Mon Sep 17 00:00:00 2001 From: cfl Date: Wed, 6 Dec 2023 12:41:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8=E5=BB=BA?= =?UTF-8?q?=E6=A1=A3=E7=94=9F=E6=88=90=E5=88=9D=E6=A3=80=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/RemoteController.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index b29607b..342991d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -369,7 +369,7 @@ public class RemoteController extends BaseController { List list = archiveDataServicer.query(query.convertToQuery()); if (CollectionUtils.isNotEmpty(list)) { Map map = JsonUtil.str2Obj(list.get(0).getJsonData(), HashMap.class); - Map history = (Map) map.get("history"); + Map history = JsonUtil.str2Obj(map.get("history").toString(),Map.class) ; PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); @@ -388,13 +388,14 @@ public class RemoteController extends BaseController { antExcAddRequest.setcDueWeek(cDueWeek); if (history.get("bp") != null) { - antExcAddRequest.setBp((Map) history.get("bp")); + String bp = history.get("bp").toString(); + antExcAddRequest.setBp(JsonUtil.str2Obj(bp,Map.class) ); } // 既往史 if (history.get("pastHistory") != null) { String pastHistory = history.get("pastHistory").toString(); if (StringUtils.isNotEmpty(pastHistory)) { - HashMap pastHistoryMap = JsonUtil.jkstr2Obj(pastHistory, HashMap.class); + Map pastHistoryMap = JsonUtil.jkstr2Obj(pastHistory, Map.class); antExcAddRequest.setPastHistory(pastHistoryMap); } } @@ -402,7 +403,7 @@ public class RemoteController extends BaseController { if (history.get("familyHistory") != null) { String familyHistory = history.get("familyHistory").toString(); if (StringUtils.isNotEmpty(familyHistory)) { - HashMap familyHistoryMap = JsonUtil.jkstr2Obj(familyHistory, HashMap.class); + Map familyHistoryMap = JsonUtil.jkstr2Obj(familyHistory, Map.class); antExcAddRequest.setFamilyHistory(familyHistoryMap); } } @@ -410,7 +411,7 @@ public class RemoteController extends BaseController { if (history.get("personalHistory") != null) { String personalHistory = history.get("personalHistory").toString(); if (StringUtils.isNotEmpty(personalHistory)) { - HashMap personalHistoryMap = JsonUtil.jkstr2Obj(personalHistory, HashMap.class); + Map personalHistoryMap = JsonUtil.jkstr2Obj(personalHistory, Map.class); antExcAddRequest.setPersonalHistory(personalHistoryMap); } } @@ -418,7 +419,7 @@ public class RemoteController extends BaseController { if (history.get("fksxHistory") != null) { String fksxHistory = history.get("fksxHistory").toString(); if (StringUtils.isNotEmpty(fksxHistory)) { - HashMap fksxHistoryMap = JsonUtil.jkstr2Obj(fksxHistory, HashMap.class); + Map fksxHistoryMap = JsonUtil.jkstr2Obj(fksxHistory, Map.class); antExcAddRequest.setFksxHistory(fksxHistoryMap); } } @@ -426,7 +427,7 @@ public class RemoteController extends BaseController { if (history.get("cestationInfo") != null) { String cestationInfo = history.get("cestationInfo").toString(); if (StringUtils.isNotEmpty(cestationInfo)) { - HashMap cestationInfoMap = JsonUtil.jkstr2Obj(cestationInfo, HashMap.class); + Map cestationInfoMap = JsonUtil.jkstr2Obj(cestationInfo, Map.class); antExcAddRequest.setCestationInfo(cestationInfoMap); } } @@ -434,7 +435,7 @@ public class RemoteController extends BaseController { if (history.get("ysfyHistory") != null) { String ysfyHistory = history.get("ysfyHistory").toString(); if (StringUtils.isNotEmpty(ysfyHistory)) { - HashMap ysfyHistoryMap = JsonUtil.jkstr2Obj(ysfyHistory, HashMap.class); + Map ysfyHistoryMap = JsonUtil.jkstr2Obj(ysfyHistory, Map.class); antExcAddRequest.setYsfyHistory(ysfyHistoryMap); } } @@ -442,7 +443,7 @@ public class RemoteController extends BaseController { if (history.get("infectDiseases") != null) { String infectDiseases = history.get("infectDiseases").toString(); if (StringUtils.isNotEmpty(infectDiseases)) { - HashMap infectDiseasesMap = JsonUtil.jkstr2Obj(infectDiseases, HashMap.class); + Map infectDiseasesMap = JsonUtil.jkstr2Obj(infectDiseases, Map.class); antExcAddRequest.setInfectDiseases(infectDiseasesMap); } } -- 1.8.3.1