push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiAppointmentServiceImpl.java

@@ -457,11 +457,11 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         apiSecondHolderService.editSecondHolderData(request.getApiSecondHolderInfoDto(), appointment.getAppointmentBizId());
         apiSecondHolderService.editSecondHolderData(request.getApiSecondHolderInfoDto(), appointment.getAppointmentBizId());
 
 
         //远程调用-问卷-答题提交接口
         //远程调用-问卷-答题提交接口
-        if (!CollectionUtils.isEmpty(request.getAnswerSessionsDtoList())) {
+        if (!Objects.isNull(request.getApiAnswerSaveRequest()) && !CollectionUtils.isEmpty(request.getApiAnswerSaveRequest().getAnswerSessionsDtoList())) {
             ApiAnswerSaveRequest answerSaveRequest = new ApiAnswerSaveRequest();
             ApiAnswerSaveRequest answerSaveRequest = new ApiAnswerSaveRequest();
             answerSaveRequest.setObjectBizId(appointment.getAppointmentBizId());
             answerSaveRequest.setObjectBizId(appointment.getAppointmentBizId());
             answerSaveRequest.setQuestionnaireBizId("questionnaires_1001");
             answerSaveRequest.setQuestionnaireBizId("questionnaires_1001");
-            answerSaveRequest.setAnswerSessionsDtoList(request.getAnswerSessionsDtoList());
+            answerSaveRequest.setAnswerSessionsDtoList(request.getApiAnswerSaveRequest().getAnswerSessionsDtoList());
             apiQuestionnairesFeignClient.answerSave(answerSaveRequest);
             apiQuestionnairesFeignClient.answerSave(answerSaveRequest);
         }
         }
 
 

yd-csf-feign/src/main/java/com/yd/csf/feign/request/appointment/ApiAppointmentEditRequest.java

@@ -2,6 +2,7 @@ package com.yd.csf.feign.request.appointment;
 
 
 import com.yd.csf.feign.dto.appointment.*;
 import com.yd.csf.feign.dto.appointment.*;
 import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import com.yd.question.feign.dto.ApiAnswerSessionsDto;
+import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.Valid;
 import javax.validation.Valid;
@@ -53,8 +54,8 @@ public class ApiAppointmentEditRequest {
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
 
 
     /**
     /**
-     * 健康信息 - 答题会话对象（实际回答问题的内容）集合，对象即ApiAnswerSessionsDto，一个对象一个问卷问题
+     * 问卷-答题提交对象
      */
      */
-    private List<ApiAnswerSessionsDto> answerSessionsDtoList;
+    private ApiAnswerSaveRequest apiAnswerSaveRequest;
 
 
 }
 }