From 222df20f3bd705fe84f1b9373cc6c7e9c7dd0763 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 16 十月 2026 14:34:26 +0800
Subject: [PATCH] 医学评估基础信息作废显示异常 患者死亡信息作废显示异常

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
index 1c3045a..1564781 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -143,20 +143,23 @@
         serviceDonatebaseinfo1.setRegistertown(serviceDonatebaseinfoReport.getRegistertownname());
         serviceDonatebaseinfo1.setReportHospital(serviceDonatebaseinfoReport.getToHospital());
         serviceDonatebaseinfo1.setFirstDept(serviceDonatebaseinfoReport.getDeptName());
-        serviceDonatebaseinfo1.setCaseNo(null);
+        serviceDonatebaseinfo1.setRegistercountyname(serviceDonatebaseinfoReport.getRegisterCountyName());
+        serviceDonatebaseinfo1.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
         //鍏堥�氳繃caseNo鏌ヨ鏄惁瀛樺湪
         ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
         serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
+        serviceDonatebaseinfo1.setWorkflow(2);
         List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
         if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
             serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
             serviceDonatebaseinfo1.setUpdateTime(new Date());
             serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo1);
             return true;
+        }else {
+            //鍒涘缓
+            serviceDonatebaseinfo1.setDonatetime(new Date());
+            return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
         }
-        //鍒涘缓
-        serviceDonatebaseinfo1.setDonatetime(new Date());
-        return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
     }
 
     private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {

--
Gitblit v1.9.3