From f5575a407485319e4d1d550c9f3682c0e31a0690 Mon Sep 17 00:00:00 2001
From: ALW <850658129@qq.com>
Date: Thu, 22 Dec 2022 09:13:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/service/ipml/ArchiveOtherExtService.java |  1 +
 src/main/java/com/emr/vo/ArchiveOtherExtVo.java      |  2 ++
 src/main/resources/config/config.properties          |  8 ++++++++
 src/main/resources/config/jdbc.properties            | 10 +++++++++-
 src/main/resources/mapper/ArchiveOtherExtMapper.xml  | 12 +++++++-----
 .../static/js/hospitalCommom/hospitalCommom.js       |  1 +
 6 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
index 41abe47..8068754 100644
--- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
+++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
@@ -11,6 +11,7 @@ import com.emr.entity.OffsetLimitPage;
 import com.emr.vo.*;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java
index 9a7841b..3995519 100644
--- a/src/main/java/com/emr/vo/ArchiveOtherExtVo.java
+++ b/src/main/java/com/emr/vo/ArchiveOtherExtVo.java
@@ -19,6 +19,8 @@ import lombok.Data;
 public class ArchiveOtherExtVo extends ArchiveOtherExt {
     private String idTemp;
 
+    private String source;
+
     private Long consumingTime;
 
     private String sysupdatetimeStr;
diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties
index 57222d9..e30471f 100644
--- a/src/main/resources/config/config.properties
+++ b/src/main/resources/config/config.properties
@@ -2,6 +2,10 @@
 #POWER_IP = localhost
 #POWER_PORT = 8081
 
+#POWER_IP = localhost
+#POWER_PORT = 8081
+
+
 POWER_IP = 200.100.104.40
 POWER_PORT = 8081
 
@@ -69,3 +73,7 @@ oraclePassWord = Jswzh
 
 calculationTime= 2022/08/01
 
+
+qualitySwitch=1
+
+
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 310aef5..2cb545d 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -4,9 +4,17 @@
 #dataBaseName=gm_record
 ##\u6570\u636E\u5E93\u5BC6\u7801
 #dataBasePassword=docus702
+#
+##\u6570\u636E\u5E93IP
+#dataBaseIp=localhost
+##\u6570\u636E\u5E93\u540D\u79F0
+#dataBaseName=gm_record
+##\u6570\u636E\u5E93\u5BC6\u7801
+#dataBasePassword=admin123
+
 
 #\u6570\u636E\u5E93IP
-dataBaseIp=200.100.104.40
+dataBaseIp=db.docus.cn
 #\u6570\u636E\u5E93\u540D\u79F0
 dataBaseName=emr_record
 #\u6570\u636E\u5E93\u5BC6\u7801
diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
index 44f4d82..7fc02ae 100644
--- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml
+++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
@@ -530,19 +530,21 @@
     archive_collect_task a
     INNER JOIN archive_detail ON archive_detail.MasterID = a.MasterID
       <where>
-         archive_detail.source in ('1','3')
           <if test="mid != null and mid != ''">
               and archive_detail.MasterID = #{mid,jdbcType=NVARCHAR}
           </if>
           <if test="c1 != null and c1 != ''">
               and archive_detail.Title like '%${c1}%'
           </if>
-          <if test="sysflag != null">
-              and archive_detail.Source = #{sysflag,jdbcType=INTEGER}
+          <if test="source != null and source != ''" >
+              and archive_detail.Source = #{source}
           </if>
-          <if test="statusflag != null">
-              and a.state = #{statusflag,jdbcType=INTEGER}
+          <if test="source == null || source == ''">
+              and archive_detail.source in ('1','3')
           </if>
+        <if test="statusflag != null">
+              and a.state = #{statusflag,jdbcType=INTEGER}
+        </if>
       </where>
       ) temp
       LEFT JOIN archive_detail ON temp.DID = archive_detail.id
diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
index c9656e1..ba34e9a 100644
--- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
+++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js
@@ -1221,6 +1221,7 @@ function initTable5(data,sidePagination) {
                 statusflag:$("#statusflag").val(),
                 mid: $("#masterId").val(),
                 sysflag:$("#sysflag").val(),
+                source:$("#sysflag").val(),
                 assortId:$("#assortIdSearch").val()
             };
             return temp;