From 5bdf4e34858fa5b51e91f8cc8ae07f232814a84b Mon Sep 17 00:00:00 2001
From: leijx <1477272687@qq.com>
Date: Wed, 3 Feb 2021 09:12:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=89=8B=E9=BA=BB=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E6=9C=AF=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/entity/filing/dto/MessageDto.java    |  3 +++
 .../impl/HomepageDictionaryImpl.java          | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java b/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java
index dd29f33..5226b0d 100644
--- a/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java
+++ b/src/main/java/com/ann/demo/entity/filing/dto/MessageDto.java
@@ -54,6 +54,9 @@ public class MessageDto<T> {
     // 2019-11-28 新增三级标题
     private String detailType;
 
+    // 2021-2-1
+    private String operationCount;
+
     public MessageDto() {
     }
 
diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
index fe11fe5..2afa2a2 100644
--- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
+++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
@@ -120,7 +120,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
     @Override
     public String handNumbnessReport(String xmlStr) {
         String outContent = null;
-        String remark = null;
+        String remark = "失败";
         try {
             // 手麻系统 判断消息是否传过  存入消息  然后解析消息  然后存到附属表
             // 1、定义变量
@@ -138,10 +138,22 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
                 archiveMasterId = messageService.getArchiveMasterId(messageDto.getInpNo(), messageDto.getVisitId());
                 if(archiveMasterId != null){
                     messageLog.setMasterId(archiveMasterId);
-                    // 保存消息从属表
-                    patientMainStr = JSON.toJSONString(new PatientMainDto(messageDto.getInpNo(), messageDto.getVisitId()), SerializerFeature.WriteMapNullValue);
-                    result = 1;
-                    flag = true;
+                    /*2021-2-1 等围手术期单接班者有了电子签名 就可以开始实行无纸化*/
+                    if(!Objects.equals(messageDto.getDetailType(),"围手术期单")){
+                        // 保存消息从属表
+                        patientMainStr = JSON.toJSONString(new PatientMainDto(messageDto.getInpNo(), messageDto.getVisitId()), SerializerFeature.WriteMapNullValue);
+                        result = 1;
+                        flag = true;
+                    }
+                    /*2021-2-1 等围手术期单接班者有了电子签名 就可以开始实行无纸化*/
+
+                    // 2021-2-2 因为手麻不愿意处理，啊啊啊，只能由我处理
+                    String operationCount = "1";
+                    if(messageDto.getOperationCount() != null && !Objects.equals(messageDto.getOperationCount(),"")){
+                        operationCount = messageDto.getOperationCount();
+                    }
+                    messageDto.setApplyId(messageDto.getApplyId()+"_"+operationCount);
+
                     type = messageDto.getType();
                     xmlCreateTime = messageDto.getXmlCreateTime();
                 }else{