From 8c215c8be0f5076e8c95daf1b2203440ca7dfcad Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 13:42:50 +0800
Subject: [PATCH] 修改了报销校验
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
index 24cbe39..19e7041 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -3,14 +3,19 @@
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.project.common.CalculateDateUtils;
+import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
+import com.ruoyi.project.service.IServiceDonationwitnessService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -38,12 +43,16 @@
* @author ruoyi
* @date 2021-11-19
*/
+@Slf4j
@Api("鍖荤枟璇勪及绠＄悊")
@RestController
@RequestMapping("/project/medicalevaluation")
public class ServiceMedicalevaluationController extends BaseController {
@Autowired
private IServiceMedicalevaluationService serviceMedicalevaluationService;
+
+ @Autowired
+ private IServiceDonationwitnessService serviceDonationwitnessService;
/**
* 鏌ヨ鍖诲璇勪及鍒楄〃
@@ -63,13 +72,29 @@
startPage();
List<MedicalEvaluationVO> list = serviceMedicalevaluationService.selectVOList(medicalEvaluationVO);
for (MedicalEvaluationVO medicalEvaluationVO1 : list) {
- if (medicalEvaluationVO1.getBirthday() != null) {
- Map<String, String> map = CalculateDateUtils.calculateAge(medicalEvaluationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
- medicalEvaluationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
- medicalEvaluationVO1.setAgeunit(map.get("ageUnit"));
- medicalEvaluationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
- medicalEvaluationVO1.setAgeunit2(map.get("ageUnit2"));
+ //鍏堢粰涓勾榫勯粯璁ゅ�硷紙鍥犱负age鏄暟瀛楃被鍨嬶紝涓嶈兘鏀炬í鏉狅紝鎵�浠ュ氨鎵�妯墰鏀惧埌鍗曚綅涓婏級
+ medicalEvaluationVO1.setAgeunit("-");
+ medicalEvaluationVO1.setAge(null);
+ medicalEvaluationVO1.setAge2(null);
+ //鑾峰彇姝讳骸鏃堕棿锛屽鏋滆幏鍙栬璇侀噷鏈夋浜℃椂闂达紝鍒欒繘琛岃绠椾粬鐨勫勾榫�
+ ServiceDonationwitness sdw = new ServiceDonationwitness();
+ sdw.setInfoid(medicalEvaluationVO1.getInfoid());
+ List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessService.selectServiceDonationwitnessList(sdw);
+ if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && medicalEvaluationVO1.getBirthday() != null) {
+ Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
+ if (ObjectUtils.isNotEmpty(deathtime)) {
+ Map<String, String> map = CalculateDateUtils.calculateAge(medicalEvaluationVO1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
+ if (ObjectUtils.isEmpty(map)) {
+ log.error("MedicalEvaluationVO鍑虹敓鏃ユ湡锛歿},MedicalEvaluationVO姝讳骸鏃ユ湡锛歿}", medicalEvaluationVO1.getBirthday(), deathtime);
+ continue;
+ }
+ medicalEvaluationVO1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
+ medicalEvaluationVO1.setAgeunit(map.get("ageUnit"));
+ medicalEvaluationVO1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
+ medicalEvaluationVO1.setAgeunit2(map.get("ageUnit2"));
+ }
}
+
}
return getDataTable(list);
}
@@ -103,10 +128,21 @@
@ApiOperation("鏂板鍖诲璇勪及")
//// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.INSERT)
+ @RepeatSubmit
@PostMapping("/add")
-// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
- boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
+ // 2026-10-22锛氬悓涓�妗堜緥鍙厑璁镐竴鏉℃湭鍒犻櫎璁板綍鈥斺�斿凡瀛樺湪鍒欐洿鏂帮紝閬垮厤鍙嶅淇濆瓨浜х敓閲嶅琛�
+ if (serviceMedicalevaluation.getInfoid() != null) {
+ ServiceMedicalevaluation query = new ServiceMedicalevaluation();
+ query.setInfoid(serviceMedicalevaluation.getInfoid());
+ List<ServiceMedicalevaluation> exist = serviceMedicalevaluationService.queryList(query);
+ if (exist != null && !exist.isEmpty()) {
+ serviceMedicalevaluation.setId(exist.get(0).getId());
+ serviceMedicalevaluationService.updateById(serviceMedicalevaluation);
+ return AjaxResult.success(serviceMedicalevaluation);
+ }
+ }
+ serviceMedicalevaluationService.save(serviceMedicalevaluation);
return AjaxResult.success(serviceMedicalevaluation);
}
@@ -116,9 +152,14 @@
@ApiOperation("淇敼鍖诲璇勪及")
//// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:edit')")
@Log(title = "鍖诲璇勪及", businessType = BusinessType.UPDATE)
+ @RepeatSubmit
@PostMapping("/edit")
-// @NotRepeatCommit(key = "param:arg[1]", value = 30000)
public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
+ // 浼樺厛鎸変富閿洿鏂帮紙鍓嶇宸插洖濉� id 鐨勫父瑙勮矾寰勶級
+ if (serviceMedicalevaluation.getId() != null) {
+ return toAjax(serviceMedicalevaluationService.updateById(serviceMedicalevaluation));
+ }
+ // 鍏煎鏈紶 id 鐨勬棫璋冪敤锛氭寜 infoid 瀹氫綅鏈垹闄よ褰�
List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
if (CollectionUtils.isEmpty(list)) {
return error("鍖诲璇勪及鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
--
Gitblit v1.9.3