删除一个没有用的颜文字

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -527,7 +527,11 @@ public class SetlListUpldService {
             }
             List<SiSetlFeeDetl> list = new ArrayList<>();
             for (int i = 0; i < output.size(); i++) {
-                list.add(JSONObject.parseObject(output.getJSONObject(i).toJSONString(), SiSetlFeeDetl.class));
+                SiSetlFeeDetl fee = JSONObject.parseObject(output.getJSONObject(i).toJSONString(), SiSetlFeeDetl.class);
+                if (StringUtil.isBlank(fee.getSetlId())) {
+                    fee.setSetlId(setlId);
+                }
+                list.add(fee);
                 if (list.size() == 30) {
                     queryDao.insertSetlFeeDetlBatch(list);
                     list.clear();

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

@@ -110,15 +110,15 @@ public class XiangMuLuRuService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "您没有权限退费。");
         }
         if (param.getList() == null || param.getList().isEmpty()) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择需要退费的数据，一次性退费不得超过100条<br/> ╮( •́ω•̀ )╭");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择需要退费的数据，一次性退费不得超过100条");
         } else if (param.getList().size() > 100) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "项目退费一次性大于100条数据<br/>╮(﹀_﹀”)╭");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "项目退费一次性大于100条数据");
         }
         if (StringUtil.isBlank(param.getInpatientNo()) || param.getAdmissTimes() == null || param.getList().size() == 0) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "患者信息不全 (；´д｀)ゞ");
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "患者信息不全");
         }
         if (dao.getHuanZheSFZaiYuan(param.getInpatientNo(), param.getAdmissTimes()) == 0) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该患者已出院 /(ㄒoㄒ)/~~");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该患者已出院");
         }
 
         int infantFlag = 0;
@@ -131,7 +131,7 @@ public class XiangMuLuRuService {
         // 判断数据是否为 退费数据
         List<ZyDetailCharge> chaKanSFtuiFei = dao.chaKanSFYiJingTuiFeiLe(param.getInpatientNo(), param.getAdmissTimes(), ledgerSn, param.getList());
         for (ZyDetailCharge charge : chaKanSFtuiFei) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为：【%s】已退费，请勿重复退费 <br/>···(｡•́︿•̀｡) ", charge.getOriDetailSn()));
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为：【%s】已退费，请勿重复退费。", charge.getOriDetailSn()));
         }
         if (dao.getHuanZheSFJieSuan(param.getInpatientNo(), param.getAdmissTimes()) == null || dao.getHuanZheSFJieSuan(param.getInpatientNo(), param.getAdmissTimes()) != 0) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "该患者已经结算了");
@@ -154,7 +154,7 @@ public class XiangMuLuRuService {
         for (ZyDetailCharge pojo : yuanTuiFeiList) {
             // 判断患者的费用是否存在负数
             if (pojo.getChargeFee().signum() == -1 || pojo.getChargeAmount().signum() == -1) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("患者费用存在负数，流水号：【%s】，该数据为退费数据。<br/>( ´Д｀)y━・~~", pojo.getDetailSn()));
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("患者费用存在负数，流水号：【%s】，该数据为退费数据。", pojo.getDetailSn()));
             }
             if (pojo.getChargeCode().startsWith("BILL")) {
                 yaoPingDan.add(pojo);
@@ -179,7 +179,7 @@ public class XiangMuLuRuService {
         }
         // 执行退费的操作 20 条的退费
         if (tuiFeiList.isEmpty()) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "查询不到患者原数据，请联系管理员。( ´Д｀)y━・~~");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "查询不到患者原数据，请联系管理员。");
         } else {
             log.info("操作项目退费 ==》 操作人：{}，数据：{}", TokenUtil.getTokenUserId(), JSON.toJSONString(tuiFeiList));
             List<List<ZyDetailCharge>> fenGe = ListUtils.partition(tuiFeiList, 20);
@@ -201,19 +201,19 @@ public class XiangMuLuRuService {
             if (xuYaoTuiDeShuJu.getDeptCode().startsWith("8")) {
                 //获取到这个人是否属于这个科室
                 if (!zhiXinKeShi.contains(piPeiDeShuJu.getExecUnit())) {
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。<br/>(；´д｀)ゞ", piPeiDeShuJu.getDetailSn()));
+                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。", piPeiDeShuJu.getDetailSn()));
                 }
                 // 护士是不可以退药品的
                 if (panDuanYaoPin) {
                     if (piPeiDeShuJu.getChargeCode().startsWith("BILL")) {
-                        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】,包含药品费用，无法退费。<br/>(Ｔ▽Ｔ)", piPeiDeShuJu.getDetailSn()));
+                        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】,包含药品费用，无法退费。", piPeiDeShuJu.getDetailSn()));
                     }
                 }
             } else if (panDuanYaoPin) {
                 if (!xuYaoTuiDeShuJu.getDeptCode().equals(piPeiDeShuJu.getExecUnit())) {
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。<br/>(ｉДｉ)", piPeiDeShuJu.getDetailSn()));
+                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。", piPeiDeShuJu.getDetailSn()));
                 } else if ((BigUtils.bigDaYu(piPeiDeShuJu.getOrderNo(), 100) || BigUtils.bigXiaoYu(piPeiDeShuJu.getOrderNo(), 0)) && piPeiDeShuJu.getSerial().equals("01")) {
-                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，只能退本科室录入的药品。<br/>⊙﹏⊙|||", piPeiDeShuJu.getDetailSn()));
+                    return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，只能退本科室录入的药品。", piPeiDeShuJu.getDetailSn()));
                 }
             }
         }
@@ -282,7 +282,7 @@ public class XiangMuLuRuService {
     @Transactional(rollbackFor = Exception.class)
     public ResultVo<String> xiangMuFeiYongShangChuan(ZyDetailCharge param) {
         if (param.getList().size() > 50) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "一次性项目录入大于50条，๑乛◡乛๑");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "一次性项目录入大于50条");
         }
         StringBuilder errorStr = new StringBuilder();
         if (StringUtil.isBlank(param.getInpatientNo()) || param.getAdmissTimes() == null) {
@@ -357,20 +357,20 @@ public class XiangMuLuRuService {
             }
 
             if (zyDetailCharge.getChargeAmount() == null || zyDetailCharge.getAmount() == null) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "数量或金额不能为空。(▼ヘ▼#)");
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "数量或金额不能为空。");
             }
             // 判断患者的费用是否存在负数
             if (zyDetailCharge.getChargeAmount().signum() == -1 || zyDetailCharge.getAmount().signum() == -1) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "不能录入负数，(〃＞皿＜)");
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "不能录入负数");
             }
             if (zyDetailCharge.getChargeAmount().compareTo(new BigDecimal(0)) == 0 || zyDetailCharge.getAmount().compareTo(new BigDecimal(0)) == 0) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "录入费用为 0 (╯°Д°)╯");
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "录入费用为 0");
             }
             if (StringUtil.isBlank(zyDetailCharge.getChargeCodeMx())) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "项目编码空值。( ´•︵•` )");
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "项目编码空值。");
             }
             if (StringUtil.isBlank(zyDetailCharge.getDeptCode())) {
-                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "执行科室为空。( ´•︵•` )");
+                return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "执行科室为空。");
             }
             if (zyDetailCharge.getChargeCodeMx() == null) {
                 zyDetailCharge.setChargeCodeMx(zyDetailCharge.getChargeCode());