Merge branch 'master' into master-手术随访

陈昶聿

2 天以前 cc3fe1ad9b366533d184d9e239b45f731f014e74

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

@@ -280,6 +280,14 @@
                #{leavehospitaldistrictcode}
            </foreach>
        </if>

        <if test="hospitaldistrictcodeList != null and hospitaldistrictcodeList.size()>0">
            AND b.hospitaldistrictcode IN
            <foreach collection="hospitaldistrictcodeList" item="hospitaldistrictcode" open="(" separator=","
                     close=")">
                #{hospitaldistrictcode}
            </foreach>
        </if>
        <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">
            AND b.leaveldeptcode IN
            <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
@@ -287,6 +295,13 @@
                #{leaveldeptcode}
            </foreach>
        </if>
        <if test="deptcodeList != null and deptcodeList.size()>0">
            AND b.deptcode IN
            <foreach collection="deptcodeList" item="deptcode" open="(" separator=","
                     close=")">
                #{deptcode}
            </foreach>
        </if>
        GROUP BY
        b.inhospid,
        a.age,