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

897
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();
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@ -1,32 +1,34 @@
<?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"/>
<result column="ip" property="ip" jdbcType="NVARCHAR"/>
</resultMap> </resultMap>
<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="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"/>
<result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR" /> <result column="inpatient_no" property="inpatientNo" jdbcType="NVARCHAR"/>
<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="NVARCHAR"/>
<result column="assort_id" property="assortId" jdbcType="NVARCHAR" /> <result column="assort_id" property="assortId" jdbcType="NVARCHAR"/>
<result column="assort_name" property="assortName" jdbcType="NVARCHAR" /> <result column="assort_name" property="assortName" jdbcType="NVARCHAR"/>
<result column="ip" property="ip" jdbcType="NVARCHAR"/>
</resultMap> </resultMap>
<insert id="insert" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" > <insert id="insert" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
insert into emr_print_download_info (id, patient_id, assort_id, insert into emr_print_download_info (id, patient_id, assort_id,
scan_page, type_id, oper_type, scan_page, type_id, oper_type,
create_time, creater) create_time, creater)
@ -34,57 +36,57 @@
#{scanPage,jdbcType=NVARCHAR}, #{typeId,jdbcType=INTEGER}, #{operType,jdbcType=SMALLINT}, #{scanPage,jdbcType=NVARCHAR}, #{typeId,jdbcType=INTEGER}, #{operType,jdbcType=SMALLINT},
#{createTime,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR}) #{createTime,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo" > <insert id="insertSelective" parameterType="com.emr.entity.emrPrintAndDownLoad.EmrPrintDownloadInfo">
insert into emr_print_download_info insert into emr_print_download_info
<trim prefix="(" suffix=")" suffixOverrides="," > <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null" > <if test="id != null">
id, id,
</if> </if>
<if test="patientId != null" > <if test="patientId != null">
patient_id, patient_id,
</if> </if>
<if test="assortId != null" > <if test="assortId != null">
assort_id, assort_id,
</if> </if>
<if test="scanPage != null" > <if test="scanPage != null">
scan_page, scan_page,
</if> </if>
<if test="typeId != null" > <if test="typeId != null">
type_id, type_id,
</if> </if>
<if test="operType != null" > <if test="operType != null">
oper_type, oper_type,
</if> </if>
<if test="createTime != null" > <if test="createTime != null">
create_time, create_time,
</if> </if>
<if test="creater != null" > <if test="creater != null">
creater, creater,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides="," > <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null" > <if test="id != null">
#{id,jdbcType=INTEGER}, #{id,jdbcType=INTEGER},
</if> </if>
<if test="patientId != null" > <if test="patientId != null">
#{patientId,jdbcType=NVARCHAR}, #{patientId,jdbcType=NVARCHAR},
</if> </if>
<if test="assortId != null" > <if test="assortId != null">
#{assortId,jdbcType=VARCHAR}, #{assortId,jdbcType=VARCHAR},
</if> </if>
<if test="scanPage != null" > <if test="scanPage != null">
#{scanPage,jdbcType=NVARCHAR}, #{scanPage,jdbcType=NVARCHAR},
</if> </if>
<if test="typeId != null" > <if test="typeId != null">
#{typeId,jdbcType=INTEGER}, #{typeId,jdbcType=INTEGER},
</if> </if>
<if test="operType != null" > <if test="operType != null">
#{operType,jdbcType=SMALLINT}, #{operType,jdbcType=SMALLINT},
</if> </if>
<if test="createTime != null" > <if test="createTime != null">
#{createTime,jdbcType=NVARCHAR}, #{createTime,jdbcType=NVARCHAR},
</if> </if>
<if test="creater != null" > <if test="creater != null">
#{creater,jdbcType=NVARCHAR}, #{creater,jdbcType=NVARCHAR},
</if> </if>
</trim> </trim>
@ -95,14 +97,17 @@
type_id, oper_type, create_time, type_id, oper_type, create_time,
creater) creater)
<foreach collection="list" item="items" separator="union"> <foreach collection="list" item="items" separator="union">
select #{items.patientId,jdbcType=NVARCHAR}, #{items.scanPage,jdbcType=NVARCHAR},#{items.assortId,jdbcType=VARCHAR}, select #{items.patientId,jdbcType=NVARCHAR},
#{items.typeId,jdbcType=INTEGER}, #{items.operType,jdbcType=SMALLINT}, #{items.createTime,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} #{items.creater,jdbcType=NVARCHAR}
</foreach> </foreach>
</insert> </insert>
<!--查询列表--> <!--查询列表-->
<select id="selectAll" resultMap="BaseResultMapVo" parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo"> <select id="selectAll" resultMap="BaseResultMapVo"
parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
SELECT SELECT
emr_print_download_info.id, emr_print_download_info.id,
emr_print_download_info.create_time, emr_print_download_info.create_time,
@ -171,20 +176,45 @@
<!--查询最近打印次数--> <!--查询最近打印次数-->
<select id="getPrintCount" resultMap="BaseResultMapVo"> <select id="getPrintCount" resultMap="BaseResultMapVo">
SELECT SELECT
top ( top(
SELECT SELECT
times times
FROM FROM
emr_comom_set emr_comom_set
WHERE WHERE
id = 1 id = 1
) COUNT(scan_page) printCount, )
ISNULL(emr_type.type_name,'无') typeName, COUNT(
CONVERT(varchar(100),emr_print_download_info.create_time,23) create_time, scan_page)
emr_print_download_info.creater 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 FROM
emr_print_download_info emr_print_download_info
LEFT JOIN emr_type ON emr_print_download_info.type_id = emr_type.id LEFT
JOIN
emr_type
ON emr_print_download_info
.
type_id =
emr_type
.
id
WHERE WHERE
oper_type = 1 oper_type = 1
AND patient_id = #{patientId} AND patient_id = #{patientId}

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