修改填写用户采集信息接口回显参数

fs-service/src/main/java/com/fs/course/param/SubmitCollectionAnswerParam.java

@@ -0,0 +1,13 @@
+package com.fs.course.param;
+import com.fs.his.vo.AnswerVO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SubmitCollectionAnswerParam {
+    //采集表id
+    private Long collectionId;
+    //用户填写的采集问题
+    private List<AnswerVO> answers;
+}

fs-service/src/main/java/com/fs/hisStore/service/IFsUserInformationCollectionService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.common.core.domain.R;
 import com.fs.course.param.CollectionBindUserParam;
 import com.fs.course.param.CollectionInfoConfirmParam;
+import com.fs.course.param.SubmitCollectionAnswerParam;
 import com.fs.course.vo.FsUserInfoCollectionUVO;
 import com.fs.his.domain.FsUserInformationCollectionSchedule;
 import com.fs.hisStore.domain.FsUserInformationCollection;
@@ -149,5 +150,5 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
     /**
      * 提交用户填写采集信息问题(只有用户自主填写完采集信息时才调用)
      * */
-    int modifyUserCollectedQuestions(FsUserInformationCollectionParam fsUserInformationCollection);
+    int submitCollectionAnswerParam(SubmitCollectionAnswerParam param);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -12,6 +12,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.CustomException;
@@ -27,6 +28,7 @@ import com.fs.core.config.WxPayProperties;
 import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.param.CollectionBindUserParam;
 import com.fs.course.param.CollectionInfoConfirmParam;
+import com.fs.course.param.SubmitCollectionAnswerParam;
 import com.fs.course.vo.FsUserInfoCollectionUVO;
 import com.fs.doctor.domain.DoctorMsg;
 import com.fs.doctor.mapper.DoctorMsgMapper;
@@ -386,6 +388,12 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             vo.setUserName(fsUserInformationCollection.getUserName());
             vo.setRemark(fsUserInformationCollection.getRemark());
             vo.setAllergy(fsUserInformationCollection.getAllergy());
+            String json=configService.selectConfigByKey("his.salesProxyFill");
+            if (StringUtils.isNotEmpty(json)) {
+                JSONObject jsonObject = JSON.parseObject(json);
+                Boolean salesProxyFill = jsonObject.getBoolean("isSalesProxyFill");
+                vo.setIsSalesProxyFill(salesProxyFill);
+            }
             if (map.getQuestionId() == null) {
                 FsQuestionAndAnswerVO questionAndAnswerVO = questionAndAnswerService.selectFsQuestionAndAnswerById(fsUserInformationCollection.getQuestionId());
                 List<AnswerVO> answerVOS = JSON.parseArray(fsUserInformationCollection.getJsonInfo(), AnswerVO.class);
@@ -1312,8 +1320,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int modifyUserCollectedQuestions(FsUserInformationCollectionParam param) {
-        FsUserInformationCollection informationCollection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(param.getId());
+    public int submitCollectionAnswerParam(SubmitCollectionAnswerParam param) {
+        FsUserInformationCollection informationCollection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(param.getCollectionId());
         if (informationCollection== null){
             throw new CustomException("用户采集信息不存在");
         }

fs-service/src/main/java/com/fs/hisStore/vo/FsUserInformationCollectionVO.java

@@ -50,4 +50,7 @@ public class FsUserInformationCollectionVO {
 
     private Integer isShare;
 
+    //是否销售代填写 0-否 1-是
+    private Boolean isSalesProxyFill;
+
 }

fs-user-app/src/main/java/com/fs/app/controller/UserInfoCollectionController.java

@@ -9,6 +9,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.company.mapper.CompanyUserRoleMapper;
 import com.fs.course.param.CollectionBindUserParam;
 import com.fs.course.param.CollectionInfoConfirmParam;
+import com.fs.course.param.SubmitCollectionAnswerParam;
 import com.fs.course.vo.FsUserInfoCollectionUVO;
 import com.fs.his.domain.FsUser;
 import com.fs.his.domain.FsUserInformationCollectionSchedule;
@@ -108,10 +109,10 @@ public class UserInfoCollectionController extends AppBaseController {
      * */
     @ApiOperation("提交用户填写采集信息问题")
     @Log(title = "提交用户填写采集信息问题", businessType = BusinessType.UPDATE)
-    @PostMapping("/modifyUserCollectedQuestions")
-    public R modifyUserCollectedQuestions(@RequestBody FsUserInformationCollectionParam fsUserInformationCollection)
+    @PostMapping("/submitCollectionAnswerParam")
+    public R submitCollectionAnswerParam(@RequestBody SubmitCollectionAnswerParam param)
     {
-        int result = userInformationCollectionService.modifyUserCollectedQuestions(fsUserInformationCollection);
+        int result = userInformationCollectionService.submitCollectionAnswerParam(param);
         if (result > 0) {
             return R.ok();
         } else {