From 4a1d2cec6496b8226495cdabd2c80112ec18a53b Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 29 Nov 2021 14:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E5=88=A4=E6=96=AD=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E4=BB=8E=E8=AE=B0=E8=B4=A6=E5=8F=B7+=E4=BD=8F?=
 =?UTF-8?q?=E9=99=A2=E6=AC=A1=E6=95=B0=E6=94=B9=E6=88=90=E8=AE=B0=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7+=E4=BD=8F=E9=99=A2=E6=AC=A1=E6=95=B0+=E7=97=85?=
 =?UTF-8?q?=E6=A1=88=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ann/demo/repository/ArchiveMasterRepository.java |  4 ++--
 .../com/ann/demo/service/ArchiveMasterService.java   |  2 +-
 .../com/ann/demo/service/impl/AnalysisService.java   | 12 +-----------
 .../demo/service/impl/ArchiveMasterServiceImpl.java  |  4 ++--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java b/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java
index c895a89..00ce0f9 100644
--- a/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java
+++ b/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java
@@ -17,8 +17,8 @@ import java.util.List;
 @Repository
 public interface ArchiveMasterRepository extends JpaRepository<ArchiveMaster, String> {
 
-    @Query("select o.id from ArchiveMaster o where  o.visitId = ?1 and o.patientId =?2 and isValid = 0 and archivestate <> '作废' ")
-    public String findArchiveMasterId( String visitId, String patientId);
+    @Query("select o.id from ArchiveMaster o where  o.visitId = ?1 and o.patientId =?2 and o.inpNo =?3 and isValid = 0 and archivestate <> '作废' ")
+    public String findArchiveMasterId( String visitId, String patientId,String inpNo);
 
     public ArchiveMaster findArchiveMasterById(String id);
 
diff --git a/src/main/java/com/ann/demo/service/ArchiveMasterService.java b/src/main/java/com/ann/demo/service/ArchiveMasterService.java
index 7091035..6bfab7e 100644
--- a/src/main/java/com/ann/demo/service/ArchiveMasterService.java
+++ b/src/main/java/com/ann/demo/service/ArchiveMasterService.java
@@ -12,7 +12,7 @@ public interface ArchiveMasterService {
 
     public void save(ArchiveMaster archiveMaster) throws Exception;
 
-    public String findArchiveMasterId( String visitId, String patientId);
+    public String findArchiveMasterId( String visitId, String patientId,String inpNo);
 
     // 修改患者入院状态
     public boolean updateArchiveMasterValid(String archiveMasterId);
diff --git a/src/main/java/com/ann/demo/service/impl/AnalysisService.java b/src/main/java/com/ann/demo/service/impl/AnalysisService.java
index aff142c..2012a94 100644
--- a/src/main/java/com/ann/demo/service/impl/AnalysisService.java
+++ b/src/main/java/com/ann/demo/service/impl/AnalysisService.java
@@ -1,28 +1,18 @@
 package com.ann.demo.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.ann.demo.entity.constant.AliasName;
 import com.ann.demo.entity.constant.InterfaceName;
-import com.ann.demo.entity.constant.WebserviceId;
-import com.ann.demo.entity.filing.MessageSubordinate;
 import com.ann.demo.entity.filing.dto.MessageDto;
-import com.ann.demo.entity.filing.dto.PatientMainDto;
 import com.ann.demo.entity.interfaceEntity.ArchiveMaster;
-import com.ann.demo.entity.interfaceEntity.ExamApply;
 import com.ann.demo.entity.interfaceEntity.MessageLog;
-import com.ann.demo.entity.normalEntity.MedicalRecordHomepage;
-import com.ann.demo.entity.normalEntity.MedicalRecordHomepageCache;
 import com.ann.demo.entity.normalEntity.OutPara;
 import com.ann.demo.service.*;
 import com.ann.demo.utils.XMLUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -72,7 +62,7 @@ public class AnalysisService {
             if (Objects.equals(messageDto.getEntity(), ArchiveMaster.class.getName())) { // 患者信息
                 ArchiveMaster archiveMaster = JSON.parseObject(messageDto.getObject().toString(), ArchiveMaster.class);
                 //查询患者是否存在
-                archiveMasterId = archiveMasterService.findArchiveMasterId( archiveMaster.getVisitId(), archiveMaster.getPatientId());
+                archiveMasterId = archiveMasterService.findArchiveMasterId( archiveMaster.getVisitId(), archiveMaster.getPatientId(),archiveMaster.getInpNo());
                 if (archiveMasterId != null) {
                     // 如果不是新增 都会查询id
                     archiveMaster.setId(archiveMasterId);
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 17b2614..0c94e69 100644
--- a/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
+++ b/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
@@ -72,8 +72,8 @@ public class ArchiveMasterServiceImpl implements ArchiveMasterService {
     }
 
     @Override
-    public String findArchiveMasterId(String visitId, String patientId) {
-        return archiveMasterRepository.findArchiveMasterId( visitId, patientId);
+    public String findArchiveMasterId(String visitId, String patientId,String inpNo) {
+        return archiveMasterRepository.findArchiveMasterId( visitId, patientId,inpNo);
     }
 
     @Override