浏览代码

no message

xiaochan 1 年之前
父节点
当前提交
6cb33047bf

+ 0 - 2
src/main/java/thyyxxk/webserver/dao/his/jiekou/DuiWaiJieKouDao.java

@@ -5,13 +5,11 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.entity.datamodify.MzChargeDetail;
-import thyyxxk.webserver.entity.jiekou.PatientInformation;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.zhuyuanyisheng.jianyanjiancha.YshYjReq;
 
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
 
 /**
  * <p>

+ 5 - 3
src/main/java/thyyxxk/webserver/service/jiekou/MedicalTechnologyIsPaidService.java

@@ -1,5 +1,6 @@
 package thyyxxk.webserver.service.jiekou;
 
+import cn.hutool.json.JSONUtil;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ import java.util.List;
 @Slf4j
 @Service
 public class MedicalTechnologyIsPaidService {
+
     private final DuiWaiJieKouDao dao;
     private final HospitalizationCostsService hospitalizationCostsService;
 
@@ -80,7 +82,7 @@ public class MedicalTechnologyIsPaidService {
 
         int yjReq = dao.confirmOutpatientYjReq(type, confirmId, userInfo.getDeptCode(), date, reqNo);
         if (yjReq == 0) {
-            return ResultVoUtil.fail(ExceptionEnum.INVALID_PARAM, "更新失败请联系管理员。");
+            return ResultVoUtil.fail(ExceptionEnum.INVALID_PARAM, "确费失败,医生已撤销申请。");
         }
         int feeCount = dao.confirmOutPatientFee(type, confirmId, userInfo.getDeptCode(), date, reqNo, mz);
         if (feeCount == 0) {
@@ -147,7 +149,7 @@ public class MedicalTechnologyIsPaidService {
         int yshFlag = dao.updateYshYjReqFlag(userInfo.getCode(), yshYjReq.getReqNo(), date, userInfo.getDeptCode(), flag);
 
         if (yshFlag == 0) {
-            throw new BizException(ExceptionEnum.INVALID_PARAM, "更新失败请联系管理员");
+            throw new BizException(ExceptionEnum.INVALID_PARAM, "确费失败,医嘱未执行或者医生已撤销申请。");
         }
 
         int feeCount = dao.confirmTheIntermediateTable(userInfo.getCode(),
@@ -158,7 +160,7 @@ public class MedicalTechnologyIsPaidService {
                 yshYjReq.getAdmissTimes(), flag);
 
         if (feeCount == 0) {
-            throw new BizException(ExceptionEnum.INVALID_PARAM, "更新失败请联系管理员");
+            throw new BizException(ExceptionEnum.INVALID_PARAM, "确费失败,医嘱未执行或者医生已撤销申请。");
         }
     }