提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml

@@ -34,12 +34,8 @@
                                     AND T4.refund_device_id IS NULL
                                     AND T4.delete_flag = '0'
                  WHERE T1.class_enum = #{amb}
-<<<<<<< HEAD
-                   AND T3.status_enum IN (#{completed},#{cancelled})
-=======
                    AND (T3.status_enum IN (#{completed},#{cancelled})
                     OR T4.status_enum IN (#{completed},#{cancelled}))
->>>>>>> v1.3
                    AND T1.delete_flag = '0'
                  GROUP BY T1.tenant_id,
                           T1.id,