解决合并冲突

openhis-server-new/openhis-domain/src/main/resources/mapper/workflow/ActivityDefinitionMapper.xml

@@ -12,4 +12,22 @@
           AND NAME = #{activityName} LIMIT 1
     </select>
 
+    <!-- 根据项目id数组 加载诊疗集合 -->
+    <select id="searchActivityDefinitionByIds" resultType="com.openhis.workflow.dto.ActivityDto">
+        SELECT id as itemId, bus_no as busNo, name as name
+        FROM wor_activity_definition
+        WHERE id IN
+        <foreach collection="itemIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
+    <select id="searchActivityListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
+        SELECT cid.price AS originRetailPrice, ad.id AS targetId, ad.bus_no AS busNo, ad.name AS name
+        FROM wor_activity_definition ad
+                 inner join adm_charge_item_definition cid on ad.id = cid.instance_id
+        WHERE ad.delete_flag = '0'
+          AND (name LIKE concat('%', #{keyWord}, '%') or py_str LIKE concat('%', #{keyWord}, '%') or
+               wb_str LIKE concat('%', #{keyWord}, '%'))
+    </select>
 </mapper>