提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml

@@ -236,10 +236,6 @@
         T3.service_table = #{WOR_SERVICE_REQUEST}
         LEFT JOIN adm_organization AS ao ON ao.ID = T1.org_id AND ao.delete_flag = '0'
         WHERE T1.delete_flag = '0' AND T1.generate_source_enum = #{generateSourceEnum}
-<<<<<<< HEAD
-        AND T1.based_on_table is null
-=======
->>>>>>> v1.3
         AND T1.parent_id IS NULL
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}