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); } }