增加医生端处理类型字段

fs-service/src/main/java/com/fs/his/domain/FsSopDoctorTask.java

@@ -40,6 +40,9 @@ public class FsSopDoctorTask extends BaseEntity{
     @Excel(name = "订单号")
     private String orderCode;
 
+    /** 处理类型 1:签收，2:选择下次提醒时间 */
+    private Integer handleType;
+
     /** 备用id */
     @Excel(name = "备用id")
     private Long standbyId;

fs-service/src/main/resources/mapper/his/FsSopDoctorTaskMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderCode"    column="order_code"    />
         <result property="type"    column="type"    />
         <result property="qwExternalContactId"    column="qw_external_contact_id"    />
+        <result property="handleType"    column="handle_type"    />
     </resultMap>
 
     <resultMap type="com.fs.his.vo.SopDoctorTaskVo" id="SopDoctorTaskVoResult">
@@ -33,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"   column="create_time" />
         <result property="updateTime"   column="update_time" />
         <result property="qwExternalContactId"    column="qw_external_contact_id"    />
+        <result property="handleType"    column="handle_type"    />
 
         <!-- 关联表字段 -->
         <result property="name"     column="name" />          <!-- qwec.name -->
@@ -44,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsSopDoctorTaskVo">
-        select id, company_user_id,doctor_id, user_id, status, create_time, update_time, remark, package_id, order_code, type,qw_external_contact_id from fs_sop_doctor_task
+        select id, company_user_id,doctor_id, user_id, status, create_time, update_time, remark, package_id, order_code, type,qw_external_contact_id,handle_type from fs_sop_doctor_task
     </sql>
 
     <select id="selectFsSopDoctorTaskVoList" parameterType="com.fs.his.dto.SopDoctorTaskDto" resultMap="SopDoctorTaskVoResult">
@@ -63,7 +65,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sdt.remark,
         sdt.type,
         fd.doctor_name,
-        sdt.qw_external_contact_id
+        sdt.qw_external_contact_id,
+        sdt.handle_type
         FROM
         fs_sop_doctor_task sdt
         LEFT JOIN company_user cp ON sdt.company_user_id = cp.user_id
@@ -78,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderCode != null "> and sdt.order_code = #{orderCode}</if>
             <if test="companyUserId != null "> and sdt.company_user_id = #{companyUserId}</if>
             <if test="status != null "> and sdt.status = #{status}</if>
+            <if test="handleType != null "> and sdt.handle_type = #{handleType}</if>
             <if test="type != null "> and sdt.type = #{type}</if>
             <if test="qwUserId != null "> and qwec.qw_user_id = #{qwUserId}</if>
             <if test="name != null "> and qwec.name like concat('%', #{name}, '%')</if>
@@ -108,7 +112,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sdt.update_time,
             sdt.remark,
             sdt.type,
-            sdt.qw_external_contact_id
+            sdt.qw_external_contact_id,
+            sdt.handle_type
         FROM
             fs_sop_doctor_task sdt
                 LEFT JOIN company_user cp ON sdt.company_user_id = cp.user_id
@@ -130,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageId != null">package_id,</if>
             <if test="orderCode != null">order_code,</if>
             <if test="type != null">type,</if>
+            <if test="handleType != null">handle_type,</if>
             <if test="qwExternalContactId != null">qw_external_contact_id,</if>
             <if test="doctorMemberSalesId != null">doctor_member_sales_id,</if>
          </trim>
@@ -144,6 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageId != null">#{packageId},</if>
             <if test="orderCode != null">#{orderCode},</if>
             <if test="type != null">#{type},</if>
+            <if test="handleType != null">#{handleType},</if>
             <if test="qwExternalContactId != null">#{qwExternalContactId},</if>
             <if test="doctorMemberSalesId != null">#{doctorMemberSalesId},</if>
          </trim>
@@ -162,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageId != null">package_id = #{packageId},</if>
             <if test="orderCode != null">order_code = #{orderCode},</if>
             <if test="type != null">type = #{type},</if>
+            <if test="handleType != null">handle_type = #{handleType},</if>
             <if test="qwExternalContactId != null">qw_external_contact_id=#{qwExternalContactId},</if>
         </trim>
         where id = #{id}