Merge remote-tracking branch 'origin/master'

liusheng

6 天以前 fd12c3a4d5c0a247c89ab59faba189075a302ffd

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

@@ -80,6 +80,8 @@
        <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">
@@ -95,6 +97,8 @@
               task_guid,
               patfrom,
               upid,
               visit_dept_name,
               visit_dept_code,
               visit_time,
               inhospid,
               visit_count,
@@ -165,7 +169,8 @@
               leavehospitaldistrictcode,
               leavehospitaldistrictname,
               leavediagname,
               leaveicd10code
               leaveicd10code,
               visit_type
        from service_subtask
    </sql>

@@ -289,11 +294,11 @@
            <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="visit_count_flag != null and visit_count_flag == 0">
            <!--            <if test="visitCount != null">and visit_count = #{visitCount}</if>-->
            <if test="visitCount != null and visitCount == 1">
                AND visit_count = 1
            </if>
            <if test="visit_count_flag != null and visit_count_flag == 1">
            <if test="visitCount != null and visitCount > 1">
                AND visit_count > 1
            </if>
            <if test="remark != null">and remark = #{remark}</if>
@@ -302,6 +307,16 @@
            <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>-->
            <if test="visitCount != null and visitCount > 1 and visitDeptCodes != null and visitDeptCodes.size() > 0">
                AND visit_dept_code IN
                <foreach collection="visitDeptCodes" item="visitDeptCodes" open="("
                         separator=","
                         close=")">
                    #{visitDeptCodes}
                </foreach>
            </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>
@@ -328,6 +343,8 @@
            <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>
@@ -380,6 +397,8 @@
            <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>
@@ -477,7 +496,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="visitTime != null ">visit_Time,</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>
@@ -557,6 +578,8 @@
            <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>

@@ -641,6 +664,8 @@
            <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>
@@ -726,6 +751,8 @@
            <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>
@@ -813,6 +840,8 @@
            <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>
@@ -897,6 +926,8 @@
            <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>
@@ -930,6 +961,13 @@
                    #{leavehospitaldistrictcode}
                </foreach>
            </if>
            <if test="deptcodes != null and deptcodes.size() > 0">
                AND leavehospitaldistrictcode IN
                <foreach collection="deptcodes" item="deptcode" open="(" separator=","
                         close=")">
                    #{leavehospitaldistrictcode}
                </foreach>
            </if>
            <if test="serviceType != null and serviceType.size() > 0">
                AND service_type IN
                <foreach collection="serviceType" item="serviceType" open="(" separator=","
@@ -941,6 +979,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>

@@ -1016,6 +1056,8 @@
               task_guid,
               leavediagname,
               patguid,
               visitDeptCode,
               visitDeptName,
               leaveicd10code
        FROM service_subtask,
             JSON_TABLE(send_time_slot, '$[*]' COLUMNS (