emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

纸质签收功能，新增兼容新的条码格式

Browse Source
master
xm 4 years ago
parent e3b66431e5
commit 15b1b94a40
3 changed files with 76 additions and 33 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/com/emr/controller/signListController.java
Unescape Escape View File

@ -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<Archive_Master> master = archiveMasterService.selectByCol(archiveMasterVo);
Sign_List signList = new Sign_List();
signList.setOtherInfo("强制签收");

3
src/main/resources/mapper/Archive_MasterMapper.xml
Unescape Escape View File

@ -189,6 +189,9 @@
<if test="inpNo != null and inpNo != ''">
and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%'
</if>
<if test="patientId != null and patientId != ''">
and m.patient_id like '%'+#{patientId,jdbcType=NCHAR}+'%'
</if>
<if test="bedNumber != null and bedNumber != ''">
and m.bed_number like '%'+#{bedNumber,jdbcType=NVARCHAR}+'%'

100
src/main/webapp/WEB-INF/views/signListDir/signList.jsp
Unescape Escape View File

@ -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{

Write Preview
Loading…
Cancel
Save