Yajentine/his
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

目录树变更，新增门诊收费相关，价格定义字段对应代码修改

Browse Source
This commit is contained in:
Zhang.WH
2025-03-13 14:33:29 +08:00
parent 16cc96aca6
commit e854ef2b9c
35 changed files with 479 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/PurchaseInventoryMapper.xml → openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/PurchaseInventoryMapper.xml
View File

@@ -5,7 +5,7 @@
<select id="selectInventoryReceiptPage"
resultType="com.openhis.web.inventorymanage.dto.InventoryReceiptPageDto">
SELECT T2.id,
T2.bus_no,
T2.bus_no AS supply_bus_no,
T2.status_enum,
T2.supplier_id,
T2.purpose_location_id,

10
openhis-server/openhis-application/src/main/resources/mapper/InventoryManage/ReceiptApprovalMapper.xml → openhis-server/openhis-application/src/main/resources/mapper/Inventorymanage/ReceiptApprovalMapper.xml
View File

@@ -38,12 +38,12 @@
ON T2.id = T1.item_id
LEFT JOIN adm_charge_item_definition T3
ON T2.id = T3.instance_id
LEFT JOIN adm_charge_item_def_app T4
LEFT JOIN adm_charge_item_def_detail T4
ON T3.id = T4.definition_id
AND T1.unit_code = T4.condition_unit_code
WHERE T1.bus_no = #{busNo}
AND T5.status_enum = #{completed}
AND T1.delete_flag = 0
AND T1.delete_flag = '0'
</select>
<select id="selectSupplyDevDetail" resultType="com.openhis.web.inventorymanage.dto.SupplyItemDetailDto">
@@ -81,12 +81,12 @@
ON T2.id = T1.item_id
LEFT JOIN adm_charge_item_definition T3
ON T2.id = T3.instance_id
LEFT JOIN adm_charge_item_def_app T4
LEFT JOIN adm_charge_item_def_detail T4
ON T3.id = T4.definition_id
AND T1.unit_code = T4.condition_unit_code
WHERE T1.bus_no = #{busNo}
AND T5.status_enum = #{completed}
AND T1.delete_flag = 0
AND T1.delete_flag = '0'
</select>
<select id="selectChargeDetail" resultType="com.openhis.web.inventorymanage.dto.ItemChargeDetailDto">
SELECT T1.id AS definition_id,
@@ -99,7 +99,7 @@
T3.unit_code,
T3.min_unit_code
FROM adm_charge_item_definition AS T1
LEFT JOIN adm_charge_item_def_app AS T2
LEFT JOIN adm_charge_item_def_detail AS T2
ON T1.id = T2.definition_id
LEFT JOIN med_medication_definition AS T3
ON T1.instance_id = T3.id

37
openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml Normal file
View File

@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientChargeAppMapper">
<select id="selectEncounterPatientPage"
resultType="com.openhis.web.chargemanage.dto.EncounterPatientPageDto">
SELECT T3.encounter_id,
T3.encounter_bus_no,
T3.start_time,
T3.patient_name,
T3.patient_bus_no,
T3.gender_enum,
T3.birth_date,
T3.id_card,
T3.patient_py_str,
T3.patient_wb_str
FROM (
SELECT T1.id AS encounter_id,
T1.bus_no AS encounter_bus_no,
T1.start_time,
T1.delete_flag,
T2."name" AS patient_name,
T2.bus_no AS patient_bus_no,
T2.gender_enum,
T2.birth_date,
T2.id_card,
T2.py_str AS patient_py_str,
T2.wb_str AS patient_wb_str
FROM adm_encounter AS T1
LEFT JOIN adm_patient AS T2
ON T1.patient_id = T2.id
WHERE T1.delete_flag = '0'
ORDER BY T1.encounter_bus_no DESC
) AS T3
${ew.customSqlSegment}
</select>
</mapper>

6
openhis-server/openhis-application/src/main/resources/mapper/outpatientservice/OutpatientRegistrationAppMapper.xml → openhis-server/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.outpatientservice.mapper.OutpatientRegistrationAppMapper">
<mapper namespace="com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper">
<select id="getPractitionerMetadataPage" resultType="com.openhis.web.outpatientservice.dto.PractitionerMetadata">
<select id="getPractitionerMetadataPage" resultType="com.openhis.web.chargemanage.dto.PractitionerMetadata">
SELECT T3.tenant_id,
T3.ID,
T3.NAME,
@@ -39,7 +39,7 @@
AND create_time > CURRENT_DATE
</select>
<select id="getCurrentDayEncounter" resultType="com.openhis.web.outpatientservice.dto.CurrentDayEncounterDto">
<select id="getCurrentDayEncounter" resultType="com.openhis.web.chargemanage.dto.CurrentDayEncounterDto">
SELECT T9.tenant_id,
T9.encounter_id,
T9.organization_id,

30
openhis-server/openhis-application/src/main/resources/mapper/datadictionary/ChargeItemDefSearchMapper.xml
View File

@@ -16,8 +16,8 @@
T5.update_time,
T5.item_id,
T5.condition_rule_id,
T5.condition_lotnumber,
T5.condition_yb_code,
T5.condition_value,
T5.condition_code,
T5.priority,
T5.amount,
T5.item_no,
@@ -48,8 +48,8 @@
T1.update_time,
T2.id AS item_id,
T2.condition_rule_id,
T2.condition_lotnumber,
T2.condition_yb_code,
T2.condition_value,
T2.condition_code,
T2.priority,
T2.amount,
T3.bus_no AS item_no,
@@ -62,7 +62,7 @@
T4.lot_number
FROM
adm_charge_item_definition T1
LEFT JOIN adm_charge_item_def_app T2
LEFT JOIN adm_charge_item_def_detail T2
ON T1.id = T2.definition_id
LEFT JOIN med_medication_definition T3
ON T1.instance_id = T3.id
@@ -86,8 +86,8 @@
T5.update_time,
T5.item_id,
T5.condition_rule_id,
T5.condition_lotnumber,
T5.condition_yb_code,
T5.condition_value,
T5.condition_code,
T5.priority,
T5.amount,
T5.item_no,
@@ -117,8 +117,8 @@
T1.update_time,
T2.id AS item_id,
T2.condition_rule_id,
T2.condition_lotnumber,
T2.condition_yb_code,
T2.condition_value,
T2.condition_code,
T2.priority,
T2.amount,
T3.bus_no AS item_no,
@@ -130,7 +130,7 @@
T4.lot_number
FROM
adm_charge_item_definition T1
LEFT JOIN adm_charge_item_def_app T2
LEFT JOIN adm_charge_item_def_detail T2
ON T1.id = T2.definition_id
LEFT JOIN adm_device_definition T3
ON T1.instance_id = T3.id
@@ -154,8 +154,8 @@
T5.update_time,
T5.item_id,
T5.condition_rule_id,
T5.condition_lotnumber,
T5.condition_yb_code,
T5.condition_value,
T5.condition_code,
T5.priority,
T5.amount,
T5.item_no,
@@ -183,8 +183,8 @@
T1.update_time,
T2.id AS item_id,
T2.condition_rule_id,
T2.condition_lotnumber,
T2.condition_yb_code,
T2.condition_value,
T2.condition_code,
T2.priority,
T2.amount,
T3.bus_no AS item_no,
@@ -194,7 +194,7 @@
T1.yb_type AS category_code
FROM
adm_charge_item_definition T1
LEFT JOIN adm_charge_item_def_app T2
LEFT JOIN adm_charge_item_def_detail T2
ON T1.id = T2.definition_id
LEFT JOIN wor_activity_definition T3
ON T1.instance_id = T3.id