解决合并冲突

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

@@ -49,4 +49,17 @@
           AND T1.create_time <
               #{endDate};
     </select>
+
+    <select id="searchEncounterDataByIds" resultType="com.openhis.administration.dto.EncounterDataDto">
+        select * from adm_encounter
+         where  (class_enum = #{imp} or class_enum = #{amb}) and status_enum = #{encounterStatus}
+            and id in
+        <foreach collection="encounterIds" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <select id="getPatientIdByParam" resultType="com.openhis.administration.dto.EncounterDataDto">
+        select patient_id as patientId,id as encounterId
+               from adm_encounter encounter where id = #{encounterId} and class_enum = #{classEnum}
+    </select>
 </mapper>