From 13a22b12b5751193c9eb6729ca1400d2feb9eeac Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Thu, 28 Apr 2022 16:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/vo/ArchiveOtherExtVo.java    |  2 ++
 .../mapper/ArchiveOtherExtMapper.xml          |  4 +++
 .../resources/mapper/Archive_MasterMapper.xml |  2 +-
 .../bootstrap-table/bootstrap-table.js        |  1 -
 .../js/hospitalCommom/hospitalCommom.js       | 25 ++++++++++++++++---
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java
index cf9a0d2..797bee0 100644
--- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java
+++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java
@@ -24,6 +24,8 @@ public class ArchiveOtherExtVo extends ArchiveOtherExt {
 
     private String stimeStr;
 
+    private  Integer timeStatus;
+
     private String etimeStr;
 
     private String sysFlagStr;
diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
index b0595a9..fa3e218 100644
--- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml
+++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
@@ -35,6 +35,7 @@
     <result column="T4" property="t4" jdbcType="TIMESTAMP" />
     <result column="T5" property="t5" jdbcType="TIMESTAMP" />
     <result column="T6" property="t6" jdbcType="TIMESTAMP" />
+    <result column="TimeStatus" property="timeStatus" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     ID, SycTime, SycObj, otherID, sysFlag, sysUpdateTime, jzh, zyh, stime, eTime, statusFlag, 
@@ -435,6 +436,9 @@
   <select id="getArchiveExtInfo" resultMap="BaseResultMap">
       select distinct temp.*,zd_assort.assort_name,zd_assort.assort_id,
       archive_other_ext_submitTime.create_time,archive_other_ext_submitTime.str2 tempTime,
+      (case when  temp.etimeStr &lt;= archive_other_ext_submitTime.create_time THEN '1'
+    when temp.etimeStr >=archive_other_ext_submitTime.create_time THEN '2' end
+      ) as timeStatus,
       CASE
       WHEN sysFlag = 1 THEN
       CASE
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index a3ab8eb..d486c54 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -626,7 +626,7 @@
           <include refid="selectColumms"></include>,
             CASE
             WHEN jzh IS NOT NULL THEN
-            '召回中'
+            '是'
             ELSE
             '否'
             END callBackStatus,
diff --git a/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js b/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
index da85067..55263f8 100644
--- a/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
+++ b/src/main/webapp/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.js
@@ -1742,7 +1742,6 @@
             if (column.checkbox || column.radio) {
                 type = column.checkbox ? 'checkbox' : type;
                 type = column.radio ? 'radio' : type;
-
                 text = [sprintf(that.options.cardView ?
                         '<div class="card-view %s">' : '<td class="bs-checkbox %s">', column['class'] || ''),
                     '<input' +
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index c4c2a9d..51c4e9e 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -1217,7 +1217,15 @@ function initTable5(data,sidePagination) {
                 checkbox: true,
                 width: 25,
                 align: 'center',
-                hidden: true
+                hidden: true,
+                formatter: function (value, row, index) {
+                    console.log(row.timeStatus)
+                    if (row.timeStatus ==1) {
+                        return { disabled : true,}
+                    }else if(row.timeStatus ==2){
+                        return { disabled : false,}
+                    }
+                },
             },
             {
                 title: "操作",
@@ -1225,8 +1233,14 @@ function initTable5(data,sidePagination) {
                 valign: 'middle',
                 width: 120, // 定义列的宽度，单位为像素px
                 formatter: function (value, row, index) {
-                    var html = '<button type="button" class="btn btn-primary btn-sm editInfo" >同步更新</button>';
-                    return html;
+                    if (row.timeStatus !=1) {
+                        var html = '<button type="button" class="btn btn-primary btn-sm editInfo" >同步更新</button>';
+
+                        return html;
+                    }else {
+                        var html = '<button type="button" class="btn btn-primary btn-sm " >正在更新</button>';
+                        return html;
+                    }
                 },
                 events: {
                     'click .editInfo': function (e, value, row, index) {
@@ -1348,6 +1362,7 @@ function initTable5(data,sidePagination) {
                 }
             }
         ],
+
         //监听分页点击事件
         onPageChange: function(num, type) {
             pageNumber = num;
@@ -1358,7 +1373,10 @@ function initTable5(data,sidePagination) {
     }else{
         option.data = data;
     }
+    
     $("#table5").bootstrapTable(option);
+
+
 }
 //对比结束时间方法
 /**
@@ -1437,6 +1455,7 @@ function submitUpdate(ids,notNursingIds,detailIds,sysFlag) {
         data:{ids:ids,notNursingIds:notNursingIds,detailIds:detailIds,jzh:jzh,masterId:$("#idLab").text(),sysFlag:sysFlag},
         dataType:'json',
         success:function (data) {
+
             if(data.code == 100){
                 toastr.success("同步更新已发送,请耐心等待!");
                 //刷新列表