提交merge1.3

openhis-server-new/openhis-domain/src/main/resources/mapper/administration/LocationMapper.xml

@@ -22,6 +22,7 @@
 
     <!-- 根据区域id数组查询 区域表 -->
     <select id="searchLocationDataByBusNo" resultType="com.openhis.administration.dto.PatientBedInfoDto">
+<<<<<<< HEAD
         select id        as bedLocationId,
         bus_no           as busNo,
         name             as bedName,
@@ -35,4 +36,33 @@
 
 
 
+=======
+        select id               as bedLocationId,
+               bus_no           as busNo,
+               name             as bedName,
+               status_enum      as statusEnum,
+               mode_enum        as modeEnum,
+               operational_enum as operationalEnum
+        from adm_location
+        where delete_flag = '0'
+          and bus_no like concat(#{busNo}, '%')
+          and form_enum = #{formEnum}
+          and status_enum = #{statusEnum}
+    </select>
+
+    <select id="isExistName" resultType="java.lang.Boolean">
+        SELECT EXISTS (SELECT 1
+        FROM adm_location
+        WHERE REPLACE(REPLACE(name, ' ', ''), '　', '') = #{name}
+        <if test="locId != null">
+           AND id != #{locId}
+        </if>
+        <if test="busNo != null">
+            AND bus_no like CONCAT(#{busNo}, '%')
+        </if>
+        AND delete_flag = #{delFlag}) AS exists_flag;
+    </select>
+
+
+>>>>>>> v1.3
 </mapper>