diff --git a/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java b/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java index 626f812..145b6a6 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java +++ b/src/main/java/com/syjiaer/clinic/server/common/api/request/SocialRequest.java @@ -254,4 +254,12 @@ public class SocialRequest { JSONObject jsonObject = httpUtil.callBackMsgId("3101", "data", im3101.buildToMap(), 10000); DebugUtil.out(jsonObject); } + + public JSONObject callMerge31013102(Map map,String code) { + JSONObject jsonObject = httpUtil.callBackMsgId(code, "data", map, 10000); + + DebugUtil.out(jsonObject); + + return jsonObject; + } } diff --git a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/CheckService.java b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/CheckService.java index 8c530ba..e5c17e8 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/diagnosis/CheckService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/diagnosis/CheckService.java @@ -38,6 +38,7 @@ import com.syjiaer.clinic.server.common.config.Config; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; +import java.util.Map; @Slf4j @Service @@ -172,16 +173,20 @@ public class CheckService extends BaseService { return; } - makeRequest(socialUserInfo,patientRegistrationInfo,diagnosis,record,organizationMember); + Map requestMap = mergeRequestParam(socialUserInfo,patientRegistrationInfo,diagnosis,record,organizationMember); + + loggerInfo("组织请求接口数据",requestMap); + + Map callResult = socialRequest.callMerge31013102(requestMap,imCode); + + loggerInfo("调用成功",callResult); } catch (Exception e) { log.error("事前事中:error_message:{}",e.getMessage()); - - e.printStackTrace(); } } - public void makeRequest(SocialUser socialUser,PatientRegistration patientRegistration,Diagnosis diagnosis,DiagnosisMedicalRecord record,OrganizationMember organizationMember) + public Map mergeRequestParam(SocialUser socialUser, PatientRegistration patientRegistration, Diagnosis diagnosis, DiagnosisMedicalRecord record, OrganizationMember organizationMember) { IM3101 im3101 = new IM3101(); @@ -426,7 +431,7 @@ public class CheckService extends BaseService { fsiEncounterDtos.setReimFlag("1"); fsiEncounterDtos.setOutSetlFlag("0"); - socialRequest.call3101(im3101); - +// socialRequest.call3101(im3101); + return im3101.buildToMap(); } }