Merge remote-tracking branch 'origin/develop' into develop

openhis-server-new/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentReconciliation.java

@@ -102,13 +102,10 @@ public class PaymentReconciliation extends HisBaseEntity {
     private String ybSettleIds;// 记录医保结算id
 
     /** 医保清算标志 */
-<<<<<<< HEAD
     private Integer ybClearFlag;//默认值0 未清算
 
     /** 退号/退费原因 */
     @TableField("refund_reason")
     private String refundReason;
-=======
-    private Integer ybClearFlag;// 默认值0 未清算
->>>>>>> upstream/develop
+    
 }

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

@@ -3,19 +3,6 @@
         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">
-        SELECT id, bus_no, name, active_flag, type_enum, class_enum, py_str, wb_str, 
-               yb_no, yb_name, caty, display_order, medins_id, medins_admdvs, 
-               medins_type, medins_lv, def_doctor_id, create_by, create_time, 
-               update_by, update_time, tenant_id, delete_flag,
-               register_flag, location, intro, remark 
-        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
@@ -27,5 +14,4 @@
                GROUP BY heal.offered_org_id)
     </select>
 
->>>>>>> upstream/develop
 </mapper>