Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/controller/inpatient/charge/ForceInAndOutController.java

@@ -47,4 +47,9 @@ public class ForceInAndOutController {
     public ResultVo<String> revokeSettlement(@RequestBody SimplePatient patient) {
         return ResultVoUtil.success(service.revokeSettlement(patient));
     }
+
+    @PostMapping("/revokeMedinsurSetl")
+    public ResultVo<String> revokeMedinsurSetl(@RequestBody SimplePatient patient) {
+        return ResultVoUtil.success(service.revokeMedinsurSetl(patient));
+    }
 }

src/main/java/thyyxxk/webserver/service/inpatient/charge/ForceInAndOutService.java

@@ -162,6 +162,17 @@ public class ForceInAndOutService {
         if (medType == MedType.SELF_PAY) {
             return revokeHisSettle(patient);
         }
+        throw new BizException(ExceptionEnum.LOGICAL_ERROR,
+                "患者已进行医保结算，请联系医保科，做取消医保结算操作。");
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    public String revokeMedinsurSetl(SimplePatient patient) {
+        UserInfo user = userCache.getUserInfoByToken();
+        patient.setStaffId(user.getCode());
+        patient.setStaffName(user.getName());
+        patient.setLedgerSn(dao.getMaxLedgerSn(patient));
+        MedType medType = MedType.get(patient.getMedType());
         if (medType == MedType.INJURY_HOSPITALIZATION) {
             InjuryCareQualification qualification = new InjuryCareQualification();
             qualification.setPatNo(patient.getPatNo());