撤销医嘱删除没有生成费用的医嘱

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/OrderQuashDao.java

@@ -74,6 +74,12 @@ public interface OrderQuashDao extends BaseMapper<ReqOrderQuash> {
             "where act_order_no = #{req.actOrderNo}")
     void updateReqOrderQuash(@Param("req") ReqOrderQuash req);
 
+    @Delete("delete yz_zy_patient_fee where act_order_no = #{orderNo} and charge_status ='3' ")
+    void delPatientFee(@Param("orderNo") BigDecimal orderNo);
+
+    @Delete("delete yz_yp_zy_order where act_order_no =#{orderNo} and status_flag ='1' ")
+    void delYpZyOrder(@Param("orderNo") BigDecimal orderNo);
+
     @Insert("insert into yz_erase_order select * from yz_act_order a where a.act_order_no = #{orderNo} ")
     void eraseOrder(@Param("orderNo") BigDecimal orderNo);
 

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/OrderQuashService.java

@@ -17,6 +17,7 @@ import thyyxxk.webserver.utils.ListUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -129,13 +130,27 @@ public class OrderQuashService {
         for (ReqOrderQuash item : list) {
             item.setApproverId(code);
             item.setApproverDatatime(now);
-            dao.updateReqOrderQuash(item);
-            dao.eraseOrder(item.getActOrderNo());
-            dao.delYzOrder(item.getActOrderNo());
+            revocationOfMedicalOrders(item);
         }
 
         return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
     }
 
+    /**
+     * 撤销医嘱
+     *
+     * @param item 数据
+     */
+    public void revocationOfMedicalOrders(ReqOrderQuash item) {
+        BigDecimal order = item.getActOrderNo();
+        dao.updateReqOrderQuash(item);
+        // 删除费用中间表
+        dao.delPatientFee(order);
+        // 删除药品表
+        dao.delYpZyOrder(order);
+        dao.eraseOrder(order);
+        dao.delYzOrder(order);
+    }
+
 
 }