打印日志增加费用一列,修复打印预览只有一张是上传图片报错、打印下载日志因升级mybatis安全漏洞导致字段类型不匹配

master
zengwh 4 years ago
parent 40d9a4c56a
commit a80549b702

@ -136,8 +136,8 @@ public class PrintOrDownLoadInfoController {
} }
private void Export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag,Integer operType){ private void Export174(HttpServletResponse response,EmrPrintOrDownLoadInfoVo printOrDownLoadInfoVo,String checks,String flag,Integer operType){
String tableThNames = "操作人,姓名,病案号,住院次数,类别,文件名,页数,用途,操作时间,ip地址"; String tableThNames = "操作人,姓名,病案号,住院次数,类别,文件名,页数,费用,用途,操作时间,ip地址";
String fieldCns = "creater,name,inpatientNo,admissTimes,assortName,scanPage,printCount,typeName,createTime,ip"; String fieldCns = "creater,name,inpatientNo,admissTimes,assortName,scanPage,printCount,printFee,typeName,createTime,ip";
//构造excel的数据 //构造excel的数据
try{ try{
List<EmrPrintOrDownLoadInfoVo> list = new ArrayList<>(); List<EmrPrintOrDownLoadInfoVo> list = new ArrayList<>();

@ -12,8 +12,8 @@ import com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo;
import com.emr.vo.commomSearch.ScanPathVo; import com.emr.vo.commomSearch.ScanPathVo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.util.CollectionUtils; import org.apache.shiro.util.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
@ -28,6 +28,8 @@ import java.util.*;
@Service @Service
@Transactional @Transactional
public class PrintOrDownLoadInfoService { public class PrintOrDownLoadInfoService {
@Value("${printPrice}")
private Float printPrice;
@Autowired @Autowired
private EmrPrintDownloadInfoMapper printDownloadInfoMapper; private EmrPrintDownloadInfoMapper printDownloadInfoMapper;
@Autowired @Autowired
@ -190,6 +192,7 @@ public class PrintOrDownLoadInfoService {
vo.setScanPage(null); vo.setScanPage(null);
} }
vo.setPrintCount(printCount); vo.setPrintCount(printCount);
vo.setPrintFee(printCount * printPrice);
} }
} }
return list; return list;

@ -24,4 +24,6 @@ public class EmrPrintOrDownLoadInfoVo extends EmrPrintDownloadInfo {
private String endTime; private String endTime;
private Integer printCount; private Integer printCount;
private Float printFee;
} }

@ -8,3 +8,5 @@
解决xp系统使用病案预览全屏按钮点击失效问题 解决xp系统使用病案预览全屏按钮点击失效问题
#2.0.5 2022-01-14 #2.0.5 2022-01-14
升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2,借阅申请、审批列表放开已过期 升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2,借阅申请、审批列表放开已过期
#2.0.6 2022-01-17
打印日志增加费用一列修复打印预览只有一张是上传图片报错、打印下载日志因升级mybatis安全漏洞导致字段类型不匹配

@ -7,6 +7,14 @@ POWER_JSP = http://localhost:8081/power
#\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 #\u672C\u8EAB\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
EMR_RECORD_JSP = http://localhost:8083/emr_record 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 #webSocket\u670D\u52A1\u5668\u5730\u5740
@ -31,3 +39,6 @@ picPath = static/pdfWaterSet/upload/
waterPicPath = D:/jiashi/reload/ waterPicPath = D:/jiashi/reload/
waterTifToJpgPath = D:/jiashi/tifToJpgLoad/ waterTifToJpgPath = D:/jiashi/tifToJpgLoad/
#\u6253\u5370\u6BCF\u9875\u7EB8\u5F20\u8D39\u7528
printPrice = 0.5

@ -14,17 +14,17 @@
<resultMap id="BaseResultMapVo" type="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo" > <resultMap id="BaseResultMapVo" type="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo" >
<result column="id" property="id" jdbcType="INTEGER" /> <result column="id" property="id" jdbcType="INTEGER" />
<result column="patient_id" property="patientId" jdbcType="NVARCHAR" /> <result column="patient_id" property="patientId" jdbcType="NVARCHAR" />
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR" /> <result column="scan_page" property="scanPage" jdbcType="VARCHAR" />
<result column="type_id" property="typeId" jdbcType="INTEGER" /> <result column="type_id" property="typeId" jdbcType="INTEGER" />
<result column="oper_type" property="operType" jdbcType="SMALLINT" /> <result column="oper_type" property="operType" jdbcType="SMALLINT" />
<result column="create_time" property="createTime" jdbcType="NVARCHAR" /> <result column="create_time" property="createTime" jdbcType="NVARCHAR" />
<result column="creater" property="creater" jdbcType="NVARCHAR" /> <result column="creater" property="creater" jdbcType="NVARCHAR" />
<result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR" /> <result column="inpatient_no" property="inpatientNo" jdbcType="VARCHAR" />
<result column="admiss_times" property="admissTimes" jdbcType="SMALLINT" /> <result column="admiss_times" property="admissTimes" jdbcType="SMALLINT" />
<result column="type_name" property="typeName" jdbcType="NVARCHAR" /> <result column="type_name" property="typeName" jdbcType="VARCHAR" />
<result column="assort_id" property="assortId" jdbcType="NVARCHAR" /> <result column="assort_id" property="assortId" jdbcType="VARCHAR" />
<result column="assort_name" property="assortName" jdbcType="NVARCHAR" /> <result column="assort_name" property="assortName" jdbcType="VARCHAR" />
<result column="ip" property="ip" jdbcType="NVARCHAR" /> <result column="ip" property="ip" jdbcType="VARCHAR" />
</resultMap> </resultMap>
<sql id="Base_Column_List" > <sql id="Base_Column_List" >
id, patient_id, scan_page, type_id, oper_type, create_time, creater, ip id, patient_id, scan_page, type_id, oper_type, create_time, creater, ip

@ -164,7 +164,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="${path}/static/js/otherManage/downloadInfoCommomJs174.js"></script> <script type="text/javascript" src="${path}/static/js/otherManage/downloadInfoCommomJs174.js?t=2022-01-17"></script>
<script type="text/javascript" src="${path}/static/js/otherManage/downloadInfoList174.js"></script> <script type="text/javascript" src="${path}/static/js/otherManage/downloadInfoList174.js"></script>
<script type="text/javascript" src="${path}/static/js/dateUtil.js"></script> <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
</body> </body>

@ -164,7 +164,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="${path}/static/js/otherManage/downloadInfoCommomJs174.js"></script> <script type="text/javascript" src="${path}/static/js/otherManage/downloadInfoCommomJs174.js?t=2022-01-17"></script>
<script type="text/javascript" src="${path}/static/js/otherManage/printInfoList174.js"></script> <script type="text/javascript" src="${path}/static/js/otherManage/printInfoList174.js"></script>
<script type="text/javascript" src="${path}/static/js/dateUtil.js"></script> <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
</body> </body>

@ -937,7 +937,7 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecord174.js?t=2019-12-20"></script> <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecord174.js?t=2022-01-17"></script>
<script type="text/javascript" <script type="text/javascript"
src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script> src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script>
<script type="text/javascript" src="${path}/static/js/dateUtil.js"></script> <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>

@ -22,19 +22,8 @@ function selectAssortsSelect(){
}) })
} }
var pageNumber; var pageNumber;
$('#mytab').bootstrapTable({ var columns = [];
toolbar: '#toolbar', //工具按钮用哪个容器 columns.push(
striped: true, //是否显示行间隔色
cache: false, //是否使用缓存默认为true所以一般情况下需要设置一下这个属性*
pagination: true, //是否显示分页(*
sidePagination: "server", //分页方式client客户端分页server服务端分页*
paginationPreText : '上一页',
paginationNextText : '下一页',
pageNumber: 1, //初始化加载第一页,默认第一页
pageSize: 10, //每页的记录行数(*
pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
height: $(window).height()-139, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:[
{ {
title:'全选', title:'全选',
field:'select', field:'select',
@ -62,58 +51,67 @@ $('#mytab').bootstrapTable({
}, },
{ {
title:'操作人', title:'操作人',
field:'creater', field:'creater'
}, },
{ {
title:'病案号', title:'病案号',
field:'inpatientNo', field:'inpatientNo'
}, },
{ {
title:'姓名', title:'姓名',
field:'name', field:'name'
}, },
{ {
title:'住院次数', title:'住院次数',
field:'admissTimes', field:'admissTimes'
}, },
{ {
title:'类别', title:'类别',
field:'assortName', field:'assortName',
formatter:paramsMatter, formatter:paramsMatter
}, },
{ {
title:'文件名', title:'文件名',
field:'scanPage', field:'scanPage',
formatter:paramsMatter, formatter:paramsMatter
}, },
{ {
title:'页数', title:'页数',
field:'printCount', field:'printCount'
}, }
);
if($("#operType").val() == 1){
columns.push({
title:'费用',
field:'printFee'
});
}
columns.push(
{ {
title:'用途', title:'用途',
field:'typeName', field:'typeName'
}, },
{ {
title:'操作时间', title:'操作时间',
field:'createTime', field:'createTime'
}, },
{ {
title:'ip地址', title:'ip地址',
field:'ip', field:'ip'
}, });
/*{ $('#mytab').bootstrapTable({
title:'操作', toolbar: '#toolbar', //工具按钮用哪个容器
field:'id', striped: true, //是否显示行间隔色
formatter: function(value,row,index){ cache: false, //是否使用缓存默认为true所以一般情况下需要设置一下这个属性*
var deleteOper = row.deleteOper; pagination: true, //是否显示分页(*
if(deleteOper == 1){ sidePagination: "server", //分页方式client客户端分页server服务端分页*
var editanddrop = '<button type="button" onclick="deleteLogById('+row.logId+')" class="btn btn-sm btn-danger">删除</button>'; paginationPreText : '上一页',
return editanddrop; paginationNextText : '下一页',
} pageNumber: 1, //初始化加载第一页,默认第一页
} pageSize: 10, //每页的记录行数(*
}*/ pageList: [5,10,15,20,50,1000],//可供选择的每页的行数(*
], height: $(window).height()-139, //行高如果没有设置height属性表格自动根据记录条数觉得表格高度
columns:columns,
locale:'zh-CN',//中文支持, locale:'zh-CN',//中文支持,
url:path+'/printInfoList/getPrintInfoList',//排序方式 url:path+'/printInfoList/getPrintInfoList',//排序方式
queryParams: function (params) { queryParams: function (params) {

@ -61,6 +61,9 @@ function loadRecord(){
}else if(flag != '' && flag == 'file_path'){ }else if(flag != '' && flag == 'file_path'){
//祈福医院 //祈福医院
rootPaths = data.filePath + ","; rootPaths = data.filePath + ",";
}
if(rootPaths == 'undefined,'){
rootPaths = 'null,';
} }
//拼接新上传图片根目录 //拼接新上传图片根目录
if(data.newPath != null && data.newPath != ''){ if(data.newPath != null && data.newPath != ''){

Loading…
Cancel
Save