解决合并冲突

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

@@ -4,4 +4,9 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.administration.mapper.PatientMapper">
 
+    <select id="searchPatientDataByPatientId" resultType="com.openhis.administration.dto.PatientDataDto">
+        select id as patientId,name as patientName,gender_enum as gender,id_card as idCard from adm_patient
+            where delete_flag = '0' and id = #{patientId} and active_flag = #{activeFlag}
+    </select>
+
 </mapper>