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 342991d..b359a56 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 @@ -388,12 +388,12 @@ public class RemoteController extends BaseController { antExcAddRequest.setcDueWeek(cDueWeek); if (history.get("bp") != null) { - String bp = history.get("bp").toString(); - antExcAddRequest.setBp(JsonUtil.str2Obj(bp,Map.class) ); + String bp = JsonUtil.obj2JsonString(history.get("bp")); + antExcAddRequest.setBp(JsonUtil.str2Obj(bp, Map.class)); } // 既往史 if (history.get("pastHistory") != null) { - String pastHistory = history.get("pastHistory").toString(); + String pastHistory = JsonUtil.obj2JsonString(history.get("pastHistory")); if (StringUtils.isNotEmpty(pastHistory)) { Map pastHistoryMap = JsonUtil.jkstr2Obj(pastHistory, Map.class); antExcAddRequest.setPastHistory(pastHistoryMap); @@ -401,7 +401,7 @@ public class RemoteController extends BaseController { } // 家族史 if (history.get("familyHistory") != null) { - String familyHistory = history.get("familyHistory").toString(); + String familyHistory = JsonUtil.obj2JsonString(history.get("familyHistory")); if (StringUtils.isNotEmpty(familyHistory)) { Map familyHistoryMap = JsonUtil.jkstr2Obj(familyHistory, Map.class); antExcAddRequest.setFamilyHistory(familyHistoryMap); @@ -409,7 +409,7 @@ public class RemoteController extends BaseController { } //个人史 if (history.get("personalHistory") != null) { - String personalHistory = history.get("personalHistory").toString(); + String personalHistory = JsonUtil.obj2JsonString(history.get("personalHistory")); if (StringUtils.isNotEmpty(personalHistory)) { Map personalHistoryMap = JsonUtil.jkstr2Obj(personalHistory, Map.class); antExcAddRequest.setPersonalHistory(personalHistoryMap); @@ -417,7 +417,7 @@ public class RemoteController extends BaseController { } //妇科手术史 if (history.get("fksxHistory") != null) { - String fksxHistory = history.get("fksxHistory").toString(); + String fksxHistory = JsonUtil.obj2JsonString(history.get("fksxHistory")); if (StringUtils.isNotEmpty(fksxHistory)) { Map fksxHistoryMap = JsonUtil.jkstr2Obj(fksxHistory, Map.class); antExcAddRequest.setFksxHistory(fksxHistoryMap); @@ -425,7 +425,7 @@ public class RemoteController extends BaseController { } //本次妊娠情况 if (history.get("cestationInfo") != null) { - String cestationInfo = history.get("cestationInfo").toString(); + String cestationInfo = JsonUtil.obj2JsonString(history.get("cestationInfo")); if (StringUtils.isNotEmpty(cestationInfo)) { Map cestationInfoMap = JsonUtil.jkstr2Obj(cestationInfo, Map.class); antExcAddRequest.setCestationInfo(cestationInfoMap); @@ -433,7 +433,7 @@ public class RemoteController extends BaseController { } //叶酸服用情况 if (history.get("ysfyHistory") != null) { - String ysfyHistory = history.get("ysfyHistory").toString(); + String ysfyHistory = JsonUtil.obj2JsonString(history.get("ysfyHistory")); if (StringUtils.isNotEmpty(ysfyHistory)) { Map ysfyHistoryMap = JsonUtil.jkstr2Obj(ysfyHistory, Map.class); antExcAddRequest.setYsfyHistory(ysfyHistoryMap); @@ -441,7 +441,7 @@ public class RemoteController extends BaseController { } //传染病史 if (history.get("infectDiseases") != null) { - String infectDiseases = history.get("infectDiseases").toString(); + String infectDiseases = JsonUtil.obj2JsonString(history.get("infectDiseases")); if (StringUtils.isNotEmpty(infectDiseases)) { Map infectDiseasesMap = JsonUtil.jkstr2Obj(infectDiseases, Map.class); antExcAddRequest.setInfectDiseases(infectDiseasesMap); @@ -498,7 +498,6 @@ public class RemoteController extends BaseController { } if (history.get("height") != null) { antExcAddRequest.setHeight(history.get("height").toString()); - } if (StringUtils.isNotEmpty(antExcAddRequest.getWeight()) && StringUtils.isNotEmpty(antExcAddRequest.getHeight())) { Double wh = Double.parseDouble(antExcAddRequest.getHeight()) / 100; @@ -529,6 +528,7 @@ public class RemoteController extends BaseController { } }).start(); + System.out.println("confirmArchive return :"+JsonUtil.obj2JsonString(baseObjectResponse)); if(baseObjectResponse.getErrorcode()==ErrorCodeConstants.SUCCESS){ writeString(response,"success"); return;