smartor代码库
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
陈昶聿
2 天以前 88d4cd31fa5b197a91ed081ba1df292420af2d05 
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml


@@ -73,6 +73,7 @@


        <result property="leavehospitaldistrictname" column="leavehospitaldistrictname"/>


        <result property="excep" column="excep"/>


        <result property="remark" column="remark"/>


        <result property="doctorOpinion" column="doctor_opinion"/>


        <result property="suggest" column="suggest"/>


        <result property="sendstate" column="sendstate"/>


        <result property="inhospid" column="inhospid"/>


@@ -183,6 +184,7 @@


               long_send_time,


               openid,


               remark,


               doctor_opinion,


               service_type,


               libtemplateid,


               libtemplatename,


@@ -253,7 +255,7 @@


        from service_subtask


    </sql>




    <!-- 完成时状态(finish_state)计算：仅当本次更新把 sendstate 置为 6（随访完成）时使用。


    <!-- 超时完成、延期完成逻辑 完成时状态(finish_state)计算：仅当本次更新把 sendstate 置为 6（随访完成）时使用。


         基准截止时间 base = endtime + send_day(缺省1) + (Σ service_subtask_preachform.compensate_time + 1) 天，


         与 RyTask/RedisMqReceiver 的 isSubtaskDeadline 口径保持一致；


         delay = COALESCE(service_task.delay_finish_days, 0)；


@@ -594,6 +596,7 @@


            AND visit_count > 1


        </if>


        <if test="remark != null">and remark = #{remark}</if>


        <if test="doctorOpinion != null and doctorOpinion != ''">and doctor_opinion like concat('%', #{doctorOpinion}, '%')</if>


        <if test="suggest != null">and suggest = #{suggest}</if>


        <if test="createBy != null">and create_by = #{createBy}</if>


        <if test="taskGuid != null">and task_guid = #{taskGuid}</if>


@@ -1053,6 +1056,7 @@


            <if test="nurseName != null ">nurse_name,</if>


            <if test="nurseId != null ">nurse_id,</if>


            <if test="remark != null ">remark,</if>


            <if test="doctorOpinion != null ">doctor_opinion,</if>


            <if test="suggest != null ">suggest,</if>


            <if test="sendstate != null ">sendstate,</if>


            <if test="inhospid != null ">inhospid,</if>


@@ -1152,6 +1156,7 @@


            <if test="nurseName != null ">#{nurseName},</if>


            <if test="nurseId != null ">#{nurseId},</if>


            <if test="remark != null ">#{remark},</if>


            <if test="doctorOpinion != null ">#{doctorOpinion},</if>


            <if test="suggest != null ">#{suggest},</if>


            <if test="sendstate != null ">#{sendstate},</if>


            <if test="inhospid != null ">#{inhospid},</if>


@@ -1266,6 +1271,7 @@


            <if test="nurseName != null ">nurse_name=#{nurseName},</if>


            <if test="nurseId != null ">nurse_id=#{nurseId},</if>


            <if test="remark != null ">remark=#{remark},</if>


            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>


            <if test="suggest != null ">suggest=#{suggest},</if>


            <if test="inhospid != null ">inhospid=#{inhospid},</if>


            <if test="patfrom != null ">patfrom=#{patfrom},</if>


@@ -1372,6 +1378,7 @@


            <if test="nurseName != null ">nurse_name=#{nurseName},</if>


            <if test="nurseId != null ">nurse_id=#{nurseId},</if>


            <if test="remark != null ">remark=#{remark},</if>


            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>


            <if test="suggest != null ">suggest=#{suggest},</if>


            <if test="inhospid != null ">inhospid=#{inhospid},</if>


            <if test="patfrom != null ">patfrom=#{patfrom},</if>


@@ -1477,6 +1484,7 @@


            <if test="nurseName != null ">nurse_name=#{nurseName},</if>


            <if test="nurseId != null ">nurse_id=#{nurseId},</if>


            <if test="remark != null ">remark=#{remark},</if>


            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>


            <if test="suggest != null ">suggest=#{suggest},</if>


            <if test="inhospid != null ">inhospid=#{inhospid},</if>


            <if test="patfrom != null ">patfrom=#{patfrom},</if>


@@ -1589,6 +1597,7 @@


            <if test="nurseName != null ">nurse_name=#{nurseName},</if>


            <if test="nurseId != null ">nurse_id=#{nurseId},</if>


            <if test="remark != null ">remark=#{remark},</if>


            <if test="doctorOpinion != null ">doctor_opinion=#{doctorOpinion},</if>


            <if test="suggest != null ">suggest=#{suggest},</if>


            <if test="inhospid != null ">inhospid=#{inhospid},</if>


            <if test="patfrom != null ">patfrom=#{patfrom},</if>


@@ -1672,6 +1681,7 @@


        continue_count,


        continue_time_next,


        task_situation,


        finish_state,


        is_manually_called


        from service_subtask


        where 1=1


@@ -1960,6 +1970,8 @@


        continue_time_next,


        task_situation,


        remark,


        doctor_opinion,


        finish_state,


        is_manually_called


        from service_subtask


        where 1=1


@@ -2041,6 +2053,9 @@


        </if>


        <if test="taskSituation != null">


            AND task_situation = #{taskSituation}


        </if>


        <if test="finishState != null">


            AND finish_state = #{finishState}


        </if>


        <if test="drcode != null and drcode != ''">


            AND drcode = #{drcode}


@@ -2464,6 +2479,7 @@


               nurse_id,


               nurse_name,


               remark,


               doctor_opinion,


               inhospid,


               patfrom,


               task_guid,


@@ -3357,7 +3373,8 @@


        continue_count,


        continue_time_next,


        task_situation,


        remark


        remark,


        doctor_opinion


        from service_subtask


        where 1=1


        and del_flag = 0