From 2ae957e36cd0ef639e259adc8679cb673463848f Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Thu, 6 Jul 2023 11:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=A1=B5=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ipml/Archive_MasterServiceImpl.java | 20 +++- .../views/beHospitaledDir/beHospList.jsp | 2 + .../WEB-INF/views/commitDir/commitList.jsp | 3 +- .../views/lastVerifyDir/lastVerifyList.jsp | 91 +------------------ .../WEB-INF/views/signListDir/signList.jsp | 3 +- .../unfileMedicalDir/unfileMedicalList.jsp | 2 + 6 files changed, 30 insertions(+), 91 deletions(-) diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index bce6a575..e5fe5a64 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -187,8 +187,26 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { PageHelper.offsetPage(offset, limit); } List list = archiveMasterMapper.selectByLast(archiveMasterVo); + if(list!=null && list.size()>0) { + Emr_Dictionary dic = new Emr_Dictionary(); + dic.setEffective(1); + dic.setTypecode("dept_code"); + setNameAndPrintFlagNew(archiveMasterVo, list); + List dicList = emrDictionaryService.dicByTypeCode(dic); + //转换科室 + Map codeMap = ListUtils.toMap(dicList, Emr_Dictionary::getCode); + Setters.instance().list(list).cycleSetProperties(p -> { + String deptCode = p.getDeptName(); + if(StringUtils.isNotBlank(deptCode) && codeMap.containsKey(deptCode)){ + String deptName = codeMap.get(deptCode).getName(); + p.setDeptName(deptName); + } + }); + } + + //科室列表 //设置医生、护士名称和打印标识 - setNameAndPrintFlag(archiveMasterVo, list); + return list; } diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 6b1e2233..a34f274f 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -4906,8 +4906,10 @@ $("#inpSource").val(data.source) $("#inpFlag").val(data.flag) $("#pdfPathVal").val(data.pdfPath) + $("#idPdfT").val(data.id); } }); + $("#inpId").val(detailId); $('#assortModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index 1691eb4e..900ad080 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -4243,9 +4243,10 @@ $("#inpSource").val(data.source) $("#inpFlag").val(data.flag) $("#pdfPathVal").val(data.pdfPath) + $("#idPdfT").val(data.id); } }); - + $("#inpId").val(detailId); $('#assortModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 2a95b8f8..7e2bdf0b 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -3301,9 +3301,7 @@ fileName: document.title }, rowStyle: rowStyle,//通过自定义函数设置行样式 - // showToggle: false, //是否显示详细视图和列表视图的切换按钮 - // cardView: false, //是否显示详细视图 - // detailView: false, //是否显示父子表 + // 是否显示父子表 queryParams: function (params) { var currPageSize = this.pageSize; if (currPageSize == 2) { @@ -3320,14 +3318,6 @@ limit = currPageSize; this.pageSize = currPageSize; } - // var url = window.location.href; - // var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); - // if (deptName != null && deptName != '') { - // deptName += "," + $("#deptName").val(); - // } else { - // deptName = $("#deptName").val(); - // } - // var deptName = $("#deptName").val(); if (deptName.indexOf("") != -1) { deptName = ""; @@ -3339,21 +3329,14 @@ limit: limit, //页面大小 offset: offset, //页码 order: params.order, //排位命令（desc，asc） - //id: $("#id").val(), - // idNo: $("#idNo").val(), inpNo: "" + $("#inpNo").val(), visitId: "" + $("#visitId").val(), name: "" + $("#name").val(), - //archivestate: "" + $("#archivestate").val(), deptName: deptName, startDateTo: $("#startDateTo").val(), endDateTo: $("#endDateTo").val(), isscaned: $("#isscaned").val(), isScanning: $("#isScanning").val(), - - /*signer: "" + $("#signer").val(),*/ - //startSignDate: $("#startSignDate").val(), - //endSignDate: $("#endSignDate").val(), isSign: $("#isSign").val(), printNum: $("#printNum").val(), isFault: $("#isFault").val(), @@ -3383,100 +3366,30 @@ field: 'inpNo', align: 'left', valign: 'middle', - /*formatter: function (value, row, index) { - //console.log(row); - var redFlag = row.numb; - var a = ""; - if (redFlag == 0) { - a = value; - } else { - //缺陷 - a = '' + value + ''; - } - return a; - }*/ }, { title: '住院次数', field: 'visitId', align: 'center', valign: 'middle', - /*formatter: function (value, row, index) { - var redFlag = row.numb; - var a = ""; - if (redFlag == 0) { - a = value; - } else { - //缺陷 - a = '' + value + ''; - } - return a; - }*/ }, { title: '姓名', field: 'name', align: 'left', valign: 'middle', - /*formatter: function (value, row, index) { - var redFlag = row.numb; - var a = ""; - if (redFlag == 0) { - if (value == null) { - a = ""; - } else { - a = value; - } - } else { - //缺陷 - a = '' + value + ''; - } - return a; - }*/ }, { title: '性别', field: 'sex', align: 'center', valign: 'middle', - /*formatter: function (value, row, index) { - var redFlag = row.numb; - var a = ""; - if (value == null || value == "null") { - a = ""; - } else { - a = value; - } - if (redFlag != 0) { - //缺陷 - a = '' + a + ''; - } - return a; - }*/ }, - // { - // title: '身份证号', - // field: 'idNo', - // align: 'center', - // valign: 'middle', - // visible: false - // }, { title: '出院科室', field: 'deptName', align: 'left', valign: 'middle', - /*formatter: function (value, row, index) { - var redFlag = row.numb; - var a = ""; - if (redFlag == 0) { - a = value; - } else { - //缺陷 - a = '' + value + ''; - } - return a; - }*/ }, { title: '出院日期', @@ -4441,8 +4354,10 @@ $("#inpFlag").val(data.flag) $("#pdfPathVal").val(data.pdfPath) $("#pathPdf").val(data.pdfPath); + $("#idPdfT").val(data.id); } }); + $("#inpId").val(detailId); $('#assortModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 diff --git a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp index fb3d93be..04304cc6 100644 --- a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp +++ b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp @@ -4033,9 +4033,10 @@ $("#inpSource").val(data.source) $("#inpFlag").val(data.flag) $("#pdfPathVal").val(data.pdfPath) + $("#idPdfT").val(data.id); } }); - + $("#inpId").val(detailId); $('#assortModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index b01fcc43..bc6d3032 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -3835,8 +3835,10 @@ $("#inpSource").val(data.source) $("#inpFlag").val(data.flag) $("#pdfPathVal").val(data.pdfPath) + $("#idPdfT").val(data.id); } }); + $("#inpId").val(detailId); $('#assortModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。