提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -41,12 +41,8 @@
         abi.position_id,
         abi.restricted_flag,
         abi.restricted_scope,
-<<<<<<< HEAD
-        abi.dosage_instruction
-=======
         abi.dosage_instruction,
         abi.chrgitm_lv
->>>>>>> v1.3
         from (
         <if test="adviceTypes == null or adviceTypes.contains(1)">
             (SELECT
@@ -87,12 +83,8 @@
             T6.def_location_id AS position_id,
             t1.restricted_flag AS restricted_flag,
             t1.restricted_scope AS restricted_scope,
-<<<<<<< HEAD
-            T1.dosage_instruction AS dosage_instruction
-=======
             T1.dosage_instruction AS dosage_instruction,
             T1.chrgitm_lv as chrgitm_lv
->>>>>>> v1.3
             FROM med_medication_definition AS t1
             INNER JOIN med_medication AS T2 ON T2.medication_def_id = T1.ID
             AND T2.delete_flag = '0' AND T2.status_enum = #{statusEnum}
@@ -164,12 +156,8 @@
             T5.def_location_id AS position_id,
             0 AS restricted_flag,
             '' AS restricted_scope,
-<<<<<<< HEAD
-            '' AS dosage_instruction
-=======
             '' AS dosage_instruction,
             T1.chrgitm_lv as chrgitm_lv
->>>>>>> v1.3
             FROM adm_device_definition AS T1
             LEFT JOIN adm_supplier AS T2
             ON T2.ID = T1.supply_id
@@ -235,12 +223,8 @@
             T3.organization_id AS position_id,
             0 AS restricted_flag,
             '' AS restricted_scope,
-<<<<<<< HEAD
-            '' AS dosage_instruction
-=======
             '' AS dosage_instruction,
             T1.chrgitm_lv as chrgitm_lv
->>>>>>> v1.3
             FROM wor_activity_definition AS T1
             LEFT JOIN adm_charge_item_definition AS T2
             ON T2.instance_id = T1.ID
@@ -543,10 +527,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
         AND T1.refund_service_id IS NULL
         <if test="historyFlag == '0'.toString()">
@@ -620,8 +600,6 @@
           AND tad.status_enum = #{status}
           AND tad.type_code = #{typeCode}
           AND tad.item_no = #{itemNo}
-<<<<<<< HEAD
-=======
     </select>
 
     <select id="getProofAndTestHistory" resultType="com.openhis.web.doctorstation.dto.ProofAndTestHistoryDto">
@@ -646,7 +624,6 @@
           AND wsr.encounter_id = #{encounterId}
           AND EXISTS ( SELECT 1 FROM wor_activity_definition AS wad WHERE wad.type_enum = #{typeEnum}
           AND wad.ID = wsr.activity_id )
->>>>>>> v1.3
     </select>
 
 </mapper>

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml

@@ -48,15 +48,7 @@
         T1.create_time AS register_time,
         T1.reception_time AS reception_time,
         T1.organization_id AS org_id,
-<<<<<<< HEAD
-        T8.bus_no AS bus_no,
-        CASE
-        WHEN T9.patient_id IS NOT NULL THEN 1
-        ELSE 0
-        END AS allergy_history_flag
-=======
         T8.bus_no AS bus_no
->>>>>>> v1.3
         FROM adm_encounter AS T1
         LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
         LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'