优化CID信息采集记录逻辑

fs-company/src/main/java/com/fs/hisStore/controller/FsUserInformationCollectionController.java

@@ -277,6 +277,9 @@ public class FsUserInformationCollectionController extends BaseController
      */
     @PostMapping("/resetCIDCollection")
     public AjaxResult resetCIDCollection(@RequestBody FsUserInformationCollection param){
-        return AjaxResult.success(fsUserInformationCollectionService.resetCIDCollection(param.getId()));
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        Long operatorId=loginUser.getUser().getUserId();
+        String nickName=loginUser.getUser().getNickName();
+        return AjaxResult.success(fsUserInformationCollectionService.resetCIDCollection(param.getId(),operatorId,nickName));
     }
 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -51,7 +51,9 @@ import com.fs.his.vo.FsPackageOrderListUVO;
 import com.fs.his.vo.FsPackageOrderListVO;
 import com.fs.his.vo.FsPackageOrderVO;
 import com.fs.hisStore.domain.FsUserInformationCollection;
+import com.fs.hisStore.domain.FsUserInformationCollectionPersonalLog;
 import com.fs.hisStore.mapper.FsUserInformationCollectionMapper;
+import com.fs.hisStore.mapper.FsUserInformationCollectionPersonalLogMapper;
 import com.fs.hisStore.service.IFsUserInformationCollectionService;
 import com.fs.huifuPay.domain.HuiFuCreateOrder;
 import com.fs.huifuPay.domain.HuifuCreateOrderResult;
@@ -182,6 +184,9 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
     @Autowired
     private FsUserInformationCollectionMapper userInformationCollectionMapper;
 
+    @Autowired
+    private FsUserInformationCollectionPersonalLogMapper infoCollectionPersonalLogMapper;
+
     @Autowired
     private IFsShareAmountDetailService shareAmountDetailService;
 
@@ -883,6 +888,14 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                     if (collection.getQwTag() == 1){
                         //个微用户信息采集需要更新状态 用户
                         collectionUser.setPersonalCollectStatus(PostPayPrescStatusEnum.ORDER_IS_CREATED.getCode());
+                        //个微用户信息采集需要更新记录表状态
+                        FsUserInformationCollectionPersonalLog collectionPersonalLog=infoCollectionPersonalLogMapper.selectLatestByCollectionId(collection.getId());
+                        if (collectionPersonalLog!=null){
+                            collectionPersonalLog.setPackageOrderCode(orderSn);
+                            collectionPersonalLog.setPersonalCollectStatus(PostPayPrescStatusEnum.ORDER_IS_CREATED.getCode());
+                            infoCollectionPersonalLogMapper.updateFsUserInformationCollectionPersonalLog(collectionPersonalLog);
+                        }
+
                     }
                     userInformationCollectionMapper.updateFsUserInformationCollection(collectionUser);
 

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -52,9 +52,11 @@ import com.fs.his.vo.*;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsStorePaymentScrm;
 import com.fs.hisStore.domain.FsUserInformationCollection;
+import com.fs.hisStore.domain.FsUserInformationCollectionPersonalLog;
 import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
 import com.fs.hisStore.mapper.FsStorePaymentScrmMapper;
 import com.fs.hisStore.mapper.FsUserInformationCollectionMapper;
+import com.fs.hisStore.mapper.FsUserInformationCollectionPersonalLogMapper;
 import com.fs.hisStore.service.IFsStoreOrderLogsScrmService;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
 import com.fs.hisStore.service.IFsStorePaymentScrmService;
@@ -311,6 +313,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     @Autowired
     private FsUserInformationCollectionMapper userInformationCollectionMapper;
 
+    @Autowired
+    private FsUserInformationCollectionPersonalLogMapper infoCollectionPersonalLogMapper;
+
     @Autowired
     private DoctorMsgMapper doctorMsgMapper;
 
@@ -1218,6 +1223,13 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                     willUpdate.setId(collection.getId());
                     willUpdate.setPersonalCollectStatus(PostPayPrescStatusEnum.PAID_BY_USER.getCode());//用户已付款状态
                     userInformationCollectionMapper.updateFsUserInformationCollection(willUpdate);
+
+                    //个微用户信息采集需要更新记录表状态
+                    FsUserInformationCollectionPersonalLog collectionPersonalLog=infoCollectionPersonalLogMapper.selectLatestByCollectionId(collection.getId());
+                    if (collectionPersonalLog!=null){
+                        collectionPersonalLog.setPersonalCollectStatus(PostPayPrescStatusEnum.PAID_BY_USER.getCode());
+                        infoCollectionPersonalLogMapper.updateFsUserInformationCollectionPersonalLog(collectionPersonalLog);
+                    }
                 }
             }
             //插入生成订单档期日志

fs-service/src/main/java/com/fs/hisStore/domain/FsUserInformationCollection.java

@@ -127,4 +127,9 @@ public class FsUserInformationCollection extends BaseEntity{
      * 个微信息采集状态
      * */
     private Integer personalCollectStatus;
+
+    /**
+     * 处方id
+     * */
+    private Long prescribeId;
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsUserInformationCollectionPersonalLog.java

@@ -37,6 +37,10 @@ public class FsUserInformationCollectionPersonalLog implements Serializable
     @Excel(name = "用户id")
     private Long userId;
 
+    /** 用户id */
+    @Excel(name = "用户名称")
+    private Long userName;
+
     /** 医生id */
     @Excel(name = "医生id")
     private Long doctorId;
@@ -45,6 +49,10 @@ public class FsUserInformationCollectionPersonalLog implements Serializable
     @Excel(name = "销售id")
     private Long companyUserId;
 
+    /** 操作人id */
+    @Excel(name = "操作人id")
+    private Long operatorId;
+
     /** 套餐包id */
     @Excel(name = "套餐包id")
     private Long packageId;
@@ -83,6 +91,11 @@ public class FsUserInformationCollectionPersonalLog implements Serializable
     @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
+    /** 更新时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
     /** 备注 */
     @Excel(name = "备注")
     private String remark;

fs-service/src/main/java/com/fs/hisStore/mapper/FsUserInformationCollectionPersonalLogMapper.java

@@ -86,5 +86,5 @@ public interface FsUserInformationCollectionPersonalLogMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteFsUserInformationCollectionPersonalLogByIds(Long[] ids);
+    public int deleteFsUserInformationCollectionPersonalLogByIds(@Param("list") Long[] ids);
 }

fs-service/src/main/java/com/fs/hisStore/param/bindCollectionPackageParam.java

@@ -6,6 +6,7 @@ import java.math.BigDecimal;
 
 @Data
 public class bindCollectionPackageParam {
+
     //信息采集主键id
     private Long id;
 

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

@@ -208,5 +208,5 @@ public interface IFsUserInformationCollectionService extends IService<FsUserInfo
      * @param collectionId 信息采集id
      * @return 结果
      */
-    int resetCIDCollection(Long collectionId);
+    int resetCIDCollection(Long collectionId,Long operatorId,String nickName);
 }

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

@@ -394,7 +394,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         }
         if (!Objects.equals(collection.getUserId(), param.getUserId())) {
             log.error("当前用户userId:{},信息采集表userId:{}", param.getUserId(), collection.getUserId());
-            return R.error("用户信息不匹配,无法确认");
+            return R.error("用户信息与绑定用户不匹配,无法确认");
         }
 
         collection.setPersonalCollectStatus(PostPayPrescStatusEnum.PENDING_DOCTOR.getCode());
@@ -403,10 +403,14 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             FsPrescribe fsPrescribe = transformCollectionParamToFsPrescribe(param, collection);
             //新增fs_prescribe处方信息
             int addPrescribeResult = fsPrescribeMapper.insertFsPrescribe(fsPrescribe);
+
+            collection.setPrescribeId(fsPrescribe.getPrescribeId());//TODO 向fs_user_information_collection表写入处方id 后续要优化改成更新一次collection
+            fsUserInformationCollectionMapper.updateFsUserInformationCollection(collection);
             FsUserInformationCollectionPersonalLog informationCollectionPersonalLog=new FsUserInformationCollectionPersonalLog();
             BeanUtils.copyProperties(collection, informationCollectionPersonalLog);
             informationCollectionPersonalLog.setCollectionId(collection.getId());
             informationCollectionPersonalLog.setPrescribeId(fsPrescribe.getPrescribeId());
+            informationCollectionPersonalLog.setPackageOrderCode("");//这里还没有产生订单号，避免采集表原有的脏数据
             //新增 个微用户信息采集记录
             infoCollectionPersonalLogMapper.insertFsUserInformationCollectionPersonalLog(informationCollectionPersonalLog);
             //存入医生确认统计时间数据
@@ -1747,8 +1751,8 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
             throw new CustomException("未查询到处方信息");
         }
         //如果查询到了处方信息，则判断该处方是否已被信息采集使用过
-        int count = infoCollectionPersonalLogMapper.countByCollectionIdAndPrescribeId(param.getId(), fsPrescribe.getPrescribeId());
-        if (count == 0) {
+        FsUserInformationCollectionPersonalLog infoCollectionPersonalLog = infoCollectionPersonalLogMapper.selectByCollectionIdAndPrescribeId(param.getId(), fsPrescribe.getPrescribeId());
+        if (infoCollectionPersonalLog == null) {
             log.error("当前信息采集未找到匹配处方记录,信息采集id:{},处方id:{}", param.getId(), fsPrescribe.getPrescribeId());
             throw new CustomException("流程异常,需要医生开具最新处方才能绑定套餐包！");
         }
@@ -1760,6 +1764,9 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         if (fsPackage == null){
             throw new CustomException("套餐包不存在或已下架");
         }
+        infoCollectionPersonalLog.setPackageId(fsPackage.getPackageId());
+        infoCollectionPersonalLog.setPackageName(fsPackage.getPackageName());//套餐包名称
+        infoCollectionPersonalLogMapper.updateFsUserInformationCollectionPersonalLog(infoCollectionPersonalLog);
         //套餐包必须是OTC、中药、处方药类型
         if (fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2 || fsPackage.getProductType() == 3) {
             informationCollection.setIsPackage(1);//套餐包标识
@@ -1789,7 +1796,7 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
 
     @Transactional
     @Override
-    public int resetCIDCollection(Long collectionId) {
+    public int resetCIDCollection(Long collectionId,Long operatorId,String nickName) {
         FsUserInformationCollection collection = fsUserInformationCollectionMapper.selectFsUserInformationCollectionById(collectionId);
         if (collection == null) {
             throw new CustomException("信息采集信息错误，重置失败");
@@ -1809,6 +1816,13 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
                 }
             }
         }
+        //记录操作人
+        FsUserInformationCollectionPersonalLog collectionPersonalLog = infoCollectionPersonalLogMapper.selectLatestByCollectionId(collectionId);
+        if (collectionPersonalLog != null){
+            collectionPersonalLog.setOperatorId(operatorId);
+            collectionPersonalLog.setRemark(nickName+":执行重置操作");
+        }
+        infoCollectionPersonalLogMapper.updateFsUserInformationCollectionPersonalLog(collectionPersonalLog);
         return fsUserInformationCollectionMapper.resetCIDCollection(collectionId);
     }
 

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

@@ -95,6 +95,11 @@ public class FsUserInformationCollectionOverviewVo {
      * */
     private Integer personalCollectStatus;
 
+    /**
+     * 处方id
+     * */
+    private Long prescribeId;
+
     // 原始的List字段，用于内部处理
     private List<String> prescribeImgUrlList;
 

fs-service/src/main/resources/mapper/hisStore/FsUserInformationCollectionMapper.xml

@@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="completeStatus"    column="complete_status"    />
         <result property="qwTag"    column="qw_tag"    />
         <result property="personalCollectStatus"    column="personal_collect_status"    />
+        <result property="prescribeId"    column="prescribe_id"    />
     </resultMap>
 
     <!-- 用户信息采集视图对象类的ResultMap -->
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="personalCollectStatus" column="personal_collect_status"/>
         <result property="packageName" column="package_name"/>
         <result property="packageOrderCode" column="package_order_code"/>
+        <result property="prescribeId" column="prescribe_id"/>
     </resultMap>
 
     <sql id="selectFsUserInformationCollectionVo">
@@ -67,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
              , doctor_confirm, create_time, update_time,doctor_id,company_user_id
              ,package_id,pay_type,amount,is_package,user_confirm2,package_order_code
              ,status,user_advice,doctor_advice,doctor_confirm_time,sex,user_name,user_phone_four
-             ,allergy,remark,age,info_source,third_party_user_id,fill_flag,complete_status,qw_tag,personal_collect_status  from fs_user_information_collection
+             ,allergy,remark,age,info_source,third_party_user_id,fill_flag,complete_status,qw_tag,personal_collect_status,prescribe_id  from fs_user_information_collection
     </sql>
 
     <select id="selectFsUserInformationCollectionList" parameterType="FsUserInformationCollection" resultMap="FsUserInformationCollectionResult">
@@ -85,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completeStatus != null "> and complete_status = #{completeStatus}</if>
             <if test="qwTag != null "> and qw_tag = #{qwTag}</if>
             <if test="personalCollectStatus != null "> and personal_collect_status = #{personalCollectStatus}</if>
+            <if test="prescribeId != null "> and prescribe_id = #{prescribeId}</if>
         </where>
     </select>
     
@@ -142,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         infocollect.qw_tag,
         infocollect.personal_collect_status,
         infocollect.package_order_code,
+        infocollect.prescribe_id,
         package.package_name,
         cu.nick_name,
         fd.doctor_name
@@ -201,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         infocollect.remark,
         infocollect.qw_tag,
         infocollect.personal_collect_status,
+        infocollect.prescribe_id,
         cu.nick_name,
         fd.doctor_name
         FROM fs_user_information_collection infocollect
@@ -237,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         infocollect.allergy,
         infocollect.remark,
         infocollect.personal_collect_status,
+        infocollect.prescribe_id,
         cu.nick_name,
         fd.doctor_name
         FROM fs_user_information_collection infocollect
@@ -291,6 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completeStatus != null">complete_status,</if>
             <if test="qwTag != null">qw_tag,</if>
             <if test="personalCollectStatus != null">personal_collect_status,</if>
+            <if test="prescribeId != null">prescribe_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="questionId != null">#{questionId},</if>
@@ -324,6 +331,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completeStatus != null">#{completeStatus},</if>
             <if test="qwTag != null">#{qwTag},</if>
             <if test="personalCollectStatus != null">#{personalCollectStatus},</if>
+            <if test="prescribeId != null">#{prescribeId},</if>
         </trim>
     </insert>
 
@@ -361,6 +369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="completeStatus != null">complete_status = #{completeStatus},</if>
             <if test="qwTag != null">qw_tag = #{qwTag},</if>
             <if test="personalCollectStatus != null">personal_collect_status = #{personalCollectStatus},</if>
+            <if test="prescribeId != null">prescribe_id = #{prescribeId},</if>
         </trim>
         where id = #{id}
     </update>
@@ -401,9 +410,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pay_type = NULL,
             is_package = 0,
             package_order_code = NULL,
+            prescribe_id = NULL,
             status = 1,
             personal_collect_status = 1,
-            status = 1
+            fill_flag = 0
         where id = #{collectionId}
     </update>
 </mapper>

fs-service/src/main/resources/mapper/hisStore/FsUserInformationCollectionPersonalLogMapper.xml

@@ -10,6 +10,7 @@
         <result property="prescribeId"           column="prescribe_id"           />
         <result property="questionId"            column="question_id"            />
         <result property="userId"                column="user_id"                />
+        <result property="userName"                column="user_name"                />
         <result property="doctorId"              column="doctor_id"              />
         <result property="companyUserId"         column="company_user_id"        />
         <result property="packageId"             column="package_id"             />
@@ -21,14 +22,16 @@
         <result property="personalCollectStatus" column="personal_collect_status"/>
         <result property="logType"               column="log_type"               />
         <result property="createTime"            column="create_time"            />
+        <result property="updateTime"            column="update_time"            />
+        <result property="operatorId"            column="operator_id"            />
         <result property="remark"                column="remark"                 />
     </resultMap>
 
     <sql id="selectFsUserInformationCollectionPersonalLogVo">
-        select id, collection_id, prescribe_id, question_id, user_id, doctor_id,
+        select id, collection_id, prescribe_id, question_id, user_id,user_name, doctor_id,
                company_user_id, package_id, package_name, pay_type, amount,
                package_order_code, doctor_confirm_time, personal_collect_status,
-               log_type, create_time, remark
+               log_type, create_time, update_time, operator_id, remark
         from fs_user_information_collection_personal_log
     </sql>
 
@@ -39,6 +42,7 @@
             <if test="prescribeId != null"> and prescribe_id = #{prescribeId}</if>
             <if test="questionId != null"> and question_id = #{questionId}</if>
             <if test="userId != null"> and user_id = #{userId}</if>
+            <if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
             <if test="doctorId != null"> and doctor_id = #{doctorId}</if>
             <if test="companyUserId != null"> and company_user_id = #{companyUserId}</if>
             <if test="packageId != null"> and package_id = #{packageId}</if>
@@ -49,7 +53,6 @@
             <if test="logType != null"> and log_type = #{logType}</if>
             <if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="doctorConfirmTime != null"> and doctor_confirm_time >= #{doctorConfirmTime}</if>
-            <!-- 如果需要时间段查询，可自行扩展 -->
         </where>
         order by create_time desc
     </select>
@@ -72,7 +75,7 @@
     <select id="selectLatestByCollectionId" parameterType="Long" resultMap="FsUserInformationCollectionPersonalLogResult">
         <include refid="selectFsUserInformationCollectionPersonalLogVo"/>
         WHERE collection_id = #{collectionId}
-        ORDER BY create_time DESC
+        ORDER BY create_time DESC, id DESC
         LIMIT 1
     </select>
 
@@ -88,6 +91,7 @@
             <if test="prescribeId != null">prescribe_id,</if>
             <if test="questionId != null">question_id,</if>
             <if test="userId != null">user_id,</if>
+            <if test="userName != null">user_name,</if>
             <if test="doctorId != null">doctor_id,</if>
             <if test="companyUserId != null">company_user_id,</if>
             <if test="packageId != null">package_id,</if>
@@ -98,7 +102,12 @@
             <if test="doctorConfirmTime != null">doctor_confirm_time,</if>
             <if test="personalCollectStatus != null">personal_collect_status,</if>
             <if test="logType != null">log_type,</if>
-            <if test="createTime != null">create_time,</if>
+            <choose>
+                <when test="createTime != null">create_time,</when>
+                <otherwise>create_time,</otherwise>
+            </choose>
+            <if test="updateTime != null">update_time,</if>
+            <if test="operatorId != null">operator_id,</if>
             <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -106,6 +115,7 @@
             <if test="prescribeId != null">#{prescribeId},</if>
             <if test="questionId != null">#{questionId},</if>
             <if test="userId != null">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
             <if test="doctorId != null">#{doctorId},</if>
             <if test="companyUserId != null">#{companyUserId},</if>
             <if test="packageId != null">#{packageId},</if>
@@ -116,7 +126,12 @@
             <if test="doctorConfirmTime != null">#{doctorConfirmTime},</if>
             <if test="personalCollectStatus != null">#{personalCollectStatus},</if>
             <if test="logType != null">#{logType},</if>
-            <if test="createTime != null">#{createTime},</if>
+            <choose>
+                <when test="createTime != null">#{createTime},</when>
+                <otherwise>NOW(),</otherwise>
+            </choose>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="operatorId != null">#{operatorId},</if>
             <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
@@ -128,6 +143,7 @@
             <if test="prescribeId != null">prescribe_id = #{prescribeId},</if>
             <if test="questionId != null">question_id = #{questionId},</if>
             <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
             <if test="doctorId != null">doctor_id = #{doctorId},</if>
             <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
             <if test="packageId != null">package_id = #{packageId},</if>
@@ -139,6 +155,8 @@
             <if test="personalCollectStatus != null">personal_collect_status = #{personalCollectStatus},</if>
             <if test="logType != null">log_type = #{logType},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            update_time = COALESCE(#{updateTime}, NOW()),
+            <if test="operatorId != null">operator_id = #{operatorId},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
@@ -148,9 +166,9 @@
         delete from fs_user_information_collection_personal_log where id = #{id}
     </delete>
 
-    <delete id="deleteFsUserInformationCollectionPersonalLogByIds" parameterType="String">
+    <delete id="deleteFsUserInformationCollectionPersonalLogByIds" parameterType="java.util.List">
         delete from fs_user_information_collection_personal_log where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
+        <foreach item="id" collection="list" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>

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

@@ -1,6 +1,7 @@
 package com.fs.app.controller;
 
 import com.fs.app.annotation.Login;
+import com.fs.app.annotation.NoRepeatSubmit;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
@@ -70,9 +71,10 @@ public class UserInfoCollectionController extends AppBaseController {
         return userInformationCollectionService.userConfirm(param);
     }
 
-    @ApiOperation("个微版信息采集用户确认并生成处方")
+    @ApiOperation("个微版信息采集用户确认并生成待开处方")
+    @NoRepeatSubmit(expire = 2, message = "请勿重复点击，正在处理中...")
     @PostMapping("/confirmGeneratePrescription")
-    public R confirm2(@RequestBody CollectConfirmGeneratePrescribeParam param) {
+    public R confirmGeneratePrescription(@RequestBody CollectConfirmGeneratePrescribeParam param) {
         param.setUserId(Long.parseLong(getUserId()));
         return userInformationCollectionService.generateFormalPrescription(param);
     }