no message

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

@@ -348,7 +348,7 @@ public class XiangMuLuRuService {
     }
 
 
-    private ResultVo<String> getStringResultVo(List<Integer> yongHuJueSe, List<String> zhiXinKeShi, ZyDetailCharge xuYaoTuiDeShuJu, ZyDetailCharge piPeiDeShuJu, Boolean panDuanYaoPin) {
+    private ResultVo<String> getStringResultVo(List<Integer> yongHuJueSe, Set<String> zhiXinKeShi, ZyDetailCharge xuYaoTuiDeShuJu, ZyDetailCharge piPeiDeShuJu, Boolean panDuanYaoPin) {
         // 获取到用户角色   管理员角色可以无视
         if (!yongHuJueSe.contains(1) && !yongHuJueSe.contains(8)) {
             // 科室开头 是 8 就不是医技科室 只有医技科室可以退药品
@@ -364,9 +364,10 @@ public class XiangMuLuRuService {
                     }
                 }
             } else if (panDuanYaoPin) {
+                String order = piPeiDeShuJu.getOrderNo().stripTrailingZeros().toPlainString();
                 if (!xuYaoTuiDeShuJu.getDeptCode().equals(piPeiDeShuJu.getExecUnit())) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。", piPeiDeShuJu.getDetailSn()));
-                } else if ((BigUtils.bigDaYu(piPeiDeShuJu.getOrderNo(), 100) || BigUtils.bigXiaoYu(piPeiDeShuJu.getOrderNo(), 0)) && "01".equals(piPeiDeShuJu.getSerial())) {
+                } else if (!"3".equals(order)) {
                     return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，只能退本科室录入的药品。", piPeiDeShuJu.getDetailSn()));
                 }
             }
@@ -823,13 +824,13 @@ public class XiangMuLuRuService {
 
         List<Integer> yongHuJueSe = dao.huoQuJueSe(TokenUtil.getTokenUserId());
 
-        List<String> zhiXinKeShi = dao.chaXunZhiZXinKeShi(zyDetailCharge.getDeptCode());
+        Set<String> zhiXinKeShi = dao.chaXunZhiZXinKeShi(zyDetailCharge.getDeptCode());
 
         for (ZyDetailCharge detailCharge : zhenShuShuJu) {
             if (!BigUtils.dengYu(detailCharge.getOrderNo(), zyDetailCharge.getOrderNo())) {
-                ResultVo<String> LOGICAL_ERROR = getStringResultVo(yongHuJueSe, zhiXinKeShi, zyDetailCharge, detailCharge, false);
-                if (LOGICAL_ERROR != null) {
-                    return LOGICAL_ERROR;
+                ResultVo<String> judgingMedicines = getStringResultVo(yongHuJueSe, zhiXinKeShi, zyDetailCharge, detailCharge, false);
+                if (judgingMedicines != null) {
+                    return judgingMedicines;
                 }
             }
             if ("2".equals(detailCharge.getTransFlagYb())) {