撤床相关修改

common/common-core/src/main/java/com/hungraim/ltc/util/AttachType.java

@@ -67,7 +67,11 @@ public enum AttachType {
     /**
      * 17:建床;
      */
-    BUILD_BED((short) 17);
+    BUILD_BED((short) 17),
+    /**
+     * 18:撤床;
+     */
+    REMOVE_BED((short) 18);
 
     private Short uploadType;
 

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvSendMapper.java

@@ -82,7 +82,7 @@ public interface SrvSendMapper extends BaseMapper<ChSrvSend> {
             " LEFT JOIN CH_DISABLE_INFO t2 ON t1.DISAB_INFO_ID = t2.DISAB_INFO_ID " +
             " LEFT JOIN CH_SRV_BUILD_BED t3 ON t2.DISAB_INFO_ID = t3.DISAB_INFO_ID " +
             " WHERE " +
-            "t3.BUILD_BED_ID IS NOT NULL " +
+            "t3.BUILD_BED_ID IS NOT NULL AND " +
             "t1.SRV_ORGAN_ID = #{srvOrganId} " +
             " AND t2.REAL_NAME LIKE CONCAT( '%', CONCAT( #{realName}, '%' ) )")
     IPage<SearchDisableSimpleVo> buildBedSearchByRealName(Page<SearchDisableSimpleVo> page, Integer srvOrganId, String realName);