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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:48 +08:00
parent 3c497417dc
commit cbd3e7f981
6 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
View File

@@ -44,11 +44,7 @@
</select>
<!-- 根据关键字查询 如果关键字为空，查询10条，否则返回查询到的所有 -->
<select id="searchMedListByKeyWord" resultType="com.openhis.medication.dto.AdjustPriceMedListDto">
<<<<<<< HEAD
select med.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
=======
select med_def.id as targetId, med_def.name as name, med.total_volume as volume, details.amount as
>>>>>>> v1.3
originRetailPrice,def_details.amount as originBuyingPrice,med_def.bus_no as busNo,med_def.min_unit_code as unitCode
from med_medication med
inner join med_medication_definition med_def on med.medication_def_id = med_def.id