优化二次退费

src/main/java/thyyxxk/webserver/dao/his/datamodify/SecondFefundDao.java

@@ -21,7 +21,7 @@ import java.util.List;
 public interface SecondFefundDao {
 
     @Select("select confirm_flag,dec_amount,tc_name, " +
-            "rtrim(name)name,rtrim(charge_item_code)charge_item_code,rtrim(patient_id)patient_id,times,receipt_no," +
+            "rtrim(name)name,rtrim(charge_item_code)charge_item_code,rtrim(patient_id)patient_id,times,receipt_no,item_no" +
             "(quantity * drug_win) quantity from mz_charge_detail where " +
             "patient_id = #{patientId} and times = #{times} and charge_item_code = #{chargeItemCode}")
     MzChargeDetail getOrderInformation(@Param("patientId") String patientId,
@@ -30,7 +30,7 @@ public interface SecondFefundDao {
 
     @Select("<script>" +
             "select confirm_flag,dec_amount,tc_name, " +
-            "rtrim(name)name,rtrim(charge_item_code)charge_item_code,rtrim(patient_id)patient_id,times,receipt_no," +
+            "rtrim(name)name,rtrim(charge_item_code)charge_item_code,rtrim(patient_id)patient_id,times,receipt_no,item_no," +
             "(quantity * drug_win) quantity from mz_charge_detail where " +
             "patient_id = #{patientId} and times = #{times} " +
             "<if test=\"chargeItemCode != null and chargeItemCode != '' \">" +
@@ -44,9 +44,10 @@ public interface SecondFefundDao {
                                      @Param("chargeItemCode") String chargeItemCode);
 
     @Update("update mz_charge_detail set dec_amount=#{quantity},confirm_flag = 3  " +
-            "where patient_id = #{patientId} and times = #{times} and charge_item_code = #{chargeItemCode}")
+            "where patient_id = #{patientId} and times = #{times} and charge_item_code = #{chargeItemCode} and item_no = #{itemNo}")
     void xiuGaiTuiFei(@Param("patientId") String patientId,
                       @Param("times") Integer times,
                       @Param("chargeItemCode") String chargeItemCode,
-                      @Param("quantity") double quantity);
+                      @Param("quantity") double quantity,
+                      @Param("itemNo") Integer itemNo);
 }

src/main/java/thyyxxk/webserver/service/datamodify/SecondFefundService.java

@@ -70,15 +70,16 @@ public class SecondFefundService {
      * @return 返回提示成功的数据
      */
     public ResultVo<MzChargeDetail> xiuGaiTuiFei(MzChargeDetail mzChargeDetail) {
-        if (StringUtil.isBlank(mzChargeDetail.getPatientId()) && mzChargeDetail.getTimes() != null && StringUtil.isBlank(mzChargeDetail.getChargeItemCode())) {
+        if (StringUtil.isBlank(mzChargeDetail.getPatientId()) && mzChargeDetail.getTimes() != null && StringUtil.isBlank(mzChargeDetail.getChargeItemCode())
+                && mzChargeDetail.getItemNo() == null) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "患者信息不完善。");
         } else if (mzChargeDetail.getQuantity() == 0 && mzChargeDetail.getQuantity() < 0) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "退药量错误。");
         }
-        log.info("修改二次退费 --> 操作人：{}，门诊号：{}，次数：{}，收费编码：{}，退费数量：{}", TokenUtil.getTokenUserId(), mzChargeDetail.getPatientId(),
-                mzChargeDetail.getTimes(), mzChargeDetail.getChargeItemCode(), mzChargeDetail.getQuantity());
+        log.info("修改二次退费 --> 操作人：{}，门诊号：{}，次数：{}，收费编码：{}，退费数量：{}，itemNo：{}", TokenUtil.getTokenUserId(), mzChargeDetail.getPatientId(),
+                mzChargeDetail.getTimes(), mzChargeDetail.getChargeItemCode(), mzChargeDetail.getQuantity(), mzChargeDetail.getItemNo());
         dao.xiuGaiTuiFei(mzChargeDetail.getPatientId(),
-                mzChargeDetail.getTimes(), mzChargeDetail.getChargeItemCode(), mzChargeDetail.getQuantity());
+                mzChargeDetail.getTimes(), mzChargeDetail.getChargeItemCode(), mzChargeDetail.getQuantity(), mzChargeDetail.getItemNo());
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION, "修改成功。");
     }
 }