解决合并冲突

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

@@ -3,6 +3,7 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.OrganizationMapper">
+<<<<<<< HEAD
     
     <!-- 自定义selectById方法，确保包含所有字段，包括新增字段 -->
     <select id="selectById" parameterType="java.lang.Long" resultType="com.openhis.administration.domain.Organization">
@@ -14,4 +15,17 @@
         FROM adm_organization 
         WHERE id = #{id} AND delete_flag = '0'
     </select>
+=======
+
+    <select id="searchOrgDataByHealth" resultType="com.openhis.administration.dto.OrgDataDto">
+        SELECT org.id AS orgId, org.name AS orgName
+        FROM adm_organization AS org
+        WHERE id IN
+              (SELECT offered_org_id
+               FROM adm_healthcare_service heal
+               WHERE heal.delete_flag = '0'
+               GROUP BY heal.offered_org_id)
+    </select>
+
+>>>>>>> upstream/develop
 </mapper>