From d77d122f428dfafb7d50d8a72b59b25ef7fbf5bd Mon Sep 17 00:00:00 2001
From: leijx <1477272687@qq.com>
Date: Tue, 5 Jan 2021 08:52:14 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E3=80=81=E5=BA=8A=E5=8F=B7=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=20=E5=87=BA=E9=99=A2=E5=8F=AC?=
 =?UTF-8?q?=E5=9B=9E=E6=97=B6=20=E5=B0=86=E5=8C=BB=E7=94=9F=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E3=80=81=E6=8A=A4=E5=A3=AB=E6=8F=90=E4=BA=A4=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=BD=AE=E4=B8=BA=E6=9C=AA=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/interfaceEntity/ArchiveMaster.java   | 17 +++++++++++++++++
 .../repository/ArchiveMasterRepository.java     |  2 +-
 .../service/impl/ArchiveMasterServiceImpl.java  |  6 ++----
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ann/demo/entity/interfaceEntity/ArchiveMaster.java b/src/main/java/com/ann/demo/entity/interfaceEntity/ArchiveMaster.java
index d6f4c0e..7a8cd6c 100644
--- a/src/main/java/com/ann/demo/entity/interfaceEntity/ArchiveMaster.java
+++ b/src/main/java/com/ann/demo/entity/interfaceEntity/ArchiveMaster.java
@@ -136,4 +136,21 @@ public class ArchiveMaster {
 
     // 死亡字段
     private String deathFlag = "0";
+
+    /**
+     * 是否扫描
+     * 2020-12-14
+     */
+    @Column(name = "isscaned")
+    private String isScaned;
+
+    private String cmtDoctor;
+
+    private String cmtNurse;
+
+    //2020-12-28 新增床号
+    private String bedNumber;
+
+
+
 }
diff --git a/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java b/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java
index e8b0f96..c895a89 100644
--- a/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java
+++ b/src/main/java/com/ann/demo/repository/ArchiveMasterRepository.java
@@ -71,6 +71,6 @@ public interface ArchiveMasterRepository extends JpaRepository<ArchiveMaster, St
     void updateArchiveMasterByUpdate(String id,String name, String sex, Date admissionDateTime, String deptAdmissionTo);
     @Transactional
     @Modifying
-    @Query("update ArchiveMaster o set o.archiveState = '在院' where o.id = ?1 and o.isValid = 0 and archivestate <> '作废' ")
+    @Query("update ArchiveMaster o set o.archiveState = '在院' , o.cmtDoctor = 0 , o.cmtNurse = 0 where o.id = ?1 and o.isValid = 0 and archivestate not in ('作废','初审','已归档','复审退回') ")
     Integer updateArchiveMasterArchiveState(String id);
 }
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 a846607..0f1e231 100644
--- a/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
+++ b/src/main/java/com/ann/demo/service/impl/ArchiveMasterServiceImpl.java
@@ -7,13 +7,9 @@ import com.ann.demo.service.ArchiveMasterService;
 import com.ann.demo.service.InterfaceHisCacheService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.lang.reflect.Field;
-import java.util.List;
-import java.util.Objects;
 
 /**
  * @Author: LeiJiaXin
@@ -51,6 +47,7 @@ public class ArchiveMasterServiceImpl implements ArchiveMasterService {
             }
             archiveMaster.setSex(sex);
         }
+        archiveMaster.setIsScaned("0");
 
         //2020-8-17 如果不等于null，那么就是入院信息更新操作
         if(archiveMaster.getId() != null ){
@@ -102,6 +99,7 @@ public class ArchiveMasterServiceImpl implements ArchiveMasterService {
         ArchiveMaster master = archiveMasterRepository.findByIdAndIsValid(archiveMaster.getId(), 0);
         if (master != null) {
             master.setDeptName(archiveMaster.getDeptName());
+            master.setBedNumber(archiveMaster.getBedNumber());
             master.setDischargeDateTime(archiveMaster.getDischargeDateTime());
             if(master.getArchiveState().equals("在院")){
                 master.setArchiveState("归档中");