From e2794e7e1689a69c35bc841167408d7fac631517 Mon Sep 17 00:00:00 2001
From: hujl <hujl@126.com>
Date: Wed, 29 Dec 2021 08:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AC=E5=9B=9E=E8=BF=94=E5=9B=9E=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/controller/MedicalRecallController.java    | 10 ++++++----
 .../java/com/emr/controller/ScanListController.java    |  3 ---
 .../views/medicalRecallDir/medicalRecallList.jsp       |  9 ++-------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java
index 1b67688d..6bde0552 100644
--- a/src/main/java/com/emr/controller/MedicalRecallController.java
+++ b/src/main/java/com/emr/controller/MedicalRecallController.java
@@ -104,8 +104,9 @@ public class MedicalRecallController {
     @RequestMapping(value = "/updateState")
     public String updateState(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException {
         boolean flag = FormTokenFlagUtil.isFlag(request);
+        String result="";
         if (!flag) {
-            return "请不要重复提交!";
+            result= "请不要重复提交!";
         }
         int bol=0;
         //判断是否已经召回
@@ -119,7 +120,7 @@ public class MedicalRecallController {
                 //最后一次存在召回
                 String inpatientNo = emrFaultDetail.getContent();
                 if(StringUtils.isBlank(inpatientNo)){
-                    return "0";
+                    result= "召回失败!";
                 }
                 response.setCharacterEncoding("utf-8");
                 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
@@ -166,13 +167,14 @@ public class MedicalRecallController {
                         //留观号召回推送第三方
                         archiveMasterService.requestObservationRecord(inpatientNo,"RETURNED",emrFaultDetail.getRecallReason());
                     }
+                    result="召回成功!";
                 }
 
             }else{
-                return "请不要重复召回!";
+                result= "请不要重复召回!";
             }
         }
-        return bol + "";
+        return result;
     }
 }
  
diff --git a/src/main/java/com/emr/controller/ScanListController.java b/src/main/java/com/emr/controller/ScanListController.java
index a8a19d21..0ec46f11 100644
--- a/src/main/java/com/emr/controller/ScanListController.java
+++ b/src/main/java/com/emr/controller/ScanListController.java
@@ -2,12 +2,9 @@ package com.emr.controller;
 
 import com.emr.entity.Archive_Master_Vo;
 import com.emr.entity.OffsetLimitPage;
-import com.emr.entity.Zd_Assort;
 import com.emr.service.ScanInfoService;
 import com.emr.util.DatelUtils;
 import com.emr.util.ThreadExcelUtils;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
index d5511119..e77918df 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
@@ -793,19 +793,14 @@
             success: function (result) {
                 $('#table').bootstrapTable('refresh');
                 //刷新
-                if (parseInt(result) >= 1) {
-                    toastr.success("召回成功！");
-                    //    因为实际返回值会出现大于2，但是实际召回是成功的情况，故修改成大于1均为召回成功，限定了其他情况下返回的错误提示统一都为召回失败
-                    // }else if(result == '2'){
-                    //     toastr.error("召回失败！");
+                if (result.indexOf("成功") != -1) {
+                    toastr.success(result);
                 } else {
                     toastr.warning(result);
                 }
-
             }, error: function () {
                 //刷新
                 // $('#table').bootstrapTable('refresh');
-                //toastr.success("召回成功！");
                 toastr.error("召回失败！")
             }
         });