Browse Source

修复之前的bug

hsh 2 weeks ago
parent
commit
9188ddf46a

+ 1 - 0
src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -720,6 +720,7 @@ public class MzPharmacyController {
             mzChargeDetail.setPatientId(list.get(0).getPatientId());
             mzChargeDetail.setTimes(list.get(0).getTimes());
             mzChargeDetail.setOrderNo(list.get(0).getOrderNo());
+            mzChargeDetail.setGroupNo(list.get(0).getGroupNo());
             int num = mzPharmacyService.dispensingMedicineProcessing(mzChargeDetail);
             if (num > 0) {
                 resultMap.put("code", 0);

+ 3 - 2
src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzPharmacyMapper.java

@@ -745,7 +745,7 @@ public interface MzPharmacyMapper {
             "    FROM mz_charge_detail a WITH(NOLOCK)" +
             "    JOIN yp_base_yf b WITH(NOLOCK) ON a.charge_item_code = b.charge_code AND a.serial = b.serial" +
             "    JOIN yp_zd_dict c WITH(NOLOCK) ON a.charge_item_code = c.code AND a.serial = c.serial" +
-            "    inner join yp_zd_group_name f where f.yf_flag = '1' and isnull(f.del_flag, '0') = '0' and a.group_no = f.group_no " +
+            "    inner join yp_zd_group_name f on f.yf_flag = '1' and isnull(f.del_flag, '0') = '0' and a.group_no = f.group_no " +
             "    LEFT JOIN yp_zd_manufactory d WITH(NOLOCK) ON c.manu_code = d.code" +
             "    WHERE a.patient_id = #{patientId} and" +
             "          a.times = #{times} and" +
@@ -1015,7 +1015,8 @@ public interface MzPharmacyMapper {
             " WHERE confirm_flag in (0,2) "  +
             " AND patient_id = #{patientId} " +
             " AND order_no = #{orderNo} " +
-            " AND times = #{times} " )
+            " AND times = #{times} " +
+            " AND group_no = #{groupNo} " )
     int updateDispensingChargeDetailConfirmFlag(MzChargeDetail mzChargeDetail);
 
     /**