szq 4 years ago
parent
commit
704e2045b6

+ 2 - 0
src/main/resources/mapper/MedicineReturnMapper.xml

@@ -52,6 +52,7 @@
                 LEFT JOIN clc_medicine cm ON cso.medicine_id = cm.medicine_id
                 AND cso.clinic_id = cm.clinic_id
                 LEFT JOIN clc_stock_detail csd ON csd.timestamp_number = cso.timestamp_number
+                AND cso.clinic_id = csd.clinic_id
                 LEFT JOIN ins_d_medicine idm ON idm.medicine_id = cso.medicine_id
                 AND idm.clinic_id = cso.clinic_id
             WHERE
@@ -96,6 +97,7 @@
                 LEFT JOIN clc_china_medicine ccm ON ccso.medicine_id = ccm.medicine_id
                 AND ccso.clinic_id = ccm.clinic_id
                 LEFT JOIN clc_china_stock_profit ccsp ON ccsp.timestamp_number = ccso.timestamp_number
+                AND ccso.clinic_id = ccsp.clinic_id
                 LEFT JOIN ins_d_medicine idm ON idm.medicine_id = ccso.medicine_id
                 AND idm.clinic_id = ccso.clinic_id
             WHERE

+ 1 - 0
src/main/resources/mapper/OrderDetailMapper.xml

@@ -396,6 +396,7 @@
         GROUP BY
             cso.id
     </select>
+
     <select id="listHosChinaMedOrder" resultMap="BaseResultMap" parameterType="java.lang.String">
         SELECT
             cpi.prescription_id AS store_order_no,