From dbe8ef3ef42668f35cd84892a2d59b5bf57df944 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Mon, 23 May 2022 00:23:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3FLAG=3D1=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E5=92=8C=E5=BD=92=E6=A1=A3=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8oracle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/emr/controller/LoginController.java       | 2 +-
 .../com/emr/service/ipml/Archive_MasterServiceImpl.java     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/emr/controller/LoginController.java b/src/main/java/com/emr/controller/LoginController.java
index 80cfba2..d69fc08 100644
--- a/src/main/java/com/emr/controller/LoginController.java
+++ b/src/main/java/com/emr/controller/LoginController.java
@@ -102,7 +102,7 @@ public class LoginController {
         }
         String contextPath = request.getScheme()+"://"+request.getServerName()+":"
                 +request.getServerPort() + request.getContextPath();
-        if("1".equals(flag)){
+        if("2".equals(flag)){
             return "redirect:" + contextPath + "/font/recordPage";
         }else {
             return "redirect:" + contextPath + "/index";
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 0a86b45..d63f77a 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -935,7 +935,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 //添加进流转记录
                 ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date());
                 //插入退回信息
-                backInsertOracle(0,flowInfo);
+                //backInsertOracle(0,flowInfo);
                 //修改退回信息
                 updateOracle(roleIndex,emrFaultDetail.getArchiveDetailId());
                 emrFaultDetail.setParentId(flowInfo.getId());
@@ -1144,7 +1144,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         //添加进流转记录
         ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date());
         //处于初始状态的添加进第三方oracle库里
-        insertOracle(code,flowInfo);
+        //insertOracle(code,flowInfo);
     }
 
     /**
@@ -1255,7 +1255,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 List<ArchiveFlowRole> currentRoleAndNextRole = flowInfoService.getCurrentRoleAndNextRole(currentStatus, EnumVerify.DocState.MedicalRoomCheck.getCode(),archiveFlowRoles);
                 //添加流转节点
                 ArchiveFlowInfo flowInfo = flowInfoService.insertFlowInfo(master.getId(), master.getRemark(), currentRoleAndNextRole.get(0), currentRoleAndNextRole.get(1), sumbitDate);
-                insertOracle(0,flowInfo);
+                //insertOracle(0,flowInfo);
                 //添加纸质位置
                 paperPostionService.savePaperPostion(master);
             }