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 @@ + ID, SycTime, SycObj, otherID, sysFlag, sysUpdateTime, jzh, zyh, stime, eTime, statusFlag, @@ -435,6 +436,9 @@ 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 <= 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 @@ , 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 ? '' : '', column['class'] || ''), '