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

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" ?> <?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" > <!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" > <mapper namespace="com.emr.dao.emrPrintAndDownLoad.EmrPrintDownloadInfoMapper">
<resultMap id="BaseResultMap" type="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" > <resultMap id="BaseResultMap" type="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
<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="assort_id" property="assortId" jdbcType="VARCHAR" /> <result column="assort_id" property="assortId" jdbcType="VARCHAR"/>
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR" /> <result column="scan_page" property="scanPage" jdbcType="NVARCHAR"/>
<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"/>
</resultMap> <result column="ip" property="ip" jdbcType="NVARCHAR"/>
<resultMap id="BaseResultMapVo" type="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo" > </resultMap>
<result column="id" property="id" jdbcType="INTEGER" /> <resultMap id="BaseResultMapVo" type="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
<result column="patient_id" property="patientId" jdbcType="NVARCHAR" /> <result column="id" property="id" jdbcType="INTEGER"/>
<result column="assort_id" property="assortId" jdbcType="VARCHAR" /> <result column="patient_id" property="patientId" jdbcType="NVARCHAR"/>
<result column="scan_page" property="scanPage" jdbcType="NVARCHAR" /> <result column="assort_id" property="assortId" jdbcType="VARCHAR"/>
<result column="type_id" property="typeId" jdbcType="INTEGER" /> <result column="scan_page" property="scanPage" jdbcType="NVARCHAR"/>
<result column="oper_type" property="operType" jdbcType="SMALLINT" /> <result column="type_id" property="typeId" jdbcType="INTEGER"/>
<result column="create_time" property="createTime" jdbcType="NVARCHAR" /> <result column="oper_type" property="operType" jdbcType="SMALLINT"/>
<result column="creater" property="creater" jdbcType="NVARCHAR" /> <result column="create_time" property="createTime" jdbcType="NVARCHAR"/>
<result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR" /> <result column="creater" property="creater" jdbcType="NVARCHAR"/>
<result column="admiss_times" property="admissTimes" jdbcType="SMALLINT" /> <result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR"/>
<result column="type_name" property="typeName" jdbcType="NVARCHAR" /> <result column="admiss_times" property="admissTimes" jdbcType="SMALLINT"/>
<result column="assort_id" property="assortId" jdbcType="NVARCHAR" /> <result column="type_name" property="typeName" jdbcType="NVARCHAR"/>
<result column="assort_name" property="assortName" jdbcType="NVARCHAR" /> <result column="assort_id" property="assortId" jdbcType="NVARCHAR"/>
</resultMap> <result column="assort_name" property="assortName" jdbcType="NVARCHAR"/>
<insert id="insert" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" > <result column="ip" property="ip" jdbcType="NVARCHAR"/>
insert into emr_print_download_info (id, patient_id, assort_id, </resultMap>
scan_page, type_id, oper_type, <insert id="insert" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
create_time, creater) insert into emr_print_download_info (id, patient_id, assort_id,
values (#{id,jdbcType=INTEGER}, #{patientId,jdbcType=NVARCHAR}, #{assortId,jdbcType=VARCHAR}, scan_page, type_id, oper_type,
#{scanPage,jdbcType=NVARCHAR}, #{typeId,jdbcType=INTEGER}, #{operType,jdbcType=SMALLINT}, create_time, creater)
#{createTime,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR}) values (#{id,jdbcType=INTEGER}, #{patientId,jdbcType=NVARCHAR}, #{assortId,jdbcType=VARCHAR},
</insert> #{scanPage,jdbcType=NVARCHAR}, #{typeId,jdbcType=INTEGER}, #{operType,jdbcType=SMALLINT},
<insert id="insertSelective" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" > #{createTime,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR})
insert into emr_print_download_info </insert>
<trim prefix="(" suffix=")" suffixOverrides="," > <insert id="insertSelective" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
<if test="id != null" > insert into emr_print_download_info
id, <trim prefix="(" suffix=")" suffixOverrides=",">
</if> <if test="id != null">
<if test="patientId != null" > id,
patient_id, </if>
</if> <if test="patientId != null">
<if test="assortId != null" > patient_id,
assort_id, </if>
</if> <if test="assortId != null">
<if test="scanPage != null" > assort_id,
scan_page, </if>
</if> <if test="scanPage != null">
<if test="typeId != null" > scan_page,
type_id, </if>
</if> <if test="typeId != null">
<if test="operType != null" > type_id,
oper_type, </if>
</if> <if test="operType != null">
<if test="createTime != null" > oper_type,
create_time, </if>
</if> <if test="createTime != null">
<if test="creater != null" > create_time,
creater, </if>
</if> <if test="creater != null">
</trim> creater,
<trim prefix="values (" suffix=")" suffixOverrides="," > </if>
<if test="id != null" > </trim>
#{id,jdbcType=INTEGER}, <trim prefix="values (" suffix=")" suffixOverrides=",">
</if> <if test="id != null">
<if test="patientId != null" > #{id,jdbcType=INTEGER},
#{patientId,jdbcType=NVARCHAR}, </if>
</if> <if test="patientId != null">
<if test="assortId != null" > #{patientId,jdbcType=NVARCHAR},
#{assortId,jdbcType=VARCHAR}, </if>
</if> <if test="assortId != null">
<if test="scanPage != null" > #{assortId,jdbcType=VARCHAR},
#{scanPage,jdbcType=NVARCHAR}, </if>
</if> <if test="scanPage != null">
<if test="typeId != null" > #{scanPage,jdbcType=NVARCHAR},
#{typeId,jdbcType=INTEGER}, </if>
</if> <if test="typeId != null">
<if test="operType != null" > #{typeId,jdbcType=INTEGER},
#{operType,jdbcType=SMALLINT}, </if>
</if> <if test="operType != null">
<if test="createTime != null" > #{operType,jdbcType=SMALLINT},
#{createTime,jdbcType=NVARCHAR}, </if>
</if> <if test="createTime != null">
<if test="creater != null" > #{createTime,jdbcType=NVARCHAR},
#{creater,jdbcType=NVARCHAR}, </if>
</if> <if test="creater != null">
</trim> #{creater,jdbcType=NVARCHAR},
</insert> </if>
<!--批量添加下载记录--> </trim>
<insert id="SimpleInsert" parameterType="java.util.List"> </insert>
insert into emr_print_download_info (patient_id, scan_page,assort_id, <!--批量添加下载记录-->
type_id, oper_type, create_time, <insert id="SimpleInsert" parameterType="java.util.List">
creater) insert into emr_print_download_info (patient_id, scan_page,assort_id,
<foreach collection="list" item="items" separator="union"> type_id, oper_type, create_time,
select #{items.patientId,jdbcType=NVARCHAR}, #{items.scanPage,jdbcType=NVARCHAR},#{items.assortId,jdbcType=VARCHAR}, creater)
#{items.typeId,jdbcType=INTEGER}, #{items.operType,jdbcType=SMALLINT}, #{items.createTime,jdbcType=NVARCHAR}, <foreach collection="list" item="items" separator="union">
#{items.creater,jdbcType=NVARCHAR} select #{items.patientId,jdbcType=NVARCHAR},
</foreach> #{items.scanPage,jdbcType=NVARCHAR},#{items.assortId,jdbcType=VARCHAR},
</insert> #{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 id="selectAll" resultMap="BaseResultMapVo"
SELECT parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
emr_print_download_info.id, SELECT
emr_print_download_info.create_time, emr_print_download_info.id,
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_print_download_info.create_time,
emr_type.type_name emr_print_download_info.patient_id,
ORDER BY emr_print_download_info.scan_page,
emr_print_download_info.create_time DESC (
</select> 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> </mapper>

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

@ -210,7 +210,7 @@
<div class="page-content-wrapper"> <div class="page-content-wrapper">
<div class="page-content"> <div class="page-content">
<div class="container-fluid"> <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> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save