提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/MedicineSummaryAppMapper.xml

@@ -239,11 +239,7 @@
                 ON wsr.source_location_id = al.id
                     AND al.delete_flag = '0'
         WHERE wsr.delete_flag = '0'
-<<<<<<< HEAD
-            AND wsd.status_enum IN (#{inProgress}, #{completed})
-=======
             AND wsd.status_enum IN (#{preparation}, #{completed})
->>>>>>> v1.3
             AND wsr.type_enum = #{summaryDispense}
         GROUP BY wsr.tenant_id,
                  wsr.bus_no ,
@@ -264,11 +260,8 @@
                mmd.unit_code ,
                mmd.min_unit_code ,
                mmd.part_percent ,
-<<<<<<< HEAD
-=======
                mmd.manufacturer_text,
                mmd.category_code,
->>>>>>> v1.3
                mm.total_volume ,
                wsr.lot_number,
                wsr.item_quantity

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/NurseBillingAppMapper.xml

@@ -2,9 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.openhis.web.inhospitalnursestation.mapper.NurseBillingAppMapper">
 
-<<<<<<< HEAD
-
-=======
     <select id="getInNurseBillingPage"
             resultType="com.openhis.web.inhospitalnursestation.dto.InpatientAdviceDto">
         SELECT ii.encounter_id,
@@ -303,5 +300,4 @@
              ) AS ii
             ${ew.customSqlSegment}
     </select>
->>>>>>> v1.3
 </mapper>

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/OrgDeviceStockTakeAppMapper.xml

@@ -62,9 +62,6 @@
                   AND T7.delete_flag = '0'
                        LEFT JOIN adm_charge_item AS T8 ON T1.id = T8.service_id
                   AND T8.delete_flag = '0'
-<<<<<<< HEAD
-              WHERE T1.delete_flag = '0') AS ii
-=======
                        LEFT JOIN adm_encounter AS T9 ON T1.encounter_id = T9.id
                   AND T9.delete_flag = '0'
               WHERE T1.delete_flag = '0'
@@ -72,7 +69,6 @@
                 AND T1.status_enum = #{requestStatus}
                 AND T2.status_enum = #{dispenseStatus}
                 AND T8.status_enum = #{chargeItemStatus}) AS ii
->>>>>>> v1.3
             ${ew.customSqlSegment}
     </select>