提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/common/CommonAppMapper.xml

@@ -335,34 +335,6 @@
 
     <select id="selectPrescriptionPrintInfo" resultMap="PrescriptionPrintInfoMap">
         SELECT ae.yb_class_enum AS encounter_yb_class,
-<<<<<<< HEAD
-        mmr.prescription_no ,
-        fc.contract_name ,
-        ap."name" AS patient_name,
-        ap.gender_enum ,
-        ap.birth_date ,
-        ae.bus_no AS encounter_no,
-        ao."name" AS department_name,
-        ccd."name" AS condition_name,
-        ap.phone ,
-        mmr.req_authored_time AS req_time,
-        ap2."name" AS doctor_name,
-        ap3."name" AS dispense_doctor_name,
-        ap4."name" AS charge_doctor_name,
-        ap5."name" AS preparer_doctor_name,
-        mmd2."name" AS item_name,
-        mm.total_volume ,
-        mmr.dose ,
-        mmr.method_code ,
-        aci.unit_price ,
-        aci.total_price ,
-        mmr.quantity,
-        mmr.rate_code ,
-        mmr.unit_code ,
-        mmr.dose_unit_code,
-        mmr.sort_number,
-        mmr.group_id
-=======
                mmr.prescription_no ,
                fc.contract_name ,
                ap."name" AS patient_name,
@@ -394,7 +366,6 @@
                ap.address,
                ae.patient_id,
                mmd2.basic_flag
->>>>>>> v1.3
         FROM med_medication_request mmr
         LEFT JOIN med_medication_dispense mmd
         ON mmd.med_req_id = mmr.id
@@ -450,48 +421,6 @@
     </select>
     <select id="selectTreatmentPrintInfo" resultMap="TreatmentPrintInfoMap">
         SELECT ae.yb_class_enum AS encounter_yb_class,
-<<<<<<< HEAD
-        fc.contract_name ,
-        ap."name" AS patient_name,
-        ap.gender_enum ,
-        ap.birth_date ,
-        ae.bus_no AS encounter_no,
-        ao."name" AS department_name,
-        ap.phone ,
-        ae.reception_time AS req_time,
-        ap2."name" AS doctor_name,
-        aci.unit_price ,
-        aci.total_price,
-        wdr.quantity ,
-        wdr.unit_code ,
-        add2."name" AS item_name
-        FROM wor_device_request wdr
-        LEFT JOIN adm_device_definition add2
-        ON wdr.device_def_id = add2.id
-        AND add2.delete_flag = '0'
-        LEFT JOIN adm_charge_item aci
-        ON aci.service_id = wdr.id
-        AND aci.delete_flag = '0'
-        LEFT JOIN adm_encounter ae
-        ON wdr.encounter_id = ae.id
-        AND ae.delete_flag = '0'
-        LEFT JOIN adm_patient ap
-        ON ae.patient_id = ap.id
-        AND ap.delete_flag = '0'
-        LEFT JOIN adm_organization ao
-        ON ao.id = ae.organization_id
-        AND ao.delete_flag = '0'
-        LEFT JOIN adm_account aa
-        ON ae.id = aa.encounter_id
-        AND aa.encounter_flag = 1
-        AND aa.delete_flag = '0'
-        LEFT JOIN fin_contract fc
-        ON aa.contract_no = fc.bus_no
-        AND fc.delete_flag = '0'
-        LEFT JOIN adm_practitioner ap2
-        ON ap2.id = wdr.requester_id
-        AND ap2.delete_flag = '0'
-=======
                fc.contract_name ,
                ap."name" AS patient_name,
                ap.gender_enum ,
@@ -535,7 +464,6 @@
             LEFT JOIN adm_practitioner ap2
                 ON ap2.id = wdr.requester_id
                     AND ap2.delete_flag = '0'
->>>>>>> v1.3
         WHERE wdr.delete_flag = '0'
         AND wdr.id IN
         <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
@@ -543,48 +471,6 @@
         </foreach>
         UNION
         SELECT ae.yb_class_enum AS encounter_yb_class,
-<<<<<<< HEAD
-        fc.contract_name ,
-        ap."name" AS patient_name,
-        ap.gender_enum ,
-        ap.birth_date ,
-        ae.bus_no AS encounter_no,
-        ao."name" AS department_name,
-        ap.phone ,
-        ae.reception_time AS req_time,
-        ap2."name" AS doctor_name,
-        aci.unit_price ,
-        aci.total_price,
-        wsr.quantity ,
-        wsr.unit_code ,
-        wad."name" AS item_name
-        FROM wor_service_request wsr
-        LEFT JOIN wor_activity_definition wad
-        ON wsr.activity_id = wad.id
-        AND wad.delete_flag = '0'
-        LEFT JOIN adm_charge_item aci
-        ON aci.service_id = wsr.id
-        AND aci.delete_flag = '0'
-        LEFT JOIN adm_encounter ae
-        ON wsr.encounter_id = ae.id
-        AND ae.delete_flag = '0'
-        LEFT JOIN adm_patient ap
-        ON ae.patient_id = ap.id
-        AND ap.delete_flag = '0'
-        LEFT JOIN adm_organization ao
-        ON ao.id = ae.organization_id
-        AND ao.delete_flag = '0'
-        LEFT JOIN adm_account aa
-        ON ae.id = aa.encounter_id
-        AND aa.encounter_flag = 1
-        AND aa.delete_flag = '0'
-        LEFT JOIN fin_contract fc
-        ON aa.contract_no = fc.bus_no
-        AND fc.delete_flag = '0'
-        LEFT JOIN adm_practitioner ap2
-        ON ap2.id = wsr.requester_id
-        AND ap2.delete_flag = '0'
-=======
                fc.contract_name ,
                ap."name" AS patient_name,
                ap.gender_enum ,
@@ -628,7 +514,6 @@
             LEFT JOIN adm_practitioner ap2
                 ON ap2.id = wsr.requester_id
                     AND ap2.delete_flag = '0'
->>>>>>> v1.3
         WHERE wsr.delete_flag = '0'
         AND wsr.id IN
         <foreach collection="requestIds" item="requestId" separator="," open="(" close=")">