From f4082898a3e3c180408d45e51d180595fc53ff53 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 21 Dec 2020 18:34:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=9C=80=E9=87=87=E9=9B=86pacs?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=B8=8D=E4=B8=80=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/dao/ArchiveOtherExtMapper.java  |  4 +++-
 .../emr/service/ipml/ArchiveOtherExtService.java | 12 ++++++++++++
 .../resources/mapper/ArchiveOtherExtMapper.xml   | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java
index bf4df82..211343d 100644
--- a/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java
+++ b/src/main/java/com/emr/dao/ArchiveOtherExtMapper.java
@@ -24,7 +24,7 @@ public interface ArchiveOtherExtMapper {
 
     List<ArchiveOtherExtVo> selectAllByIds(@Param("ids") String ids);
 
-    //int updateSubmit(@Param("ids")String ids);
+    int updateSubmit(@Param("ids")String ids);
 
     /**
      * 根据ids字段的查询与同步更新比较时间比较较晚时间的集合
@@ -52,4 +52,6 @@ public interface ArchiveOtherExtMapper {
      * @return
      */
     String selectMaxETimeByNursingAndJzh(@Param("patientId")String patientId);
+
+    List<ArchiveOtherExt> selectListBySysFlagAndIds(@Param("sysFlag")Integer sysFlag,@Param("ids")String ids);
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
index a4643a0..ec3ce26 100644
--- a/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
+++ b/src/main/java/com/emr/service/ipml/ArchiveOtherExtService.java
@@ -170,6 +170,18 @@ public class ArchiveOtherExtService {
         }else{
             notExistTemp = idsTemp;
         }
+        //查询是否存在pacs集合
+        List<ArchiveOtherExt> pacsOtherExts = archiveOtherExtMapper.selectListBySysFlagAndIds(3, idsTemp);
+        if(!CollectionUtils.isEmpty(pacsOtherExts)){
+            StringBuilder pacsIds = new StringBuilder();
+            for(ArchiveOtherExt obj : pacsOtherExts){
+                if(StringUtils.isNotBlank(pacsIds)){
+                    pacsIds.append(",");
+                }
+                pacsIds.append("'").append(obj.getId()).append("'");
+            }
+            archiveOtherExtMapper.updateSubmit(pacsIds.toString());
+        }
         //不存在的部门批量添加
         //查询other_ext记录
         if(StringUtils.isNotBlank(notExistTemp)) {
diff --git a/src/main/resources/mapper/ArchiveOtherExtMapper.xml b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
index df523b3..0bd1da4 100644
--- a/src/main/resources/mapper/ArchiveOtherExtMapper.xml
+++ b/src/main/resources/mapper/ArchiveOtherExtMapper.xml
@@ -503,7 +503,7 @@
      CONVERT(varchar(19),eTime,120) etimeStr
      from archive_other_ext where id in (${ids})
   </select>
-  <!--&lt;!&ndash;批量更新statusFlag = 0&ndash;&gt;
+  <!--批量更新statusFlag = 0-->
   <update id="updateSubmit">
       update archive_other_ext
       set statusFlag = 0,T2 = '1801-02-03'
@@ -512,7 +512,7 @@
               ID in (${ids})
           </if>
       </where>
-  </update>-->
+  </update>
   <!--根据ids字段的查询与同步更新比较时间比较较晚时间的集合-->
   <select id="selectAllByIdsAndSubmitTime" resultMap="BaseResultMap">
       SELECT
@@ -612,4 +612,16 @@
   <select id="selectMaxETimeByNursingAndJzh" resultType="java.lang.String">
     select top 1 convert(varchar(19),eTime,120) eTime from archive_other_ext where sysFlag = 1 and jzh = #{patientId} order by eTime desc
   </select>
+  <!--根据sysFlag和id集合查询记录-->
+  <select id="selectListBySysFlagAndIds" resultMap="BaseResultMap">
+      select id from archive_other_ext
+      <where>
+          <if test="sysFlag != null">
+             and sysFlag = #{sysFlag}
+          </if>
+          <if test="ids != null and ids != ''">
+             and id in (${ids})
+          </if>
+      </where>
+  </select>
 </mapper>