Merge remote-tracking branch 'origin/master'

zhs

2025-05-30 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace

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

@@ -294,7 +294,12 @@
        a.telcode,
        a.id,
        a.sex
        order by b.inhospid desc
        <if test="cry==1">
            order by b.endtime desc
        </if>
        <if test="cry==0">
            order by b.starttime desc
        </if>
    </select>
    <select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO"
            resultMap="PatMedInhospResult">