From a80549b70218c673ddb72b7429e2084e491a9290 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Mon, 17 Jan 2022 15:39:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=B4=B9=E7=94=A8=E4=B8=80=E5=88=97=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=89=93=E5=8D=B0=E9=A2=84=E8=A7=88=E5=8F=AA=E6=9C=89?= =?UTF-8?q?=E4=B8=80=E5=BC=A0=E6=98=AF=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E3=80=81=E6=89=93=E5=8D=B0=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=9B=A0=E5=8D=87=E7=BA=A7mybatis=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=BC=8F=E6=B4=9E=E5=AF=BC=E8=87=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PrintOrDownLoadInfoController.java | 4 +- .../PrintOrDownLoadInfoService.java | 5 +- .../EmrPrintOrDownLoadInfoVo.java | 2 + src/main/resources/config/README.md | 2 + src/main/resources/config/config.properties | 11 ++ .../EmrPrintDownloadInfoMapper.xml | 12 +- .../views/otherManage/downloadInfoList174.jsp | 2 +- .../views/otherManage/printInfoList174.jsp | 2 +- .../commomSearch/showRecord174.jsp | 2 +- .../js/otherManage/downloadInfoCommomJs174.js | 158 +++++++++--------- .../commomSearch/showRecord174.js | 3 + 11 files changed, 111 insertions(+), 92 deletions(-) diff --git a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java index 9901278..8fa9d24 100644 --- a/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java +++ b/src/main/java/com/emr/controller/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoController.java @@ -136,8 +136,8 @@ public class PrintOrDownLoadInfoController { } private void Export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag,Integer operType){ - String tableThNames = "操作人,姓名,病案号,住院次数,类别,文件名,页数,用途,操作时间,ip地址"; - String fieldCns = "creater,name,inpatientNo,admissTimes,assortName,scanPage,printCount,typeName,createTime,ip"; + String tableThNames = "操作人,姓名,病案号,住院次数,类别,文件名,页数,费用,用途,操作时间,ip地址"; + String fieldCns = "creater,name,inpatientNo,admissTimes,assortName,scanPage,printCount,printFee,typeName,createTime,ip"; //构造excel的数据 try{ List list = new ArrayList<>(); diff --git a/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java b/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java index 7762913..6131a3f 100644 --- a/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java +++ b/src/main/java/com/emr/service/emrPrintOrDownLoadInfo/PrintOrDownLoadInfoService.java @@ -12,8 +12,8 @@ import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo; import com.emr.vo.commomSearch.ScanPathVo; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.util.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.context.request.RequestContextHolder; @@ -28,6 +28,8 @@ import java.util.*; @Service @Transactional public class PrintOrDownLoadInfoService { + @Value("${printPrice}") + private Float printPrice; @Autowired private EmrPrintDownloadInfoMapper printDownloadInfoMapper; @Autowired @@ -190,6 +192,7 @@ public class PrintOrDownLoadInfoService { vo.setScanPage(null); } vo.setPrintCount(printCount); + vo.setPrintFee(printCount * printPrice); } } return list; diff --git a/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java b/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java index bd6d7a2..a16e86c 100644 --- a/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java +++ b/src/main/java/com/emr/vo/EmrPrintOrDownLoadInfo/EmrPrintOrDownLoadInfoVo.java @@ -24,4 +24,6 @@ public class EmrPrintOrDownLoadInfoVo extends EmrPrintDownloadInfo { private String endTime; private Integer printCount; + + private Float printFee; } diff --git a/src/main/resources/config/README.md b/src/main/resources/config/README.md index 15b17ae..a94d001 100644 --- a/src/main/resources/config/README.md +++ b/src/main/resources/config/README.md @@ -8,3 +8,5 @@ 解决xp系统使用病案预览全屏按钮点击失效问题 #2.0.5 2022-01-14 升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2,借阅申请、审批列表放开已过期 +#2.0.6 2022-01-17 +打印日志增加费用一列，修复打印预览只有一张是上传图片报错、打印下载日志因升级mybatis安全漏洞导致字段类型不匹配 diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 69a4564..e85853b 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -7,6 +7,14 @@ POWER_JSP = http://localhost:8081/power #\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 EMR_RECORD_JSP = http://localhost:8083/emr_record +#POWER_IP = 192.168.110.232 +#POWER_URLHEAD = http://192.168.110.232:8081/power +# +#POWER_JSPHEAD = 192.168.110.232 +#POWER_JSP = http://192.168.110.232:8081/power +# +##\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 +#EMR_RECORD_JSP = http://192.168.110.232:8083/emr_record #webSocket\u670D\u52A1\u5668\u5730\u5740 @@ -31,3 +39,6 @@ picPath = static/pdfWaterSet/upload/ waterPicPath = D:/jiashi/reload/ waterTifToJpgPath = D:/jiashi/tifToJpgLoad/ + +#\u6253\u5370\u6BCF\u9875\u7EB8\u5F20\u8D39\u7528 +printPrice = 0.5 diff --git a/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml b/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml index 7178180..be0c71a 100644 --- a/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml +++ b/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml @@ -14,17 +14,17 @@ - + - + - - - - + + + + id, patient_id, scan_page, type_id, oper_type, create_time, creater, ip diff --git a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp index 17e8bd0..c483c83 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp @@ -164,7 +164,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp b/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp index 31cae2b..0a2e937 100644 --- a/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp +++ b/src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp @@ -164,7 +164,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp index 06cdc71..7edcc3e 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp @@ -937,7 +937,7 @@ - + diff --git a/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js b/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js index 14ff0e2..518d838 100644 --- a/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js +++ b/src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js @@ -22,6 +22,83 @@ function selectAssortsSelect(){ }) } var pageNumber; +var columns = []; +columns.push( + { + title:'全选', + field:'select', + checkbox:true, + width:25, + align:'center', + valign:'middle' + }, + { + field:'ids', + visible: false + }, + { + field: 'no', + title: '序号', + sortable: true, + formatter: function (value, row, index) { + //获取每页显示的数量 + var pageSize=$('#mytab').bootstrapTable('getOptions').pageSize; + //获取当前是第几页 + var pageNumber=$('#mytab').bootstrapTable('getOptions').pageNumber; + //返回序号，注意index是从0开始的，所以要加上1 + return pageSize * (pageNumber - 1) + index + 1; + } + }, + { + title:'操作人', + field:'creater' + }, + { + title:'病案号', + field:'inpatientNo' + }, + { + title:'姓名', + field:'name' + }, + { + title:'住院次数', + field:'admissTimes' + }, + { + title:'类别', + field:'assortName', + formatter:paramsMatter + }, + { + title:'文件名', + field:'scanPage', + formatter:paramsMatter + }, + { + title:'页数', + field:'printCount' + } +); +if($("#operType").val() == 1){ + columns.push({ + title:'费用', + field:'printFee' + }); +} +columns.push( + { + title:'用途', + field:'typeName' + }, + { + title:'操作时间', + field:'createTime' + }, + { + title:'ip地址', + field:'ip' + }); $('#mytab').bootstrapTable({ toolbar: '#toolbar', //工具按钮用哪个容器 striped: true, //是否显示行间隔色 @@ -34,86 +111,7 @@ $('#mytab').bootstrapTable({ pageSize: 10, //每页的记录行数（*） pageList: [5,10,15,20,50,1000],//可供选择的每页的行数（*） height: $(window).height()-139, //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度 - columns:[ - { - title:'全选', - field:'select', - checkbox:true, - width:25, - align:'center', - valign:'middle' - }, - { - field:'ids', - visible: false - }, - { - field: 'no', - title: '序号', - sortable: true, - formatter: function (value, row, index) { - //获取每页显示的数量 - var pageSize=$('#mytab').bootstrapTable('getOptions').pageSize; - //获取当前是第几页 - var pageNumber=$('#mytab').bootstrapTable('getOptions').pageNumber; - //返回序号，注意index是从0开始的，所以要加上1 - return pageSize * (pageNumber - 1) + index + 1; - } - }, - { - title:'操作人', - field:'creater', - }, - { - title:'病案号', - field:'inpatientNo', - }, - { - title:'姓名', - field:'name', - }, - { - title:'住院次数', - field:'admissTimes', - }, - { - title:'类别', - field:'assortName', - formatter:paramsMatter, - }, - { - title:'文件名', - field:'scanPage', - formatter:paramsMatter, - }, - { - title:'页数', - field:'printCount', - }, - { - title:'用途', - field:'typeName', - }, - { - title:'操作时间', - field:'createTime', - }, - { - title:'ip地址', - field:'ip', - }, - /*{ - title:'操作', - field:'id', - formatter: function(value,row,index){ - var deleteOper = row.deleteOper; - if(deleteOper == 1){ - var editanddrop = ''; - return editanddrop; - } - } - }*/ - ], + columns:columns, locale:'zh-CN',//中文支持, url:path+'/printInfoList/getPrintInfoList',//排序方式 queryParams: function (params) { diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js index 96aff9e..9a7af1d 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js @@ -62,6 +62,9 @@ function loadRecord(){ //祈福医院 rootPaths = data.filePath + ","; } + if(rootPaths == 'undefined,'){ + rootPaths = 'null,'; + } //拼接新上传图片根目录 if(data.newPath != null && data.newPath != ''){ rootPaths += data.newPath;