From 69f7cd6d76bb329c9f4521cb9007ca989457cf52 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 19 Jun 2020 11:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B3=E8=AF=B7=E8=A2=AB?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E5=90=8E=EF=BC=8C=E5=86=8D=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=AA=E6=8F=90=E9=86=92=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/controller/emrApprove/ApproveController.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/emr/controller/emrApprove/ApproveController.java b/src/main/java/com/emr/controller/emrApprove/ApproveController.java
index 92a9254..8db0362 100644
--- a/src/main/java/com/emr/controller/emrApprove/ApproveController.java
+++ b/src/main/java/com/emr/controller/emrApprove/ApproveController.java
@@ -337,21 +337,20 @@ public class ApproveController {
                 applyApprove.setApproveState("");
                 applyApprove.setApproveNotes("");
             }
-
             applyApproveService.updateEmrApplyApprove(applyApprove);
         }else{
             boolean flag = FormTokenFlagUtil.isFlag(request);
             if (flag) {
                 applyApproveService.addEmrApplyApprove(applyApprove,request);
-                //是确认提交情况下发送通知
-                String applyStateTemp = "2";
-                if(applyApprove.getApplyState().equals(applyStateTemp)){
-                    sendPowerApproveInterface(applyApprove.getApplyType(),1);
-                }
             }else{
                 return ResultUtil.error("请不要重复提交!");
             }
         }
+        //是确认提交情况下发送通知
+        String applyStateTemp = "2";
+        if(applyApprove.getApplyState().equals(applyStateTemp)){
+            sendPowerApproveInterface(applyApprove.getApplyType(),1);
+        }
         return ResultUtil.ok();
     }