现在可以拆分项目了。

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -579,7 +579,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "        a.code=c.charge_code and " +
             "        a.serial=c.serial    and " +
             "        c.visible_flag_mz <> '1' and " +
-            "        c.visible_flag_zy <> '1' and " +
+            "        c.visible_flag_zy <> '1' and" +
+            "        isnull(a.del_flag,0) = 0 and  " +
             "        c.group_no='73'")
     List<ZyDetailCharge> queryYaoPin(String pyCode);
 

src/main/java/thyyxxk/webserver/entity/datamodify/ZyDetailCharge.java

@@ -275,6 +275,11 @@ public class ZyDetailCharge implements Serializable {
      */
     private Integer feiYongType;
 
+    /**
+     * 药品
+     */
+    private boolean yaoPing = true;
+
 
     /**
      * 0：全部

src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -206,9 +206,12 @@ public class XiangMuLuRuService {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。<br/>( ´Д｀)y━・~~", piPeiDeShuJu.getDetailSn()));
                 }
                 // 护士是不可以退药品的
-                if (piPeiDeShuJu.getChargeCode().startsWith("BILL")) {
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】,包含药品费用，无法退费。<br/>( ´Д｀)y━・~~", piPeiDeShuJu.getDetailSn()));
+                if (xuYaoTuiDeShuJu.isYaoPing()) {
+                    if (piPeiDeShuJu.getChargeCode().startsWith("BILL")) {
+                        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】,包含药品费用，无法退费。<br/>( ´Д｀)y━・~~", piPeiDeShuJu.getDetailSn()));
+                    }
                 }
+
             } else if (!xuYaoTuiDeShuJu.getDeptCode().equals(piPeiDeShuJu.getExecUnit())) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。<br/>( ´Д｀)y━・~~", piPeiDeShuJu.getDetailSn()));
             }
@@ -277,7 +280,6 @@ public class XiangMuLuRuService {
      */
     @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> xiangMuFeiYongShangChuan(ZyDetailCharge param) {
-
         log.info("param:{}", JSON.toJSONStringWithDateFormat(param, DateUtil.DEFAULT_PATTERN));
         if (param.getList().size() > 50) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "一次性项目录入大于50条，๑乛◡乛๑");
@@ -651,6 +653,7 @@ public class XiangMuLuRuService {
             if (detailCharge.getOriDetailSn() != null || detailCharge.getTransFlagYb().equals("2")) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为：{%d}，已被退费请重新选择。", detailCharge.getDetailSn()));
             }
+            zyDetailCharge.setYaoPing(false);
             chargeFeeSum = chargeFeeSum.add(detailCharge.getChargeFee());
             chargeAmountSum = chargeAmountSum.add(detailCharge.getChargeAmount());
         }