代码提交

liusheng

6 天以前 52fd89a3c439fdbf240a72487f97aad92725e9c5

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml

@@ -79,6 +79,9 @@
        <result property="visitCount" column="visit_count"/>
        <result property="isVisitAgain" column="is_visit_again"/>
        <result property="upid" column="upid"/>
        <result property="visitTime" column="visit_time"/>
        <result property="visitDeptName" column="visit_dept_name"/>
        <result property="visitDeptCode" column="visit_dept_code"/>
    </resultMap>

    <resultMap type="com.smartor.domain.ServiceSubtaskCount" id="ServiceSubtaskResult2">
@@ -94,6 +97,9 @@
               task_guid,
               patfrom,
               upid,
               visit_dept_name,
               visit_dept_code,
               visit_time,
               inhospid,
               visit_count,
               is_visit_again,
@@ -287,12 +293,21 @@
            <if test="excep != null ">and excep = #{excep}</if>
            <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
            <if test="score != null">and score = #{score}</if>
            <if test="visitCount != null">and visit_count = #{visitCount}</if>
            <!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
            <if test="visitCount != null and visitCount == 1">
                AND visit_count = 1
            </if>
            <if test="visitCount != null and visitCount > 1">
                AND visit_count > 1
            </if>
            <if test="remark != null">and remark = #{remark}</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>
            <if test="isVisitAgain != null">and is_visit_again = #{isVisitAgain}</if>
            <if test="visitTime != null">and visit_time = #{visitTime}</if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
        </where>
        <if test="sort != null  and sort==0">order by endtime asc</if>
        <if test="sort != null  and sort==1">order by endtime desc</if>
@@ -319,6 +334,62 @@
            <if test="upid != null ">and upid = #{upid}</if>
            <if test="visitCount != null ">and visit_count = #{visitCount}</if>
            <if test="isVisitAgain != null ">and is_visit_again = #{isVisitAgain}</if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
        </where>

    </select>


    <select id="selectServiceSubtaskListAgain" parameterType="com.smartor.domain.ServiceSubtaskVO"
            resultMap="ServiceSubtaskResult">
        <include refid="selectServiceSubtaskVo"/>
        <where>
            del_flag=0
            and upid is not null
            and visit_count > 1
            <if test="createStartTime != null  and createEndTime != null">and create_time BETWEEN #{createStartTime} AND
                #{createEndTime}
            </if>
            <if test="senddate != null ">and senddate = #{senddate}</if>
            <if test="senduuid != null  and senduuid != ''">and senduuid = #{senduuid}</if>
            <if test="result != null  and result != ''">and result = #{result}</if>
            <if test="finishtime != null ">and finishtime = #{finishtime}</if>
            <if test="recordid != null ">and recordid = #{recordid}</if>
            <if test="exrecallcount != null ">and exrecallcount = #{exrecallcount}</if>
            <if test="pulltime != null ">and pulltime = #{pulltime}</if>
            <if test="deptcode != null  and deptcode != ''">and deptcode = #{deptcode}</if>
            <if test="deptname != null  and deptname != ''">and deptname = #{deptname}</if>
            <if test="labelstatus != null ">and labelstatus = #{labelstatus}</if>
            <if test="isupload != null ">and isupload = #{isupload}</if>
            <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
            <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
            <if test="pid != null ">and pid = #{pid}</if>
            <if test="preachform != null ">and preachform = #{preachform}</if>
            <if test="guid != null  and guid != ''">and guid = #{guid}</if>
            <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
            <if test="bedNo != null">and bed_no = #{bedNo}</if>
            <if test="sendType != null  and sendType != ''">and send_type = #{sendType}</if>
            <if test="operator != null  and operator != ''">and operator = #{operator}</if>
            <if test="operatorNo != null  and operatorNo != ''">and operator_no = #{operatorNo}</if>
            <if test="wechat != null  and wechat != ''">and wechat = #{wechat}</if>
            <if test="hospType != null  and hospType != ''">and hosp_type = #{hospType}</if>
            <if test="libtemplateid != null ">and libtemplateid = #{libtemplateid}</if>
            <if test="libtemplatename != null ">and libtemplatename = #{libtemplatename}</if>
            <if test="openid != null ">and openid = #{openid}</if>
            <if test="longSendTime != null ">and long_send_time = #{longSendTime}</if>
            <if test="sendstate != null ">and sendstate = #{sendstate}</if>
            <if test="drname != null  and drname != ''">and drname like concat('%', #{drname}, '%')</if>
            <if test="taskName != null  and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if>
            <if test="drcode != null and drcode != ''">and (drcode = #{drcode}</if>
            <if test="nurseId != null  and nurseId != ''">or nurse_id = #{nurseId})</if>
            <if test="starttime != null ">and starttime = #{starttime}</if>
            <if test="endtime != null ">and endtime = #{endtime}</if>
            <if test="excep != null ">and excep = #{excep}</if>
            <if test="nurseName != null ">and nurse_name = #{nurseName}</if>
            <if test="visitTime != null ">and visit_time = #{visitTime}</if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">and visit_dept_name = #{visitDeptName}</if>
        </where>

    </select>
@@ -416,6 +487,9 @@
            <if test="visitCount != null ">visit_count,</if>
            <if test="isVisitAgain != null ">is_visit_again,</if>
            <if test="upid != null ">upid,</if>
            <if test="visit_time != null ">visitTime,</if>
            <if test="visitDeptCode != null">visit_dept_code,</if>
            <if test="visitDeptName != null">visit_dept_name,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="sendname != null">#{sendname},</if>
@@ -494,6 +568,9 @@
            <if test="visitCount != null ">#{visitCount},</if>
            <if test="isVisitAgain != null ">#{isVisitAgain},</if>
            <if test="upid != null ">#{upid},</if>
            <if test="visitTime != null ">#{visitTime},</if>
            <if test="visitDeptCode != null">#{visitDeptCode},</if>
            <if test="visitDeptName != null">#{visitDeptName},</if>
        </trim>
    </insert>

@@ -577,6 +654,9 @@
            <if test="visitCount != null ">visit_count=#{visitCount},</if>
            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        where id = #{id}
    </update>
@@ -661,6 +741,9 @@
            <if test="patguid != null ">patguid=#{patguid},</if>
            <if test="isVisitAgain != null ">is_visit_again=#{isVisitAgain},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        <where>
            <if test="patid != null ">and patid = #{patid}</if>
@@ -747,6 +830,9 @@
            <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
            <if test="patguid != null ">patguid=#{patguid},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        where patid = #{patid} and taskid = #{taskid}
    </update>
@@ -830,6 +916,9 @@
            <if test="taskGuid != null ">task_guid=#{taskGuid},</if>
            <if test="patguid != null ">patguid=#{patguid},</if>
            <if test="upid != null ">upid=#{upid},</if>
            <if test="visitTime != null ">visit_time=#{visitTime},</if>
            <if test="visitDeptCode != null">visit_dept_code = #{visitDeptCode},</if>
            <if test="visitDeptName != null">visit_dept_name = #{visitDeptName},</if>
        </trim>
        where task_guid = #{taskGuid} and task_name = #{taskName}
    </update>
@@ -874,6 +963,8 @@
                AND endtime > #{startTime}
                AND endtime &lt;= #{endTime}
            </if>
            <if test="visitDeptCode != null">and visit_dept_code = #{visitDeptCode}</if>
            <if test="visitDeptName != null">abd visit_dept_name = #{visitDeptName}</if>
        </where>
    </select>

@@ -892,6 +983,7 @@
               senderdetail,
               type,
               taskid,
               visit_time,
               templateid,
               templatename,
               senddate,
@@ -948,6 +1040,8 @@
               task_guid,
               leavediagname,
               patguid,
               visitDeptCode,
               visitDeptName,
               leaveicd10code
        FROM service_subtask,
             JSON_TABLE(send_time_slot, '$[*]' COLUMNS (