diff --git a/src/main/java/com/emr/controller/storageController.java b/src/main/java/com/emr/controller/storageController.java index 38d750d4..20d6e32b 100644 --- a/src/main/java/com/emr/controller/storageController.java +++ b/src/main/java/com/emr/controller/storageController.java @@ -142,7 +142,7 @@ public class storageController { archiveMasterFollowing.setHandleName(handleName); archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason()); bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing); - }else if (archiveMaster.getArchivestate().equals("已归档")){ + }else{// if (archiveMaster.getArchivestate().equals("已归档")) archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId()); archiveMasterFollowing.setFollowingContent("病案取消封存"); archiveMasterFollowing.setFollowingType("12"); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 532f2ce5..d1b37ccc 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1591,7 +1591,8 @@                 - -                 - -                 +                 +                 diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index f8592828..fe448de9 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -494,10 +494,8 @@
diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index d4050aa5..a78ae1f6 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -152,7 +152,7 @@                 -                 -                 - - -
- + +
+
+
+
+ +
+ +
- - - diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index e6c5c3d6..ef69e754 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -542,10 +542,8 @@
@@ -619,10 +617,8 @@
diff --git a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp index f977344b..609b32a1 100644 --- a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp @@ -489,7 +489,7 @@ 完整性审核：
- 地三生三世所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所 +
<%--
--%> @@ -2198,7 +2198,17 @@ { title: '处理状态', field: 'followingContent', - align: 'center', + align: 'left', + formatter: function (value, row, index) { + var a = ''; + if(value.indexOf("病案室审核")!=-1){ + a = '' + value + ''; + }else if(value.indexOf("病案室退回")!=-1){ + a = '' + value + ''; + } + return a; + } + }, { title: '处理人', diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp index 538e49c5..b5eaa023 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp @@ -121,8 +121,16 @@
- + <%-- --%> + + + + + + + @@ -154,10 +162,8 @@
@@ -476,12 +482,9 @@ field: 'dischargeDateTime', align: 'center', valign: 'middle', - formatter: function (value, row, index) { + /* formatter: function (value, row, index) { return value.substring(0, 10); - } - // formatter: function (value, row, index) { - // return value - // } + }*/ }, /*{ title: '上次封存状态', diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp index f2b5422b..9e8ebf64 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp @@ -68,20 +68,27 @@
- - + +
- - + <%-- --%> + + + + + + + -
- +                 - -                 +                 -                --%>
@@ -131,7 +136,6 @@ $(function () { - var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); if (index != null && index != "" && index.indexOf("excel") != -1) { @@ -315,14 +319,14 @@ valign: 'middle', }, { - title: '撤回人', + title: '封存人', field: 'handleName', align: 'center', valign: 'middle', }, { - title: '撤回时间', + title: '封存时间', field: 'handleTime', align: 'center', valign: 'middle', @@ -335,19 +339,42 @@ formatter: function (value, row, index) { //在院 未归档 归档中 初审 已归档 已认证 var a = ''; - if (value == "已归档") { - a = '未封存'; - } else if(value == "已封存"){ - a = '已封存'; + if (value == "未归档") { + a = '' + value + ''; + } else if (value == "已归档") { + a = '' + value + ''; + } else if (value == "在院") { + a = '' + value + ''; + } else if (value == "归档中") { + a = '' + value + ''; + } else if (value == "初审") { + a = '' + value + ''; + } else if (value == "已封存") { + a = '' + value + ''; + } else if (value == "复审退回") { + a = '' + value + ''; + } else if (value == "提交") { + a = '' + value + ''; + } else if (value == "主任退回") { + a = '' + value + ''; } return a; } }, { - title: '签收状态', + title: '封存状态', field: 'followingContent', align: 'center', valign: 'middle', + formatter: function (value, row, index) { + var a = ''; + if (value == "病案取消封存") { + a = ''+value+''; + } else if(value == "病案封存"){ + a = ''+value+''; + } + return a; + } } ], @@ -376,7 +403,7 @@ } else { toastr.warning("正在查询，请稍等..."); } - $(".selectpicker").selectpicker( 'deselectAll' ); + // $(".selectpicker").selectpicker( 'deselectAll' ); // $('#table').bootstrapTable('destroy'); //$('#table').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新