Merge remote-tracking branch 'origin/dev_zxm' into test

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

@@ -24,13 +24,16 @@ import com.yd.csf.service.model.ProductPlan;
 import com.yd.csf.service.service.FnaService;
 import com.yd.csf.service.service.IAppointmentService;
 import com.yd.question.feign.client.ApiQuestionnairesFeignClient;
+import com.yd.question.feign.request.ApiAnswerSaveRequest;
 import com.yd.question.feign.request.ApiObjectSaveRequest;
+import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 import java.util.Objects;
@@ -120,6 +123,10 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
         Result<List<ApiAppointmentFileDto>> result6 = apiAppointmentFileService.list(appointmentBizId);
         response.setApiAppointmentFileDtoList(result6.getData());
         response.setStatus(!Objects.isNull(result.getData()) ? appointment.getStatus() : null);
+
+        //获取问卷详细信息-单个问卷详细信息
+        Result<ApiQuestionnairesDetailResponse> responseResult = apiQuestionnairesFeignClient.detail("questionnaires_1001",appointmentBizId);
+        response.setQuestionnairesDetailResponse(responseResult.getData());
         return Result.success(response);
     }
 
@@ -316,6 +323,16 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
             //预约编号和预约业务id更新到FNA表（提交待预约状态，预约信息的预约业务id和预约编号更新到Fna表的预约业务id和预约编号）
             updateFnaBizIdAndNo(appointment.getFnaBizId(),appointment.getAppointmentBizId(),appointment.getAppointmentNo());
         }
+
+        //远程调用-问卷-答题提交接口
+        if (!CollectionUtils.isEmpty(request.getAnswerSessionsDtoList())) {
+            ApiAnswerSaveRequest answerSaveRequest = new ApiAnswerSaveRequest();
+            answerSaveRequest.setObjectBizId(appointment.getAppointmentBizId());
+            answerSaveRequest.setQuestionnaireBizId("questionnaires_1001");
+            answerSaveRequest.setAnswerSessionsDtoList(request.getAnswerSessionsDtoList());
+            apiQuestionnairesFeignClient.answerSave(answerSaveRequest);
+        }
+
         return Result.success();
     }
 

yd-csf-feign/pom.xml

@@ -31,5 +31,10 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yd</groupId>
+            <artifactId>yd-question-feign</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 </project>

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

 package com.yd.csf.feign.request.appointment;
 
 import com.yd.csf.feign.dto.appointment.*;
+import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import lombok.Data;
 import java.util.List;
 
@@ -40,4 +41,5 @@ public class ApiAppointmentAddRequest {
      */
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
 
+
 }

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

 package com.yd.csf.feign.request.appointment;
 
 import com.yd.csf.feign.dto.appointment.*;
+import com.yd.question.feign.dto.ApiAnswerSessionsDto;
 import lombok.Data;
 
 import java.util.List;
@@ -42,7 +43,8 @@ public class ApiAppointmentEditRequest {
     private ApiSecondHolderInfoDto apiSecondHolderInfoDto;
 
     /**
-     * TODO 待定
+     * 健康信息 - 答题会话对象（实际回答问题的内容）集合，对象即ApiAnswerSessionsDto，一个对象一个问卷问题
      */
+    private List<ApiAnswerSessionsDto> answerSessionsDtoList;
 
 }

yd-csf-feign/src/main/java/com/yd/csf/feign/response/appointment/ApiAppointmentDetailResponse.java

@@ -2,6 +2,7 @@ package com.yd.csf.feign.response.appointment;
 
 import com.yd.csf.feign.dto.appointment.*;
 import com.yd.csf.feign.dto.appointmentfile.ApiAppointmentFileDto;
+import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 import lombok.Data;
 
 import java.util.List;
@@ -54,4 +55,8 @@ public class ApiAppointmentDetailResponse {
      */
     private List<ApiAppointmentFileDto> apiAppointmentFileDtoList;
 
+    /**
+     * 获取问卷详细信息-单个问卷详细信息
+     */
+    private ApiQuestionnairesDetailResponse questionnairesDetailResponse;
 }