Merge branch 'master' into master-任务组

陈昶聿

6 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

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

@@ -52,6 +52,7 @@
        <result property="inDeptcheckFlag" column="in_deptcheck_flag"/>
        <result property="wardcheckFlag" column="wardcheck_flag"/>
        <result property="diagcheckFlag" column="diagcheck_flag"/>
        <result property="scheduleCheckFlag" column="schedulecheck_flag"/>
        <result property="age" column="age"/>
        <result property="sex" column="sex"/>
        <result property="telcode" column="telcode"/>
@@ -103,6 +104,7 @@
               in_deptcheck_flag,
               in_wardcheck_flag,
               diagcheck_flag,
               schedulecheck_flag,
               inhospstate,
               patno,
               long_task_reason,
@@ -164,6 +166,7 @@
        b.in_deptcheck_flag,
        b.in_wardcheck_flag,
        b.diagcheck_flag,
        b.schedulecheck_flag,
        b.inhospstate,
        b.patno,
        b.inhospno,
@@ -253,12 +256,15 @@
        <if test="nurseId != null ">and b.nurse_id = #{nurseId}</if>
        <if test="nurseName != null and nurseName != ''">and b.nurse_name = #{nurseName}</if>
        <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
        <if test="scheduleCheckFlag != null ">and b.schedulecheck_flag = #{scheduleCheckFlag}</if>
        <if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
        <if test="inDeptcheckFlag != null ">and b.in_deptcheck_flag = #{inDeptcheckFlag}</if>
        <if test="inWardcheckFlag != null ">and b.in_wardcheck_flag = #{inWardcheckFlag}</if>
        <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
        <if test="cry != null and cry == 0 ">and b.endtime is null</if>
        <if test="cry != null and cry == 1 ">and b.inhospstate=1</if>
        <if test="cry != null and cry == 2 ">and b.inhospstate=2</if>
        <if test="cry != null and cry == 3 ">and b.inhospstate=3</if>
        <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if>
        <if test="campusid != null ">and b.campusid = #{campusid}</if>
        <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if>
@@ -310,6 +316,13 @@
                #{deptcode}
            </foreach>
        </if>
        <if test="icd10codeList != null and icd10codeList.size()>0">
            AND b.leaveicd10code IN
            <foreach collection="icd10codeList" item="icd10code" open="(" separator=","
                     close=")">
                #{icd10code}
            </foreach>
        </if>
        GROUP BY
        b.inhospid,
        a.age,
@@ -317,10 +330,16 @@
        a.telcode,
        a.id,
        a.sex
        <if test="cry==1">
        <if test="cry != null and cry==1">
            order by b.endtime desc
        </if>
        <if test="cry==0">
        <if test="cry != null and cry==2">
            order by b.endtime desc
        </if>
        <if test="cry != null and cry==3">
            order by b.endtime desc
        </if>
        <if test="cry != null and cry==0">
            order by b.starttime desc
        </if>
    </select>
@@ -342,6 +361,7 @@
        b.in_deptcheck_flag,
        b.in_wardcheck_flag,
        b.diagcheck_flag,
        b.schedulecheck_flag,
        b.inhospstate,
        b.patno,
        b.inhospno,
@@ -396,7 +416,7 @@
        <if test="orgid != null and orgid != ''">
            and orgid = #{orgid}
        </if>
        <if test="serialnum != null ">
        <if test="serialnum != null and serialnum != ''">
            and b.serialnum = #{serialnum}
        </if>
        order by b.inhospid desc
@@ -499,6 +519,7 @@
        <if test="campusid != null ">and b.campusid = #{campusid}</if>
        <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if>
        <if test="deptcheckFlag != null ">and b.deptcheck_flag = #{deptcheckFlag}</if>
        <if test="scheduleCheckFlag != null ">and b.schedulecheck_flag = #{scheduleCheckFlag}</if>
        <if test="wardcheckFlag != null ">and b.wardcheck_flag = #{wardcheckFlag}</if>
        <if test="inDeptcheckFlag != null ">and b.in_deptcheck_flag = #{inDeptcheckFlag}</if>
        <if test="inWardcheckFlag != null ">and b.in_wardcheck_flag = #{inWardcheckFlag}</if>
@@ -838,6 +859,7 @@
            <if test="patno != null">patno = #{patno},</if>
            <if test="inhospstate != null">inhospstate = #{inhospstate},</if>
            <if test="deptcheckFlag != null">deptcheck_flag = #{deptcheckFlag},</if>
            <if test="scheduleCheckFlag != null">schedulecheck_flag = #{scheduleCheckFlag},</if>
            <if test="wardcheckFlag != null">wardcheck_flag = #{wardcheckFlag},</if>
            <if test="inDeptcheckFlag != null">in_deptcheck_flag = #{inDeptcheckFlag},</if>
            <if test="inWardcheckFlag != null">in_wardcheck_flag = #{inWardcheckFlag},</if>