From a0dedc0c0ac44bd80a32013b67648a5b784ca571 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Fri, 14 Jan 2022 17:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmybatis=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                              |  4 ++--
 .../java/com/emr/entity/recordType/Emr_Type.java     | 12 ++++++------
 .../emr/service/recordType/EmrTypeServiceImpl.java   |  3 ++-
 src/main/resources/config/README.md                  |  4 +++-
 src/main/resources/mapper/Emr_DictionaryMapper.xml   |  6 +++---
 .../mapper/approve/Emr_Apply_ApproveMapper.xml       |  4 ++--
 .../resources/mapper/recordLock/Emr_LockMapper.xml   |  4 ++--
 .../resources/mapper/recordType/Emr_TypeMapper.xml   |  8 ++++----
 .../approveManage/collection/collectManage174.jsp    |  2 +-
 .../js/approveManage/collection/collectManage174.js  |  6 +++++-
 10 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index f448e19..c8da093 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,8 @@
         <!-- begin 其它第三方开源版本定义 -->
         <jdk.version>1.8</jdk.version>
         <spring.version>5.0.2.RELEASE</spring.version>
-        <mybatis.spring.version>1.2.2</mybatis.spring.version>
-        <mybatis.version>3.2.8</mybatis.version>
+        <mybatis.spring.version>1.3.2</mybatis.spring.version>
+        <mybatis.version>3.5.7</mybatis.version>
         <mssql.version>7.4.1.jre8</mssql.version>
         <druid.version>1.1.22</druid.version>
         <shiro.version>1.2.5</shiro.version>
diff --git a/src/main/java/com/emr/entity/recordType/Emr_Type.java b/src/main/java/com/emr/entity/recordType/Emr_Type.java
index 72edd62..7ef51f9 100644
--- a/src/main/java/com/emr/entity/recordType/Emr_Type.java
+++ b/src/main/java/com/emr/entity/recordType/Emr_Type.java
@@ -34,7 +34,7 @@ public class Emr_Type {
     }
 
     public void setTypeFlag(String typeFlag) {
-        this.typeFlag = typeFlag == null ? null : typeFlag.trim();
+        this.typeFlag = typeFlag;
     }
 
     public String getTypeName() {
@@ -42,7 +42,7 @@ public class Emr_Type {
     }
 
     public void setTypeName(String typeName) {
-        this.typeName = typeName == null ? null : typeName.trim();
+        this.typeName = typeName;
     }
 
     public Integer getSelectFlag() {
@@ -74,7 +74,7 @@ public class Emr_Type {
     }
 
     public void setCreater(String creater) {
-        this.creater = creater == null ? null : creater.trim();
+        this.creater = creater;
     }
 
     public String getCreateTime() {
@@ -82,7 +82,7 @@ public class Emr_Type {
     }
 
     public void setCreateTime(String createTime) {
-        this.createTime = createTime == null ? null : createTime.trim();
+        this.createTime = createTime;
     }
 
     public String getUpdater() {
@@ -90,7 +90,7 @@ public class Emr_Type {
     }
 
     public void setUpdater(String updater) {
-        this.updater = updater == null ? null : updater.trim();
+        this.updater = updater;
     }
 
     public String getUpdateTime() {
@@ -98,6 +98,6 @@ public class Emr_Type {
     }
 
     public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime == null ? null : updateTime.trim();
+        this.updateTime = updateTime;
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java b/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java
index 63d632a..d4f20cd 100644
--- a/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java
+++ b/src/main/java/com/emr/service/recordType/EmrTypeServiceImpl.java
@@ -113,7 +113,8 @@ public class EmrTypeServiceImpl implements EmrTypeService {
 
     @Override
     public Emr_Type selectByPrimaryKey(Integer id) {
-        return emrTypeMapper.selectByPrimaryKey(id);
+        Emr_Type emr_type = emrTypeMapper.selectByPrimaryKey(id);
+        return emr_type;
     }
 
     @Override
diff --git a/src/main/resources/config/README.md b/src/main/resources/config/README.md
index a4c0e98..e760176 100644
--- a/src/main/resources/config/README.md
+++ b/src/main/resources/config/README.md
@@ -5,4 +5,6 @@
 #2.0.3 2021-12-23
 修改常用查询删除查询条件内容不能查询全部的bug
 #2.0.4 2022-01-05
-解决xp系统使用病案预览全屏按钮点击失效问题
\ No newline at end of file
+解决xp系统使用病案预览全屏按钮点击失效问题
+#2.0.5 2022-01-14
+升级mybatis安全漏洞3.2.8->3.5.7、mybatis-spring1.2.2->1.3.2
diff --git a/src/main/resources/mapper/Emr_DictionaryMapper.xml b/src/main/resources/mapper/Emr_DictionaryMapper.xml
index f01f4fd..48c335b 100644
--- a/src/main/resources/mapper/Emr_DictionaryMapper.xml
+++ b/src/main/resources/mapper/Emr_DictionaryMapper.xml
@@ -13,7 +13,7 @@
     <result column="gb_code" property="gbCode" jdbcType="NCHAR" />
     <result column="flag" property="flag" jdbcType="SMALLINT" />
     <result column="c_comment" property="cComment" jdbcType="NVARCHAR" />
-    <result column="parent_id" property="parentId" jdbcType="NVARCHAR" />
+    <result column="parent_id" property="parentId" jdbcType="VARCHAR" />
     <result column="effective" property="effective" jdbcType="INTEGER" />
     <result column="updater" property="updater" jdbcType="NVARCHAR" />
     <result column="update_time" property="updateTime" jdbcType="NCHAR" />
@@ -196,7 +196,7 @@
           emr_dictionary.c_comment,
           case
           when  emr_dictionary.parent_id = '0' then emr_dictionary.parent_id
-          else emr_dictionary1.id
+          else convert(varchar(3000),emr_dictionary1.id)
           end parent_id,
           emr_dictionary.effective,
           emr_dictionary.remark,
@@ -210,7 +210,7 @@
           END newName,
           case
           when  emr_dictionary.parent_id = '0' then emr_dictionary.parent_id
-          else emr_dictionary1.id
+          else convert(varchar(3000),emr_dictionary1.id)
           end newParentId
           FROM
           emr_dictionary
diff --git a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
index 2184d41..b2723c8 100644
--- a/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
+++ b/src/main/resources/mapper/approve/Emr_Apply_ApproveMapper.xml
@@ -9,10 +9,10 @@
         <result column="effe_days" property="effeDays" jdbcType="INTEGER"/>
         <result column="apply_type" property="applyType" jdbcType="NVARCHAR"/>
         <result column="apply_reason" property="applyReason" jdbcType="NVARCHAR"/>
-        <result column="apply_state" property="applyState" jdbcType="NVARCHAR"/>
+        <result column="apply_state" property="applyState" jdbcType="VARCHAR"/>
         <result column="approver" property="approver" jdbcType="NVARCHAR"/>
         <result column="approve_time" property="approveTime" jdbcType="NCHAR"/>
-        <result column="approve_state" property="approveState" jdbcType="NVARCHAR"/>
+        <result column="approve_state" property="approveState" jdbcType="VARCHAR"/>
         <result column="approve_notes" property="approveNotes" jdbcType="NVARCHAR"/>
         <result column="patient_id" property="patientId" jdbcType="VARCHAR"/>
         <result column="admiss_id" property="admissId" jdbcType="CHAR"/>
diff --git a/src/main/resources/mapper/recordLock/Emr_LockMapper.xml b/src/main/resources/mapper/recordLock/Emr_LockMapper.xml
index 046669f..6b309fd 100644
--- a/src/main/resources/mapper/recordLock/Emr_LockMapper.xml
+++ b/src/main/resources/mapper/recordLock/Emr_LockMapper.xml
@@ -195,8 +195,8 @@
         emr_lock.unlocker,
         emr_lock.unlocke_time,
         commomtable.name,
-        commomtable.admiss_times,
-        commomtable.inpatient_no
+        emr_lock.admiss_times,
+        emr_lock.inpatient_no
         FROM
         emr_lock
         LEFT JOIN commomtable ON emr_lock.patient_id = commomtable.patient_id
diff --git a/src/main/resources/mapper/recordType/Emr_TypeMapper.xml b/src/main/resources/mapper/recordType/Emr_TypeMapper.xml
index 3767403..1173588 100644
--- a/src/main/resources/mapper/recordType/Emr_TypeMapper.xml
+++ b/src/main/resources/mapper/recordType/Emr_TypeMapper.xml
@@ -3,14 +3,14 @@
 <mapper namespace="com.emr.dao.recordType.Emr_TypeMapper" >
   <resultMap id="BaseResultMap" type="com.emr.entity.recordType.Emr_Type" >
     <id column="id" property="id" jdbcType="INTEGER" />
-    <result column="type_flag" property="typeFlag" jdbcType="NVARCHAR" />
-    <result column="type_name" property="typeName" jdbcType="NVARCHAR" />
+    <result column="type_flag" property="typeFlag" jdbcType="VARCHAR" />
+    <result column="type_name" property="typeName" jdbcType="VARCHAR" />
     <result column="select_flag" property="selectFlag" jdbcType="INTEGER" />
     <result column="effective" property="effective" jdbcType="INTEGER" />
     <result column="type_sort" property="typeSort" jdbcType="INTEGER" />
-    <result column="creater" property="creater" jdbcType="NVARCHAR" />
+    <result column="creater" property="creater" jdbcType="VARCHAR" />
     <result column="create_time" property="createTime" jdbcType="NCHAR" />
-    <result column="updater" property="updater" jdbcType="NVARCHAR" />
+    <result column="updater" property="updater" jdbcType="VARCHAR" />
     <result column="update_time" property="updateTime" jdbcType="NCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
diff --git a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
index 2ca3c8f..411517c 100644
--- a/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
+++ b/src/main/webapp/WEB-INF/views/approveManage/collection/collectManage174.jsp
@@ -519,7 +519,7 @@
         });
     });
 </script>
-<script src="${path}/static/js/approveManage/collection/collectManage174.js?t=2019-11-20"></script>
+<script src="${path}/static/js/approveManage/collection/collectManage174.js?t=2022-01-14"></script>
 <script src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
 <script src="${path}/static/js/approveManage/approveList/approveSaveCommomMethodBlood.js"></script>
 <script src="${path}/static/js/dateUtil.js"></script>
diff --git a/src/main/webapp/static/js/approveManage/collection/collectManage174.js b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
index 1c62160..713eefd 100644
--- a/src/main/webapp/static/js/approveManage/collection/collectManage174.js
+++ b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
@@ -69,7 +69,11 @@ $('#mytab').bootstrapTable({
             title:'出院日期',
             field:'disTime',
             formatter: function(value,row,index){
-                return covertDate(value);
+                if(value != '') {
+                    return covertDate(value);
+                }else{
+                    return value;
+                }
             }
         },
         {