Merge branch 'master' into master-任务组

陈昶聿

6 小时以前 6e3d0a2097a4d841e941a84ec54780a67eb60ba1

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

@@ -263,6 +263,8 @@
        <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>
@@ -314,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,
@@ -321,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>