From 333a476412862a0feb297081bd77f231c9784acd Mon Sep 17 00:00:00 2001
From: tan <11033394+tanzr@user.noreply.gitee.com>
Date: Tue, 2 Aug 2022 08:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0master=E8=A1=A8=E6=9C=89?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ArchiveMasterServiceImpl.java        | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java b/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
index d6e1158..fd580c7 100644
--- a/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
+++ b/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
@@ -55,21 +55,23 @@ public class ArchiveMasterServiceImpl implements ArchiveMasterService {
         archiveMaster.setIsScanning("0");
 
         //2020-8-17 如果不等于null，那么就是入院信息更新操作
-        if(archiveMaster.getId() != null ){
-            ArchiveMaster archiveMasterTemp = archiveMasterRepository.findArchiveMasterById(archiveMaster.getId());
-            // 写了一段多余判断是否为null的检验~
-            if(archiveMaster.getName() == null ){
-                archiveMaster.setName(archiveMasterTemp.getName());
-            }else if(archiveMaster.getSex() == null){
-                archiveMaster.setSex(archiveMasterTemp.getSex());
-            }else if(archiveMaster.getAdmissionDateTime() == null){
-                archiveMaster.setAdmissionDateTime(archiveMasterTemp.getAdmissionDateTime());
-            }else if(archiveMaster.getDeptAdmissionTo() == null){
-                archiveMaster.setDeptAdmissionTo(archiveMasterTemp.getDeptAdmissionTo());
+        synchronized (this) {
+            if (archiveMaster.getId() != null) {
+                ArchiveMaster archiveMasterTemp = archiveMasterRepository.findArchiveMasterById(archiveMaster.getId());
+                // 写了一段多余判断是否为null的检验~
+                if (archiveMaster.getName() == null) {
+                    archiveMaster.setName(archiveMasterTemp.getName());
+                } else if (archiveMaster.getSex() == null) {
+                    archiveMaster.setSex(archiveMasterTemp.getSex());
+                } else if (archiveMaster.getAdmissionDateTime() == null) {
+                    archiveMaster.setAdmissionDateTime(archiveMasterTemp.getAdmissionDateTime());
+                } else if (archiveMaster.getDeptAdmissionTo() == null) {
+                    archiveMaster.setDeptAdmissionTo(archiveMasterTemp.getDeptAdmissionTo());
+                }
+                archiveMasterRepository.updateArchiveMasterByUpdate(archiveMaster.getId(), archiveMaster.getName(), archiveMaster.getSex(), archiveMaster.getAdmissionDateTime(), archiveMaster.getDeptAdmissionTo());
+            } else {
+                archiveMasterRepository.save(archiveMaster);
             }
-            archiveMasterRepository.updateArchiveMasterByUpdate(archiveMaster.getId(),archiveMaster.getName(),archiveMaster.getSex(),archiveMaster.getAdmissionDateTime(),archiveMaster.getDeptAdmissionTo());
-        }else{
-            archiveMasterRepository.save(archiveMaster);
         }
     }