修改bug

src/main/java/com/emr/controller/commomSearch/CommomSearchController.java

@@ -183,13 +183,30 @@ public class CommomSearchController {
         }
     }
 
+    //阿拉伯数字转中文
+    private static String toChinese(String str) {
+        String[] s1 = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
+        String[] s2 = {"十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千"};
+        String result = "";
+        int n = str.length();
+        for (int i = 0; i < n; i++) {
+            int num = str.charAt(i) - '0';
+            if (i != n - 1 && num != 0) {
+                result += s1[num] + s2[n - 2 - i];
+            } else {
+                result += s1[num];
+            }
+        }
+        return result;
+    }
+
     //加载科室
     @RequestMapping("getDept")
     @ResponseBody
     public String getDept() {
         try {
             //加载科室集合
-            List<Emr_Dictionary> deptList = dictionaryMapper.selectDictionaryByTypeCode("dept_code");
+            List<Emr_Dictionary> deptList = dictionaryMapper.selectDictionaryByTypeCode("");
             return JSON.toJSONString(deptList);
         }catch (Exception e){
             e.printStackTrace();
@@ -197,6 +214,11 @@ public class CommomSearchController {
         }
     }
 
+    /**
+     * 加载公共表信息
+     *
+     * @return
+     */
     @RequestMapping("getCommonInfo")
     @ResponseBody
     public String getCommonInfo() {
@@ -234,6 +256,8 @@ public class CommomSearchController {
             return null;
         }
     }
+    /*******************************************病案预览操作*********************************************************/
+
     //加载转归情况
     @RequestMapping("getDiagStatus174")
     @ResponseBody
@@ -246,7 +270,7 @@ public class CommomSearchController {
             return null;
         }
     }
-    /*******************************************病案预览操作*********************************************************/
+
     /**
      * @MethodName: showRecord
      * @Description: 跳转到病案预览
@@ -379,7 +403,7 @@ public class CommomSearchController {
 
     /**
      * 加载上传图片的分类
-     * */
+     */
     @RequestMapping("getAssortList")
     @ResponseBody
     public ResultUtil getAssortList(HttpServletRequest request) {
@@ -429,6 +453,7 @@ public class CommomSearchController {
         model.addAttribute("user", user);
         return "recordManage/commomSearch/showRecordIframe";
     }
+
     //脐血库
     @RequestMapping("showRecordIframeBlood")
     public String showRecordIframeBlood(String patientId, String flag, Model model, HttpServletRequest request) {
@@ -468,7 +493,6 @@ public class CommomSearchController {
         return JSON.toJSONString(zdAssorts);
     }
 
-
     //脐血库
     //获取病案图片根路径
     @RequestMapping("getFilePath")
@@ -482,6 +506,7 @@ public class CommomSearchController {
             return ResultUtil.error("出错了,请联系系统管理员!");
         }
     }
+
     /**
      * @MethodName: getOtherDiagNameByAdmissTimesAndInpatientNo
      * @Description: 根据admissTimes和inpatientNo查询包含其他诊断名称的基本信息
@@ -537,6 +562,7 @@ public class CommomSearchController {
         }
         return null;
     }
+    //脐血库
 
     /**
      * @MethodName: getRecordTypeTree
@@ -626,7 +652,7 @@ public class CommomSearchController {
             return null;
         }
     }
-    //脐血库
+
     /**
      * @MethodName: getRecordTree
      * @Description: 根据patientId组织病案集合树
@@ -757,6 +783,7 @@ public class CommomSearchController {
             return null;
         }
     }
+
     //脐血库
     @RequestMapping(value = "getBloodRecordTree", produces = {"text/json;charset=UTF-8"})
     @ResponseBody
@@ -1098,6 +1125,7 @@ public class CommomSearchController {
         }
     }
 
+    //脐血库
 
     /**
      * @MethodName: updateScanAssort
@@ -1138,8 +1166,8 @@ public class CommomSearchController {
         }
         return null;
     }
-
     //脐血库
+
     /**
      * @MethodName: updateScanAssortByBlood
      * @Description: 重新分页
@@ -1176,7 +1204,9 @@ public class CommomSearchController {
         }
         return null;
     }
-    //脐血库
+
+    /*****************************************编码操作**************************************************/
+
     /**
      * @MethodName: delScanAssortByBlood
      * @Description: 删除图片
@@ -1225,7 +1255,6 @@ public class CommomSearchController {
         return null;
     }
 
-    /*****************************************编码操作**************************************************/
     /**
      * @MethodName: codeTable
      * @Description: 跳转到编码录入页面
@@ -1305,6 +1334,8 @@ public class CommomSearchController {
         }
     }
 
+    /* */
+
     /**
      * @MethodName: getOperateCodeContents
      * @Description: 根据手术编码查询手术对象集合
@@ -1344,7 +1375,7 @@ public class CommomSearchController {
         }
     }
 
-   /* *//**
+    /**
      * @MethodName: loadSelect
      * @Description: 加载编码字典
      * @Param
@@ -1368,6 +1399,7 @@ public class CommomSearchController {
             return null;
         }
     }
+
     /**
      * @MethodName: getCodeTypeTree
      * @Description: 根据patientId加载类别树
@@ -1571,7 +1603,7 @@ public class CommomSearchController {
             return ResultUtil.error();
         }
     }
-
+    /********************************************手术编码*******************************************************/
 
     /**
      * @MethodName: addDiagCode
@@ -1597,7 +1629,7 @@ public class CommomSearchController {
             return ResultUtil.error();
         }
     }
-    /********************************************手术编码*******************************************************/
+
     /**
      * @MethodName: checkOperateNo
      * @Description: 验证手术序号是否存在
@@ -1734,7 +1766,7 @@ public class CommomSearchController {
         } else {
             return ResultUtil.error();
         }
-    }
+    }/**************************************************西医诊断操作*************************************************/
 
 /**
      * @MethodName: addOperCode
@@ -1759,7 +1791,8 @@ public class CommomSearchController {
             e.printStackTrace();
             return ResultUtil.error();
         }
-    }/**************************************************西医诊断操作*************************************************/
+    }
+
     /**
      * @MethodName: getDictionaryByTypeCode
      * @Description: 根据字典标识查询字典集合
@@ -1785,6 +1818,7 @@ public class CommomSearchController {
             return null;
         }
     }
+
     /**
      * @MethodName: getIcdCodeList
      * @Description: 加载icd编码字典表
@@ -1916,6 +1950,7 @@ public class CommomSearchController {
             return ResultUtil.error();
         }
     }
+    /*****************************************中医诊断********************************************************/
 
     /**
      * @MethodName: deleteCodeByPatientIdAndDiagNo
@@ -1946,7 +1981,7 @@ public class CommomSearchController {
             return ResultUtil.error();
         }
     }
-    /*****************************************中医诊断********************************************************/
+
     /**
      * @MethodName: checkHerbNo
      * @Description: 验证中医诊断序号是否存在
@@ -2163,22 +2198,6 @@ public class CommomSearchController {
         return list;
     }
 
-    //阿拉伯数字转中文
-    private static String toChinese(String str) {
-        String[] s1 = { "零", "一", "二", "三", "四", "五", "六", "七", "八", "九" };
-        String[] s2 = { "十", "百", "千", "万", "十", "百", "千", "亿", "十", "百", "千" };
-        String result = "";
-        int n = str.length();
-        for (int i = 0; i < n; i++) {
-            int num = str.charAt(i) - '0';
-            if (i != n - 1 && num != 0) {
-                result += s1[num] + s2[n - 2 - i];
-            } else {
-                result += s1[num];
-            }
-        }
-        return result;
-    }
     /*@RequestMapping("toPdf")
     public String toPdf(String patientId,String assortIds,String name,Model model){
         model.addAttribute("patientId",patientId);

src/main/java/com/emr/entity/emrPrintAndDownLoad/EmrPrintDownloadInfo.java

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

src/main/resources/mapper/CommomMapper.xml

@@ -116,7 +116,8 @@
         from commomtable
     </select>
     <!--根据住院次数和病案号和姓名查询patientId-->
-  <select id="selectPatientIdByAdmissTimesAndInpatientNoAndName" resultType="java.lang.String" parameterType="java.lang.String">
+    <select id="selectPatientIdByAdmissTimesAndInpatientNoAndName" resultType="java.lang.String"
+            parameterType="java.lang.String">
         SELECT
         patient_id
         FROM
@@ -318,13 +319,34 @@
             dbo.commomtable.main_dis_thing,
             dbo.commomtable.dis_dept,
             dbo.commomtable.dis_date,
-          (select stuff((select '，'+diag_name from  dbo.t_diag where diag.patient_id=patient_id and diag_no > '1' for xml path('')),1,1,'')) as otherDiagName
+            (select stuff((select '，' + diag_name
+                           from dbo.t_diag
+                           where diag.patient_id = patient_id
+                             and diag_no > '1' for xml path('')),
+                    1,
+                    1,
+                    '')
+            ) as
+            otherDiagName
         FROM
-          dbo.commomtable
+            dbo
-      LEFT JOIN
+            .
-          dbo.t_diag diag
+            commomtable
+            LEFT
+            JOIN
+            dbo
+            .
+            t_diag
+            diag
         ON
-          dbo.commomtable.patient_id = diag.patient_id
+            dbo
+            .
+            commomtable
+            .
+            patient_id =
+            diag
+            .
+            patient_id
         WHERE
             dbo.commomtable.patient_id = #{patientId}
     </select>
@@ -361,7 +383,8 @@
         dbo.commomtable.admiss_id,
         dbo.commomtable.admiss_times,
         dbo.commomtable.dis_dept,
-              (CASE WHEN dbo.commomtable.dis_date is not null and dbo.commomtable.dis_date != '' THEN CONVERT(varchar(100),dbo.commomtable.dis_date, 23)  ELSE null end) dis_date,
+        (CASE WHEN dbo.commomtable.dis_date is not null and dbo.commomtable.dis_date != '' THEN
+        CONVERT(varchar(100),dbo.commomtable.dis_date, 23) ELSE null end) dis_date,
         dbo.commomtable1.id_card,
         dbo.t_basic.clinic_id,
         dbo.t_basic.bed_no,
@@ -370,10 +393,12 @@
         dbo.commomtable.age,
         dbo.commomtable.age_month,
         dbo.commomtable.age_day,
-      (CASE WHEN dbo.commomtable1.birthday is not null and dbo.commomtable1.birthday != '' THEN CONVERT(varchar(100),dbo.commomtable1.birthday, 23)  ELSE null end) birthday,
+        (CASE WHEN dbo.commomtable1.birthday is not null and dbo.commomtable1.birthday != '' THEN
+        CONVERT(varchar(100),dbo.commomtable1.birthday, 23) ELSE null end) birthday,
         dbo.commomtable1.marriage,
         dbo.commomtable1.admiss_dept,
-      (CASE WHEN dbo.commomtable.admiss_date is not null and dbo.commomtable.admiss_date != '' THEN CONVERT(varchar(100),dbo.commomtable.admiss_date, 23)  ELSE null end) admiss_date
+        (CASE WHEN dbo.commomtable.admiss_date is not null and dbo.commomtable.admiss_date != '' THEN
+        CONVERT(varchar(100),dbo.commomtable.admiss_date, 23) ELSE null end) admiss_date
         FROM
         dbo.commomtable
         INNER JOIN dbo.commomtable1 ON dbo.commomtable.patient_id = dbo.commomtable1.patient_id
@@ -405,9 +430,26 @@
 
 
     <sql id="Base_Column_List">
-    patient_id, admiss_times, inpatient_no, NAME, admiss_id, sex, age, age_month, age_day,
+        patient_id
-    home_addr, name_cym, admiss_date, dis_date, admiss_days, dis_dept, is_oper, attending,
+        ,
-    main_diag_name, main_dis_thing
+        admiss_times,
+        inpatient_no,
+        NAME,
+        admiss_id,
+        sex,
+        age,
+        age_month,
+        age_day,
+        home_addr,
+        name_cym,
+        admiss_date,
+        dis_date,
+        admiss_days,
+        dis_dept,
+        is_oper,
+        attending,
+        main_diag_name,
+        main_dis_thing
     </sql>
     <select id="selectByPrimaryKey" resultType="com.emr.vo.commomSearch.CommomVo" parameterType="java.lang.String">
         select
@@ -417,7 +459,8 @@
     </select>
     <select id="selectByPrimaryKeyPath" resultType="com.emr.vo.commomSearch.CommomVo" parameterType="java.lang.String">
         select
-        patient_id,file_path
+            patient_id,
+            file_path
         from commomtable
         where patient_id = #{patientId,jdbcType=VARCHAR}
     </select>
@@ -608,10 +651,53 @@
 
 
     <sql id="Base_Column_List1">
-    patient_id, country, birth_addr, id_card, job, marriage, home_tel, home_zip,work_name, work_addr,
+        patient_id
-    work_tel, work_zip, linkman, relation, rel_addr, rel_tel, pay_type, birthday, avoirdupois,
+        ,
-    admiss_type, admiss_dept, admiss_ward, change_dept, dis_ward, clinic_diag, clinic_name,
+        country,
-    pathology_code,pathology_no,pathology_name,medicine, is_medicine, emit_pathology, dept_director, director, admiss_doctor,refresher, praxis, coding, quality, control, nurses, quality_date, input_name,input_createTime,blood_type, RH
+        birth_addr,
+        id_card,
+        job,
+        marriage,
+        home_tel,
+        home_zip,
+        work_name,
+        work_addr,
+        work_tel,
+        work_zip,
+        linkman,
+        relation,
+        rel_addr,
+        rel_tel,
+        pay_type,
+        birthday,
+        avoirdupois,
+        admiss_type,
+        admiss_dept,
+        admiss_ward,
+        change_dept,
+        dis_ward,
+        clinic_diag,
+        clinic_name,
+        pathology_code,
+        pathology_no,
+        pathology_name,
+        medicine,
+        is_medicine,
+        emit_pathology,
+        dept_director,
+        director,
+        admiss_doctor,
+        refresher,
+        praxis,
+        coding,
+        quality,
+        control,
+        nurses,
+        quality_date,
+        input_name,
+        input_createTime,
+        blood_type,
+        RH
     </sql>
     <select id="selectByPrimaryKey1" resultType="com.emr.vo.commomSearch.CommomVo" parameterType="java.lang.String">
         select
@@ -661,8 +747,7 @@
                                   pathology_name, input_name, input_createTime,
                                   ryqhm_days, ryqhm_hours, ryqhm_mins,
                                   ryhm_days, ryhm_hours, ryhm_mins,
-      transfer_hospital_name, transfer_healcenter_name
+                                  transfer_hospital_name, transfer_healcenter_name)
-      )
         values (#{patientId,jdbcType=VARCHAR}, #{country,jdbcType=NVARCHAR}, #{birthAddr,jdbcType=NVARCHAR},
                 #{idCard,jdbcType=NVARCHAR}, #{job,jdbcType=NVARCHAR}, #{marriage,jdbcType=NVARCHAR},
                 #{homeTel,jdbcType=NVARCHAR}, #{homeZip,jdbcType=NVARCHAR}, #{workAddr,jdbcType=NVARCHAR},
@@ -679,10 +764,13 @@
                 #{nativePlace,jdbcType=NVARCHAR}, #{addr,jdbcType=NVARCHAR}, #{telphone,jdbcType=NVARCHAR},
                 #{zip,jdbcType=NVARCHAR}, #{changeDate1,jdbcType=NVARCHAR}, #{changeDate2,jdbcType=NVARCHAR},
                 #{changeDate3,jdbcType=NVARCHAR}, #{changeDept1,jdbcType=NVARCHAR}, #{changeDept2,jdbcType=NVARCHAR},
-      #{changeDept3,jdbcType=NVARCHAR}, #{isHospitalization,jdbcType=NVARCHAR}, #{hospitalizationObjective,jdbcType=NVARCHAR},
+                #{changeDept3,jdbcType=NVARCHAR}, #{isHospitalization,jdbcType=NVARCHAR},
+                #{hospitalizationObjective,jdbcType=NVARCHAR},
                 #{isMedicalRecordPath,jdbcType=NVARCHAR}, #{responsibleNurse,jdbcType=NVARCHAR},
-      #{tumorStagingType,jdbcType=NVARCHAR}, #{radiotherapyType,jdbcType=NVARCHAR}, #{radiotherapyProgram,jdbcType=NVARCHAR},
+                #{tumorStagingType,jdbcType=NVARCHAR}, #{radiotherapyType,jdbcType=NVARCHAR},
-      #{radiotherapyDevice,jdbcType=NVARCHAR}, #{primaryTumorDay,jdbcType=INTEGER}, #{primaryTumorTimes,jdbcType=INTEGER},
+                #{radiotherapyProgram,jdbcType=NVARCHAR},
+                #{radiotherapyDevice,jdbcType=NVARCHAR}, #{primaryTumorDay,jdbcType=INTEGER},
+                #{primaryTumorTimes,jdbcType=INTEGER},
                 #{primaryTumorDose,jdbcType=NVARCHAR}, #{primaryTumorStarttime,jdbcType=NVARCHAR},
                 #{primaryTumorEndtime,jdbcType=NVARCHAR}, #{chemotherapyType,jdbcType=NVARCHAR},
                 #{chemotherapyMethod,jdbcType=NVARCHAR}, #{caseType,jdbcType=VARCHAR}, #{totalCharge,jdbcType=DECIMAL},
@@ -698,13 +786,13 @@
                 #{charge44,jdbcType=DECIMAL}, #{charge45,jdbcType=DECIMAL}, #{nation,jdbcType=NVARCHAR},
                 #{homeAddr,jdbcType=NVARCHAR}, #{clinicDoctor,jdbcType=NVARCHAR}, #{disType,jdbcType=NVARCHAR},
                 #{birthbabyWeight,jdbcType=DECIMAL}, #{healthyCard,jdbcType=NVARCHAR}, #{saveTimes,jdbcType=NVARCHAR},
-      #{saveSuccessTimes,jdbcType=NVARCHAR}, #{avoirdupois,jdbcType=DECIMAL}, #{admissThing,jdbcType=NVARCHAR},
+                #{saveSuccessTimes,jdbcType=NVARCHAR}, #{avoirdupois,jdbcType=DECIMAL},
+                #{admissThing,jdbcType=NVARCHAR},
                 #{workName,jdbcType=NVARCHAR}, #{pathologyCode,jdbcType=VARCHAR}, #{pathologyNo,jdbcType=VARCHAR},
                 #{pathologyName,jdbcType=VARCHAR}, #{inputName,jdbcType=NVARCHAR}, #{inputCreatetime,jdbcType=NVARCHAR},
                 #{ryqhmDays,jdbcType=INTEGER}, #{ryqhmHours,jdbcType=INTEGER}, #{ryqhmMins,jdbcType=INTEGER},
                 #{ryhmDays,jdbcType=INTEGER}, #{ryhmHours,jdbcType=INTEGER}, #{ryhmMins,jdbcType=INTEGER},
-      #{transferHospitalName,jdbcType=NVARCHAR}, #{transferHealcenterName,jdbcType=NVARCHAR}
+                #{transferHospitalName,jdbcType=NVARCHAR}, #{transferHealcenterName,jdbcType=NVARCHAR})
-      )
     </insert>
 
     <!--更新commomtable1表-->
@@ -1118,21 +1206,31 @@
     </select>
     <!--查询表字段数-->
     <select id="selectColByTableName" resultType="java.lang.Integer">
-        select count(*) from syscolumns s  where s.id = object_id(#{tableName});
+        select count(*)
+        from syscolumns s
+        where s.id = object_id(#{tableName});
     </select>
     <!--查commomtable1表的肿瘤信息-->
     <select id="selectTumourByPatientId" resultType="com.emr.vo.commomSearch.CommomVo">
         select
             tumor_staging_type,
-          radiotherapy_type, radiotherapy_program,
+            radiotherapy_type,
-          radiotherapy_device, primary_tumor_day, primary_tumor_times,
+            radiotherapy_program,
-          primary_tumor_dose, primary_tumor_starttime,
+            radiotherapy_device,
-          primary_tumor_endtime, chemotherapy_type,
+            primary_tumor_day,
+            primary_tumor_times,
+            primary_tumor_dose,
+            primary_tumor_starttime,
+            primary_tumor_endtime,
+            chemotherapy_type,
             chemotherapy_method
-     from commomtable1 where patient_id = #{patientId}
+        from commomtable1
+        where patient_id = #{patientId}
     </select>
     <!--根据病案号查询-->
     <select id="selectCommomByInpatientNo" resultMap="BaseResultMap">
-        select patient_id,inpatient_no,name,admiss_id,admiss_times,dis_date,dis_dept from commomtable where inpatient_no like '%${inpatientNo}%'
+        select patient_id,inpatient_no,name,admiss_id,admiss_times,dis_date,dis_dept
+        from commomtable
+        where inpatient_no like '%${inpatientNo}%'
     </select>
 </mapper>

src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml

@@ -10,6 +10,7 @@
         <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"/>
@@ -25,6 +26,7 @@
         <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,
@@ -95,14 +97,17 @@
         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},
+            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}
         </foreach>
     </insert>
 
     <!--查询列表-->
-  <select id="selectAll" resultMap="BaseResultMapVo" parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
+    <select id="selectAll" resultMap="BaseResultMapVo"
+            parameterType="com.emr.vo.EmrPrintOrDownLoadInfo.EmrPrintOrDownLoadInfoVo">
         SELECT
         emr_print_download_info.id,
         emr_print_download_info.create_time,
@@ -178,13 +183,38 @@
                     emr_comom_set
                     WHERE
                     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
             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
             oper_type = 1
             AND patient_id = #{patientId}

src/main/webapp/index.jsp

@@ -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>