解决合并冲突

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

@@ -4,4 +4,35 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.LocationMapper">
 
+    <!-- 根据区域id数组查询 区域表 -->
+    <select id="searchLocationDataByIds" resultType="com.openhis.administration.dto.LocationDataDto">
+        select id               as locationId,
+               bus_no           as busNo,
+               name             as areaName,
+               status_enum      as statusEnum,
+               mode_enum        as modeEnum,
+               operational_enum as operationalEnum
+        from adm_location
+        where delete_flag = '0'
+          and id in
+        <foreach collection="locationIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <!-- 根据区域id数组查询 区域表 -->
+    <select id="searchLocationDataByBusNo" resultType="com.openhis.administration.dto.PatientBedInfoDto">
+        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>
+
+
+
 </mapper>