From 15b1b94a40615d5af21d95de1716aa5b2960a2b8 Mon Sep 17 00:00:00 2001 From: xm Date: Sat, 11 Dec 2021 17:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=B8=E8=B4=A8=E7=AD=BE=E6=94=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=85=BC=E5=AE=B9=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/signListController.java | 6 +- .../resources/mapper/Archive_MasterMapper.xml | 3 + .../WEB-INF/views/signListDir/signList.jsp | 100 +++++++++++++----- 3 files changed, 76 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index 94c975f0..b3ed2e7f 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -8,7 +8,6 @@ package com.emr.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.emr.dao.Archive_MasterMapper; import com.emr.entity.*; import com.emr.service.*; import com.emr.util.IDHelper; @@ -20,9 +19,6 @@ import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.axis.encoding.XMLType; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.session.Session; -import org.apache.shiro.subject.Subject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -171,7 +167,7 @@ public class signListController { request.setCharacterEncoding("utf-8"); String result = ""; SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - if (StringUtils.isNotBlank(archiveMasterVo.getInpNo()) && StringUtils.isNotBlank(archiveMasterVo.getVisitId())) { + if ((StringUtils.isNotBlank(archiveMasterVo.getInpNo()) && StringUtils.isNotBlank(archiveMasterVo.getVisitId())) || (StringUtils.isNotBlank(archiveMasterVo.getPatientId()) && StringUtils.isNotBlank(archiveMasterVo.getVisitId()))) { List master = archiveMasterService.selectByCol(archiveMasterVo); Sign_List signList = new Sign_List(); signList.setOtherInfo("强制签收"); diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 62537916..2ee737a0 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -189,6 +189,9 @@ and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' + + and m.patient_id like '%'+#{patientId,jdbcType=NCHAR}+'%' + and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%' diff --git a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp index a494d0d6..89fc8016 100644 --- a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp +++ b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp @@ -2165,18 +2165,24 @@ }); }); - function verinfyFun(){ + function verinfyFun() { //强制签收 - var signVal= $("#archiveMsg").val(); - signVal=signVal.trim(); - var signArr=signVal.split("-"); - var inpNo=signArr[0]; - var visitId=signArr[1]; + var signVal = $("#archiveMsg").val(); + signVal = signVal.trim(); + var visitId; + if (signVal.includes("-")) { + var signArr = signVal.split("-"); + var inpNo = signArr[0]; + visitId = signArr[1]; + } else if (signVal.length > 12) { + var patientId = signVal.slice(0, 11); + visitId = signVal.slice(12); + } //归档状态改为初审还是有就是初审内容保存 $.ajax({ url: "${path}/signList/addSignListForce", type: "POST", - data: {inpNo:inpNo, visitId: visitId,formToken:$("#formToken").val()}, + data: {inpNo: inpNo, patientId: patientId, visitId: visitId, formToken: $("#formToken").val()}, success: function (result) { $('#table').bootstrapTable('refresh'); document.getElementById('archiveIdSign').select(); @@ -4001,8 +4007,41 @@ } }); } + + function updateSignStateFun2(patientId, visitId, isSign) { + $.ajax({ + url: "${path}/signList/addSignList", + type: "POST", + data: {patientId: patientId, visitId: visitId, isSign: isSign, formToken: $("#formToken").val()}, + success: function (result) { + if (result.indexOf("成功") != -1) { + $('#archiveIdSign').val(''); + setFormToken(); + //刷新 + $('#table').bootstrapTable('refresh'); + toastr.success(result); + } else if (result.indexOf("该病历归档医生或护士尚未提交") != -1) { + var r = $('#archiveIdSign').val(); + $("#archiveMsg").val($('#archiveIdSign').val()); + //生成表单token,防止表单重复提交 + // setFormToken(); + //弹窗是否强制提交 + $('#verinfyQZModal').modal({ + backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 + keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + } else { + toastr.warning(result); + } + }, error: function () { + toastr.error("操作失败!"); + } + }); + } + //空格事件绑定 - $('#verinfyQZModal').bind('keyup', function(event) { + $('#verinfyQZModal').bind('keyup', function (event) { if (event.keyCode == "32") { //空格执行查询 $('#verinfyQZBtn').click(); @@ -4010,7 +4049,7 @@ }); //回车事件绑定 - $('#archiveIdSign').bind('keyup', function(event) { + $('#archiveIdSign').bind('keyup', function (event) { if (event.keyCode == "13") { //回车执行查询 $('#signBtn2').click(); @@ -4019,20 +4058,25 @@ $("#signBtn2").click(function () { //签收 - var signVal= $('#archiveIdSign').val(); - signVal=signVal.trim(); - if(signVal==null || signVal==""){ + var signVal = $('#archiveIdSign').val(); + signVal = signVal.trim(); + if (signVal == null || signVal == "") { toastr.warning("签收值不能为空!"); return; } - if(signVal.indexOf("-")!=-1){ - var signArr=signVal.split("-"); - var inpNo=signArr[0]; - var visitId=signArr[1]; - var isSign=1; - updateSignStateFun(inpNo,visitId,isSign); - }else{ - toastr.warning("签收值格式应为：住院号-住院次数!"); + if (signVal.indexOf("-") != -1) { + var signArr = signVal.split("-"); + var inpNo = signArr[0]; + var visitId = signArr[1]; + var isSign = 1; + updateSignStateFun(inpNo, visitId, isSign); + } else if (signVal.length >= 13) { + var patientId = signVal.slice(0, 11); + var visitId = signVal.slice(12); + var isSign = 1; + updateSignStateFun2(patientId, visitId, isSign); + } else { + toastr.warning("签收值格式应为：住院号-住院次数!或长度大于12！"); return; } @@ -4041,17 +4085,17 @@ $("#signBtn3").click(function () { //取消签收 //签收 - var signVal= $('#archiveIdSign').val(); - signVal=signVal.trim(); - if(signVal==null || signVal==""){ + var signVal = $('#archiveIdSign').val(); + signVal = signVal.trim(); + if (signVal == null || signVal == "") { toastr.warning("签收值不能为空!"); return; } - if(signVal.indexOf("-")!=-1){ - var signArr=signVal.split("-"); - var inpNo=signArr[0]; - var visitId=signArr[1]; - var isSign=0; + if (signVal.indexOf("-") != -1) { + var signArr = signVal.split("-"); + var inpNo = signArr[0]; + var visitId = signArr[1]; + var isSign = 0; //updateSignStateFun(inpNo,visitId,isSign); $('#archiveIdSign').val(''); }else{