提交merge1.3

2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/medication/MedicationMapper.xml
@@ -44,7 +44,11 @@
    </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