Merge branch 'dev_nursing_records_20230214' into uat_ch_master

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvSendMapper.xml

@@ -52,9 +52,11 @@
         FROM CH_SRV_SEND T1
         INNER JOIN CH_SRV_ORGAN T2 ON T1.SRV_ORGAN_ID = T2.SRV_ORGAN_ID
         INNER JOIN CH_DISABLE_INFO T3 ON T1.DISAB_INFO_ID = T3.DISAB_INFO_ID
+        INNER JOIN CH_SRV_BUILD_BED T4 ON T1.DISAB_INFO_ID = T4.DISAB_INFO_ID
         <where>
+            T4.STATUS = 0
             <if test="srvOrganId != null and srvOrganId != 0">
-                T1.SRV_ORGAN_ID = #{srvOrganId}
+                AND  T1.SRV_ORGAN_ID = #{srvOrganId}
             </if>
             <if test="realName != null and realName != ''">
                 AND T3.REAL_NAME LIKE CONCAT(CONCAT('%',#{realName}),'%')