diff --git a/src/main/java/com/saye/hospitalgd/controller/MedicalInsuranceReconciliationController.java b/src/main/java/com/saye/hospitalgd/controller/MedicalInsuranceReconciliationController.java index 8cd8de3..24ee5f4 100644 --- a/src/main/java/com/saye/hospitalgd/controller/MedicalInsuranceReconciliationController.java +++ b/src/main/java/com/saye/hospitalgd/controller/MedicalInsuranceReconciliationController.java @@ -145,6 +145,40 @@ public class MedicalInsuranceReconciliationController { return responseMap; } + + @ApiOperation(value = "更新医保对账备注", notes = "") + @PostMapping("/updateMedicalInsuranceReconciliationRemark") + @ResponseBody + public HashMap updateMedicalInsuranceReconciliationRemark( + @ApiParam(value = "记录ID") @RequestParam String id, + @ApiParam(value = "备注") @RequestParam(required = false) String remark) { + + HashMap responseMap = new HashMap<>(); + + try { + if (id == null || "".equals(id.trim())) { + responseMap.put("code", 1); + responseMap.put("msg", "id不能为空"); + return responseMap; + } + + HashMap updateMap = new HashMap<>(); + updateMap.put("id", id.trim()); + updateMap.put("remark", remark == null ? "" : remark.trim()); + + medicalInsuranceReconciliationService.updateMedicalInsuranceReconciliationRemark(updateMap); + + responseMap.put("code", 0); + responseMap.put("msg", "OK"); + } catch (Exception e) { + e.printStackTrace(); + LogUtil.error(this.getClass(), "更新医保对账备注失败:" + e.getMessage()); + responseMap.put("code", 1); + responseMap.put("msg", "更新失败:" + e.getMessage()); + } + + return responseMap; + } } diff --git a/src/main/java/com/saye/hospitalgd/mapper/MedicalInsuranceReconciliationMapper.java b/src/main/java/com/saye/hospitalgd/mapper/MedicalInsuranceReconciliationMapper.java index d084218..dc487f1 100644 --- a/src/main/java/com/saye/hospitalgd/mapper/MedicalInsuranceReconciliationMapper.java +++ b/src/main/java/com/saye/hospitalgd/mapper/MedicalInsuranceReconciliationMapper.java @@ -33,6 +33,11 @@ public interface MedicalInsuranceReconciliationMapper { * 删除医保对账结果 */ void deleteMedicalInsuranceReconciliationResult(HashMap map) throws Exception; + + /** + * 更新医保对账备注 + */ + void updateMedicalInsuranceReconciliationRemark(HashMap map) throws Exception; } diff --git a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/MedicalInsuranceReconciliationMethod.java b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/MedicalInsuranceReconciliationMethod.java index 145f3c7..f7a8a07 100644 --- a/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/MedicalInsuranceReconciliationMethod.java +++ b/src/main/java/com/saye/hospitalgd/scheduler/jobMethod/MedicalInsuranceReconciliationMethod.java @@ -102,10 +102,12 @@ public class MedicalInsuranceReconciliationMethod { prevQueryMap.put("trade_date", trade_date); List> prevResults = reconciliationService.findMedicalInsuranceReconciliationResult(prevQueryMap); HashMap prevStatusMap = new HashMap<>(); + HashMap prevRemarkMap = new HashMap<>(); if (prevResults != null) { for (HashMap prev : prevResults) { String key = StringDUtil.changeNullToEmpty(prev.get("insutype")) + "|" + StringDUtil.changeNullToEmpty(prev.get("clr_type")); prevStatusMap.put(key, StringDUtil.changeNullToEmpty(prev.get("stmt_rslt"))); + prevRemarkMap.put(key, StringDUtil.changeNullToEmpty(prev.get("recheck_user"))); } } @@ -165,7 +167,7 @@ public class MedicalInsuranceReconciliationMethod { resultMap.put("recheck_flag", recheckFlag); resultMap.put("prev_stmt_rslt", prevStmt); resultMap.put("recheck_time", "1".equals(recheckFlag) ? DateDUtil.getCurrentDate(DateDUtil.yyyy_MM_dd_HH_mm_ss) : null); - resultMap.put("recheck_user", ""); + resultMap.put("recheck_user", prevRemarkMap.getOrDefault(key, "")); resultMap.put("infcode", callResult.get("infcode")); resultMap.put("err_msg", callResult.get("err_msg")); resultMap.put("warn_msg", callResult.get("warn_msg")); @@ -199,7 +201,7 @@ public class MedicalInsuranceReconciliationMethod { resultMap.put("recheck_flag", "0"); resultMap.put("prev_stmt_rslt", ""); resultMap.put("recheck_time", null); - resultMap.put("recheck_user", ""); + resultMap.put("recheck_user", prevRemarkMap.getOrDefault(insutype + "|" + clrType, "")); resultMap.put("api_result", "ERROR"); resultMap.put("create_time", DateDUtil.getCurrentDate(DateDUtil.yyyy_MM_dd_HH_mm_ss)); resultMap.put("modify_time", DateDUtil.getCurrentDate(DateDUtil.yyyy_MM_dd_HH_mm_ss)); diff --git a/src/main/java/com/saye/hospitalgd/service/MedicalInsuranceReconciliationService.java b/src/main/java/com/saye/hospitalgd/service/MedicalInsuranceReconciliationService.java index f96ad84..cb2bcbc 100644 --- a/src/main/java/com/saye/hospitalgd/service/MedicalInsuranceReconciliationService.java +++ b/src/main/java/com/saye/hospitalgd/service/MedicalInsuranceReconciliationService.java @@ -30,6 +30,11 @@ public interface MedicalInsuranceReconciliationService { * 删除医保对账结果 */ void deleteMedicalInsuranceReconciliationResult(HashMap map) throws Exception; + + /** + * 更新医保对账备注 + */ + void updateMedicalInsuranceReconciliationRemark(HashMap map) throws Exception; } diff --git a/src/main/java/com/saye/hospitalgd/service/impl/MedicalInsuranceReconciliationServiceImpl.java b/src/main/java/com/saye/hospitalgd/service/impl/MedicalInsuranceReconciliationServiceImpl.java index 175c094..6dd2a4b 100644 --- a/src/main/java/com/saye/hospitalgd/service/impl/MedicalInsuranceReconciliationServiceImpl.java +++ b/src/main/java/com/saye/hospitalgd/service/impl/MedicalInsuranceReconciliationServiceImpl.java @@ -41,6 +41,11 @@ public class MedicalInsuranceReconciliationServiceImpl implements MedicalInsuran public void deleteMedicalInsuranceReconciliationResult(HashMap map) throws Exception { medicalInsuranceReconciliationMapper.deleteMedicalInsuranceReconciliationResult(map); } + + @Override + public void updateMedicalInsuranceReconciliationRemark(HashMap map) throws Exception { + medicalInsuranceReconciliationMapper.updateMedicalInsuranceReconciliationRemark(map); + } } diff --git a/src/main/resources/mapper/MedicalInsuranceReconciliationMapper.xml b/src/main/resources/mapper/MedicalInsuranceReconciliationMapper.xml index f27d5ac..f687002 100644 --- a/src/main/resources/mapper/MedicalInsuranceReconciliationMapper.xml +++ b/src/main/resources/mapper/MedicalInsuranceReconciliationMapper.xml @@ -114,6 +114,13 @@ order by create_time desc, trade_date desc, insutype, clr_type + + update medical_insurance_reconciliation_result + set recheck_user = #{remark}, + modify_time = now() + where id = #{id} + + delete from medical_insurance_reconciliation_result diff --git a/src/main/resources/templates/financialReconciliation/medicalInsuranceReconciliationResult.html b/src/main/resources/templates/financialReconciliation/medicalInsuranceReconciliationResult.html index 285927c..8ef83dd 100644 --- a/src/main/resources/templates/financialReconciliation/medicalInsuranceReconciliationResult.html +++ b/src/main/resources/templates/financialReconciliation/medicalInsuranceReconciliationResult.html @@ -74,7 +74,7 @@ - + @@ -176,7 +176,13 @@ 备注 - + +
+ +
+ +
+ 创建时间 @@ -188,10 +194,55 @@