linjj
/
emr_record_czry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
master
wangxh 6 years ago
parent f76e2e1ac6
commit 00c425a045
5 changed files with 1476 additions and 1322 deletions
Show Stats Download Patch File Download Diff File

933
src/main/java/com/emr/controller/commomSearch/CommomSearchController.java
View File

File diff suppressed because it is too large Load Diff

35
src/main/java/com/emr/entity/emrPrintAndDownLoad/EmrPrintDownloadInfo.java
Unescape Escape View File

@ -19,6 +19,8 @@ public class EmrPrintDownloadInfo implements Serializable {
private String creater;
private String ip;
private static final long serialVersionUID = 1L;
public Integer getId() {
@ -85,21 +87,26 @@ public class EmrPrintDownloadInfo implements Serializable {
this.creater = creater == null ? null : creater.trim();
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", patientId=").append(patientId);
sb.append(", assortId=").append(assortId);
sb.append(", scanPage=").append(scanPage);
sb.append(", typeId=").append(typeId);
sb.append(", operType=").append(operType);
sb.append(", createTime=").append(createTime);
sb.append(", creater=").append(creater);
sb.append("]");
return sb.toString();
return "EmrPrintDownloadInfo{" +
"id=" + id +
", patientId='" + patientId + '\'' +
", assortId='" + assortId + '\'' +
", scanPage='" + scanPage + '\'' +
", typeId=" + typeId +
", operType=" + operType +
", createTime='" + createTime + '\'' +
", creater='" + creater + '\'' +
", ip='" + ip + '\'' +
'}';
}
}

1412
src/main/resources/mapper/CommomMapper.xml
View File

File diff suppressed because it is too large Load Diff

416
src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml
Unescape Escape View File

@ -1,198 +1,228 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.emr.dao.emrPrintAndDownLoad.EmrPrintDownloadInfoMapper" >
<resultMap id="BaseResultMap" type="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" >
<result column="id" property="id" jdbcType="INTEGER" />
<result column="patient_id" property="patientId" jdbcType="NVARCHAR" />
<result column="assort_id" property="assortId" jdbcType="VARCHAR" />
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR" />
<result column="type_id" property="typeId" jdbcType="INTEGER" />
<result column="oper_type" property="operType" jdbcType="SMALLINT" />
<result column="create_time" property="createTime" jdbcType="NVARCHAR" />
<result column="creater" property="creater" jdbcType="NVARCHAR" />
</resultMap>
<resultMap id="BaseResultMapVo" type="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo" >
<result column="id" property="id" jdbcType="INTEGER" />
<result column="patient_id" property="patientId" jdbcType="NVARCHAR" />
<result column="assort_id" property="assortId" jdbcType="VARCHAR" />
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR" />
<result column="type_id" property="typeId" jdbcType="INTEGER" />
<result column="oper_type" property="operType" jdbcType="SMALLINT" />
<result column="create_time" property="createTime" jdbcType="NVARCHAR" />
<result column="creater" property="creater" jdbcType="NVARCHAR" />
<result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR" />
<result column="admiss_times" property="admissTimes" jdbcType="SMALLINT" />
<result column="type_name" property="typeName" jdbcType="NVARCHAR" />
<result column="assort_id" property="assortId" jdbcType="NVARCHAR" />
<result column="assort_name" property="assortName" jdbcType="NVARCHAR" />
</resultMap>
<insert id="insert" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" >
insert into emr_print_download_info (id, patient_id, assort_id,
scan_page, type_id, oper_type,
create_time, creater)
values (#{id,jdbcType=INTEGER}, #{patientId,jdbcType=NVARCHAR}, #{assortId,jdbcType=VARCHAR},
#{scanPage,jdbcType=NVARCHAR}, #{typeId,jdbcType=INTEGER}, #{operType,jdbcType=SMALLINT},
#{createTime,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" >
insert into emr_print_download_info
<trim prefix="(" suffix=")" suffixOverrides="," >
<if test="id != null" >
id,
</if>
<if test="patientId != null" >
patient_id,
</if>
<if test="assortId != null" >
assort_id,
</if>
<if test="scanPage != null" >
scan_page,
</if>
<if test="typeId != null" >
type_id,
</if>
<if test="operType != null" >
oper_type,
</if>
<if test="createTime != null" >
create_time,
</if>
<if test="creater != null" >
creater,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides="," >
<if test="id != null" >
#{id,jdbcType=INTEGER},
</if>
<if test="patientId != null" >
#{patientId,jdbcType=NVARCHAR},
</if>
<if test="assortId != null" >
#{assortId,jdbcType=VARCHAR},
</if>
<if test="scanPage != null" >
#{scanPage,jdbcType=NVARCHAR},
</if>
<if test="typeId != null" >
#{typeId,jdbcType=INTEGER},
</if>
<if test="operType != null" >
#{operType,jdbcType=SMALLINT},
</if>
<if test="createTime != null" >
#{createTime,jdbcType=NVARCHAR},
</if>
<if test="creater != null" >
#{creater,jdbcType=NVARCHAR},
</if>
</trim>
</insert>
<!--批量添加下载记录-->
<insert id="SimpleInsert" parameterType="java.util.List">
insert into emr_print_download_info (patient_id, scan_page,assort_id,
type_id, oper_type, create_time,
creater)
<foreach collection="list" item="items" separator="union">
select #{items.patientId,jdbcType=NVARCHAR}, #{items.scanPage,jdbcType=NVARCHAR},#{items.assortId,jdbcType=VARCHAR},
#{items.typeId,jdbcType=INTEGER}, #{items.operType,jdbcType=SMALLINT}, #{items.createTime,jdbcType=NVARCHAR},
#{items.creater,jdbcType=NVARCHAR}
</foreach>
</insert>
<mapper namespace="com.emr.dao.emrPrintAndDownLoad.EmrPrintDownloadInfoMapper">
<resultMap id="BaseResultMap" type="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
<result column="id" property="id" jdbcType="INTEGER"/>
<result column="patient_id" property="patientId" jdbcType="NVARCHAR"/>
<result column="assort_id" property="assortId" jdbcType="VARCHAR"/>
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR"/>
<result column="type_id" property="typeId" jdbcType="INTEGER"/>
<result column="oper_type" property="operType" jdbcType="SMALLINT"/>
<result column="create_time" property="createTime" jdbcType="NVARCHAR"/>
<result column="creater" property="creater" jdbcType="NVARCHAR"/>
<result column="ip" property="ip" jdbcType="NVARCHAR"/>
</resultMap>
<resultMap id="BaseResultMapVo" type="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
<result column="id" property="id" jdbcType="INTEGER"/>
<result column="patient_id" property="patientId" jdbcType="NVARCHAR"/>
<result column="assort_id" property="assortId" jdbcType="VARCHAR"/>
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR"/>
<result column="type_id" property="typeId" jdbcType="INTEGER"/>
<result column="oper_type" property="operType" jdbcType="SMALLINT"/>
<result column="create_time" property="createTime" jdbcType="NVARCHAR"/>
<result column="creater" property="creater" jdbcType="NVARCHAR"/>
<result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR"/>
<result column="admiss_times" property="admissTimes" jdbcType="SMALLINT"/>
<result column="type_name" property="typeName" jdbcType="NVARCHAR"/>
<result column="assort_id" property="assortId" jdbcType="NVARCHAR"/>
<result column="assort_name" property="assortName" jdbcType="NVARCHAR"/>
<result column="ip" property="ip" jdbcType="NVARCHAR"/>
</resultMap>
<insert id="insert" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
insert into emr_print_download_info (id, patient_id, assort_id,
scan_page, type_id, oper_type,
create_time, creater)
values (#{id,jdbcType=INTEGER}, #{patientId,jdbcType=NVARCHAR}, #{assortId,jdbcType=VARCHAR},
#{scanPage,jdbcType=NVARCHAR}, #{typeId,jdbcType=INTEGER}, #{operType,jdbcType=SMALLINT},
#{createTime,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
insert into emr_print_download_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="patientId != null">
patient_id,
</if>
<if test="assortId != null">
assort_id,
</if>
<if test="scanPage != null">
scan_page,
</if>
<if test="typeId != null">
type_id,
</if>
<if test="operType != null">
oper_type,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="creater != null">
creater,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="patientId != null">
#{patientId,jdbcType=NVARCHAR},
</if>
<if test="assortId != null">
#{assortId,jdbcType=VARCHAR},
</if>
<if test="scanPage != null">
#{scanPage,jdbcType=NVARCHAR},
</if>
<if test="typeId != null">
#{typeId,jdbcType=INTEGER},
</if>
<if test="operType != null">
#{operType,jdbcType=SMALLINT},
</if>
<if test="createTime != null">
#{createTime,jdbcType=NVARCHAR},
</if>
<if test="creater != null">
#{creater,jdbcType=NVARCHAR},
</if>
</trim>
</insert>
<!--批量添加下载记录-->
<insert id="SimpleInsert" parameterType="java.util.List">
insert into emr_print_download_info (patient_id, scan_page,assort_id,
type_id, oper_type, create_time,
creater)
<foreach collection="list" item="items" separator="union">
select #{items.patientId,jdbcType=NVARCHAR},
#{items.scanPage,jdbcType=NVARCHAR},#{items.assortId,jdbcType=VARCHAR},
#{items.typeId,jdbcType=INTEGER}, #{items.operType,jdbcType=SMALLINT},
#{items.createTime,jdbcType=NVARCHAR},
#{items.creater,jdbcType=NVARCHAR}
</foreach>
</insert>
<!--查询列表-->
<select id="selectAll" resultMap="BaseResultMapVo" parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
SELECT
emr_print_download_info.id,
emr_print_download_info.create_time,
emr_print_download_info.patient_id,
emr_print_download_info.scan_page,
(
commomtable.${flag} + '/' + emr_print_download_info.scan_page
) scanAddr,
emr_print_download_info.creater,
commomtable.name,
commomtable.admiss_times,
commomtable.inpatient_no,
emr_type.type_name,
zd_assort.assort_name
FROM
emr_print_download_info
INNER JOIN commomtable ON emr_print_download_info.patient_id = commomtable.patient_id
<if test="record.name != null and record.name != ''">
AND commomtable.name LIKE '%${record.name}%'
</if>
<if test="record.inpatientNo != null and record.inpatientNo != ''">
AND commomtable.inpatient_no LIKE '%${record.inpatientNo}%'
</if>
LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id
INNER JOIN zd_assort ON emr_print_download_info.assort_id = zd_assort.assort_id
WHERE
emr_print_download_info.oper_type = #{record.operType}
<if test="record.assortId != null and record.assortId != ''">
AND emr_print_download_info.assort_id = #{record.assortId}
</if>
<if test="record.creater != null and record.creater != ''">
AND emr_print_download_info.creater LIKE '%${record.creater}%'
</if>
<if test="record.startTime != '' and record.startTime != null">
AND emr_print_download_info.create_time &gt;= '${record.startTime} 00:00:00'
<if test="record.endTime != '' and record.endTime != null">
AND emr_print_download_info.create_time &lt;= '${record.endTime} 23:59:59'
</if>
</if>
order by emr_print_download_info.create_time desc
</select>
<!--按id集合查-->
<select id="selectAllByIds" resultMap="BaseResultMapVo">
SELECT
emr_print_download_info.id,
emr_print_download_info.create_time,
emr_print_download_info.patient_id,
emr_print_download_info.scan_page,
(
commomtable.${flag} + '/' + emr_print_download_info.scan_page
) scanAddr,
emr_print_download_info.creater,
commomtable.name,
commomtable.inpatient_no,
commomtable.admiss_times,
emr_type.type_name,
zd_assort.assort_name
FROM
emr_print_download_info
INNER JOIN commomtable ON emr_print_download_info.patient_id = commomtable.patient_id
LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id
INNER JOIN zd_assort ON emr_print_download_info.assort_id = zd_assort.assort_id
where emr_print_download_info.id in (${ids})
</select>
<!--查询最近打印次数-->
<select id="getPrintCount" resultMap="BaseResultMapVo">
SELECT
top (
SELECT
times
FROM
emr_comom_set
WHERE
id = 1
) COUNT(scan_page) printCount,
ISNULL(emr_type.type_name,'无') typeName,
CONVERT(varchar(100),emr_print_download_info.create_time,23) create_time,
emr_print_download_info.creater
FROM
emr_print_download_info
LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id
WHERE
oper_type = 1
AND patient_id = #{patientId}
GROUP BY
emr_print_download_info.creater,
<!--查询列表-->
<select id="selectAll" resultMap="BaseResultMapVo"
parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
SELECT
emr_print_download_info.id,
emr_print_download_info.create_time,
emr_type.type_name
ORDER BY
emr_print_download_info.create_time DESC
</select>
emr_print_download_info.patient_id,
emr_print_download_info.scan_page,
(
commomtable.${flag} + '/' + emr_print_download_info.scan_page
) scanAddr,
emr_print_download_info.creater,
commomtable.name,
commomtable.admiss_times,
commomtable.inpatient_no,
emr_type.type_name,
zd_assort.assort_name
FROM
emr_print_download_info
INNER JOIN commomtable ON emr_print_download_info.patient_id = commomtable.patient_id
<if test="record.name != null and record.name != ''">
AND commomtable.name LIKE '%${record.name}%'
</if>
<if test="record.inpatientNo != null and record.inpatientNo != ''">
AND commomtable.inpatient_no LIKE '%${record.inpatientNo}%'
</if>
LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id
INNER JOIN zd_assort ON emr_print_download_info.assort_id = zd_assort.assort_id
WHERE
emr_print_download_info.oper_type = #{record.operType}
<if test="record.assortId != null and record.assortId != ''">
AND emr_print_download_info.assort_id = #{record.assortId}
</if>
<if test="record.creater != null and record.creater != ''">
AND emr_print_download_info.creater LIKE '%${record.creater}%'
</if>
<if test="record.startTime != '' and record.startTime != null">
AND emr_print_download_info.create_time &gt;= '${record.startTime} 00:00:00'
<if test="record.endTime != '' and record.endTime != null">
AND emr_print_download_info.create_time &lt;= '${record.endTime} 23:59:59'
</if>
</if>
order by emr_print_download_info.create_time desc
</select>
<!--按id集合查-->
<select id="selectAllByIds" resultMap="BaseResultMapVo">
SELECT
emr_print_download_info.id,
emr_print_download_info.create_time,
emr_print_download_info.patient_id,
emr_print_download_info.scan_page,
(
commomtable.${flag} + '/' + emr_print_download_info.scan_page
) scanAddr,
emr_print_download_info.creater,
commomtable.name,
commomtable.inpatient_no,
commomtable.admiss_times,
emr_type.type_name,
zd_assort.assort_name
FROM
emr_print_download_info
INNER JOIN commomtable ON emr_print_download_info.patient_id = commomtable.patient_id
LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id
INNER JOIN zd_assort ON emr_print_download_info.assort_id = zd_assort.assort_id
where emr_print_download_info.id in (${ids})
</select>
<!--查询最近打印次数-->
<select id="getPrintCount" resultMap="BaseResultMapVo">
SELECT
top(
SELECT
times
FROM
emr_comom_set
WHERE
id = 1
)
COUNT(
scan_page)
printCount,
ISNULL(
emr_type
.
type_name,
'无')
typeName,
CONVERT(
varchar(
100),
emr_print_download_info
.
create_time,
23)
create_time,
emr_print_download_info
.
creater
FROM
emr_print_download_info
LEFT
JOIN
emr_type
ON emr_print_download_info
.
type_id =
emr_type
.
id
WHERE
oper_type = 1
AND patient_id = #{patientId}
GROUP BY
emr_print_download_info.creater,
emr_print_download_info.create_time,
emr_type.type_name
ORDER BY
emr_print_download_info.create_time DESC
</select>
</mapper>

2
src/main/webapp/index.jsp
Unescape Escape View File

@ -210,7 +210,7 @@
<div class="page-content-wrapper">
<div class="page-content">
<div class="container-fluid">
<iframe class="row-fluid" style="width:100%;height: 100%" src="${path}/commom/commomList" id="iFrame1" name="iFrame1" scrolling="yes" frameborder="0"></iframe>
<iframe class="row-fluid" style="width:100%;height:100%;" src="${path}/commom/commomList" id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save