wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/DeviceManageMapper.xml
View File

@@ -85,9 +85,12 @@
( SELECT T4.amount
FROM adm_charge_item_definition T5
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id
WHERE T4.condition_code = '2'--2:采购价
WHERE T4.condition_code in ('1','2')--2:采购价
AND T5.instance_id = T1.id
AND T5.instance_table = 'adm_device_definition'
AND T4.delete_flag='0'
ORDER BY T4.create_time desc
LIMIT 1
) as purchase_price,--购入价
( SELECT T4.amount
FROM adm_charge_item_definition T5
@@ -101,6 +104,7 @@
<where>
T1.delete_flag = '0'
AND T2.instance_table = 'adm_device_definition'
</where>
ORDER BY T1.bus_no
) AS T3
@@ -151,9 +155,12 @@
( SELECT T4.amount
FROM adm_charge_item_definition T5
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T5.id
WHERE T4.condition_code = '2'--2:采购价
WHERE T4.condition_code in ('1','2')--2:采购价
AND T5.instance_id = T1.id
AND T5.instance_table = 'adm_device_definition'
AND T4.delete_flag='0'
ORDER BY T4.create_time desc
LIMIT 1
) as purchase_price,--购入价
( SELECT T4.amount
FROM adm_charge_item_definition T5

28
openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/ICDCodeMpper.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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.datadictionary.mapper.ICDCodeMapper">
<select id="getCode" parameterType="java.util.Map"
resultType="com.openhis.web.datadictionary.dto.ICDCodeDto">
SELECT
id,
gl_no,
tenant_id,
delete_flag,
create_by,
create_time,
update_by,
update_time,
gl_name,
icd10_no,
icd10_name,
FROM cli_condition_no_definition
<where>
gl_no = #{glNo}
</where>
</select>
</mapper>

13
openhis-server-new/openhis-application/src/main/resources/mapper/datadictionary/MedicationManageSearchMapper.xml
View File

@@ -150,9 +150,12 @@
(SELECT T7.amount
FROM adm_charge_item_definition T5
LEFT JOIN adm_charge_item_def_detail T7 ON T7.definition_id = T5.id
WHERE T7.condition_code = '2'--2:采购价
WHERE T7.condition_code in('1','2')
AND T5.instance_id = T2.medication_def_id
AND T5.instance_table = 'med_medication_definition'
AND T7.delete_flag='0'
ORDER BY T7.create_time desc
LIMIT 1
) as purchase_price,--购入价
(
SELECT T7.amount
@@ -164,7 +167,7 @@
) as maximum_retail_price--最高零售价
FROM med_medication_definition T1
LEFT JOIN med_medication T2 ON T1.id = T2.medication_def_id AND T2.delete_flag = '0'
LEFT JOIN adm_charge_item_definition T5 ON T2.medication_def_id = T5.instance_id
LEFT JOIN adm_charge_item_definition T5 ON T2.medication_def_id = T5.instance_id AND T5.delete_flag = '0'
<where>
T1.delete_flag = '0'
AND T5.instance_table = 'med_medication_definition'
@@ -241,15 +244,19 @@
T1.rx_flag,--处方标志
T1.item_min_quantity,--最小库存警戒数量(常规单位)
T1.item_max_quantity,--最大库存警戒数量(常规单位)
T1.dosage_instruction,
T3.type_code,
T3.yb_type,
T3.price as retail_price,--零售价
(SELECT T4.amount
FROM adm_charge_item_definition T3
LEFT JOIN adm_charge_item_def_detail T4 ON T4.definition_id = T3.id
WHERE T4.condition_code = '2'--2:采购价
WHERE T4.condition_code in ('1','2')--2:采购价
AND T3.instance_id = T2.medication_def_id
AND T3.instance_table = 'med_medication_definition'
AND T4.delete_flag='0'
ORDER BY T4.create_time desc
LIMIT 1
) as purchase_price,--购入价
(
SELECT T4.amount