解决合并冲突
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
ii.product_name,
|
||||
ii.unit_code,
|
||||
ii.min_unit_code,
|
||||
ii.manufacturer,
|
||||
ii.manufacturer_text,
|
||||
ii.volume,
|
||||
ii.supplier,
|
||||
ii.item_table_name,
|
||||
@@ -87,7 +87,7 @@
|
||||
T1.merchandise_name AS product_name,
|
||||
T1.unit_code AS unit_code,
|
||||
T1.min_unit_code AS min_unit_code,
|
||||
T1.manufacturer_text AS manufacturer,
|
||||
T1.manufacturer_text ,
|
||||
T2.total_volume AS volume,
|
||||
T3."name" AS supplier,
|
||||
<choose>
|
||||
@@ -147,7 +147,7 @@
|
||||
'' AS product_name,
|
||||
T1.unit_code AS unit_code,
|
||||
T1.min_unit_code AS min_unit_code,
|
||||
T1.manufacturer_text AS manufacturer,
|
||||
T1.manufacturer_text ,
|
||||
T1."size" AS volume,
|
||||
T2."name" AS supplier,
|
||||
<choose>
|
||||
@@ -228,7 +228,7 @@
|
||||
FROM adm_device_definition AS T8
|
||||
WHERE T1.item_id = T8.id
|
||||
AND T8.delete_flag = '0')
|
||||
ELSE null END AS manufacturer,--生产厂家
|
||||
ELSE null END AS manufacturer_text,--生产厂家
|
||||
T6.name AS supplier_name
|
||||
FROM wor_inventory_item AS T1
|
||||
LEFT JOIN adm_location AS T2
|
||||
@@ -332,179 +332,194 @@
|
||||
|
||||
<select id="selectPrescriptionPrintInfo" resultMap="PrescriptionPrintInfoMap">
|
||||
SELECT ae.yb_class_enum AS encounter_yb_class,
|
||||
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,
|
||||
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
|
||||
FROM med_medication_request mmr
|
||||
LEFT JOIN med_medication_dispense mmd
|
||||
ON mmd.med_req_id = mmr.id
|
||||
AND mmd.delete_flag = '0'
|
||||
LEFT JOIN med_medication_definition mmd2
|
||||
ON mmr.medication_id = mmd2.id
|
||||
AND mmd2.delete_flag = '0'
|
||||
LEFT JOIN med_medication mm
|
||||
ON mmd2.id = mm.medication_def_id
|
||||
AND mm.delete_flag = '0'
|
||||
LEFT JOIN adm_charge_item aci
|
||||
ON aci.service_id = mmr.id
|
||||
AND aci.delete_flag = '0'
|
||||
LEFT JOIN cli_condition AS cc
|
||||
ON mmr.condition_id = cc.id
|
||||
AND cc.delete_flag = '0'
|
||||
LEFT JOIN cli_condition_definition AS ccd
|
||||
ON cc.definition_id = ccd.id
|
||||
AND ccd.delete_flag = '0'
|
||||
LEFT JOIN adm_encounter ae
|
||||
ON mmr.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 = mmr.practitioner_id
|
||||
AND ap2.delete_flag = '0'
|
||||
LEFT JOIN adm_practitioner ap3
|
||||
ON ap3.id = mmd.practitioner_id
|
||||
AND ap3.delete_flag = '0'
|
||||
LEFT JOIN adm_practitioner ap4
|
||||
ON ap4.id = aci.performer_id
|
||||
AND ap4.delete_flag = '0'
|
||||
LEFT JOIN adm_practitioner ap5
|
||||
ON ap5.id = mmd.preparer_id
|
||||
AND ap5.delete_flag = '0'
|
||||
LEFT JOIN med_medication_dispense mmd
|
||||
ON mmd.med_req_id = mmr.id
|
||||
AND mmd.delete_flag = '0'
|
||||
LEFT JOIN med_medication_definition mmd2
|
||||
ON mmr.medication_id = mmd2.id
|
||||
AND mmd2.delete_flag = '0'
|
||||
LEFT JOIN med_medication mm
|
||||
ON mmd2.id = mm.medication_def_id
|
||||
AND mm.delete_flag = '0'
|
||||
LEFT JOIN adm_charge_item aci
|
||||
ON aci.service_id = mmr.id
|
||||
AND aci.delete_flag = '0'
|
||||
LEFT JOIN cli_condition AS cc
|
||||
ON mmr.condition_id = cc.id
|
||||
AND cc.delete_flag = '0'
|
||||
LEFT JOIN cli_condition_definition AS ccd
|
||||
ON cc.definition_id = ccd.id
|
||||
AND ccd.delete_flag = '0'
|
||||
LEFT JOIN adm_encounter ae
|
||||
ON mmr.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 = mmr.practitioner_id
|
||||
AND ap2.delete_flag = '0'
|
||||
LEFT JOIN adm_practitioner ap3
|
||||
ON ap3.id = mmd.practitioner_id
|
||||
AND ap3.delete_flag = '0'
|
||||
LEFT JOIN adm_practitioner ap4
|
||||
ON ap4.id = aci.performer_id
|
||||
AND ap4.delete_flag = '0'
|
||||
LEFT JOIN adm_practitioner ap5
|
||||
ON ap5.id = mmd.preparer_id
|
||||
AND ap5.delete_flag = '0'
|
||||
WHERE mmr.delete_flag = '0'
|
||||
AND mmr.id IN
|
||||
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
|
||||
#{requestId}
|
||||
</foreach>
|
||||
AND mmr.id IN
|
||||
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
|
||||
#{requestId}
|
||||
</foreach>
|
||||
</select>
|
||||
<select id="selectTreatmentPrintInfo" resultMap="TreatmentPrintInfoMap">
|
||||
SELECT ae.yb_class_enum AS encounter_yb_class,
|
||||
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
|
||||
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'
|
||||
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'
|
||||
WHERE wdr.delete_flag = '0'
|
||||
AND wdr.id IN
|
||||
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
|
||||
#{requestId}
|
||||
</foreach>
|
||||
AND wdr.id IN
|
||||
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
|
||||
#{requestId}
|
||||
</foreach>
|
||||
UNION
|
||||
SELECT ae.yb_class_enum AS encounter_yb_class,
|
||||
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
|
||||
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'
|
||||
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'
|
||||
WHERE wsr.delete_flag = '0'
|
||||
AND wsr.id IN
|
||||
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
|
||||
#{requestId}
|
||||
</foreach>
|
||||
AND wsr.id IN
|
||||
<foreach collection="requestIds" item="requestId" separator="," open="(" close=")">
|
||||
#{requestId}
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<select id="getPractitionerSignature" resultType="string">
|
||||
SELECT signature
|
||||
FROM adm_practitioner
|
||||
WHERE id = #{practitionerId}
|
||||
</select>
|
||||
|
||||
<select id="getActivityDefinition" resultType="com.openhis.web.common.dto.ActivityDefinitionDto">
|
||||
SELECT ID AS
|
||||
activity_definition_id,
|
||||
NAME AS activity_definition_name
|
||||
FROM wor_activity_definition
|
||||
WHERE delete_flag = '0'
|
||||
AND status_enum = #{statusEnum}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user