From 35119daaf0b7493c12872a0f06fc3d3592227094 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 7 Mar 2022 11:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=97=85=E6=A1=88=E5=AE=A4?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=A9=B4=E5=84=BF=E7=9A=84=E7=BA=B8=E8=B4=A8?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E7=8A=B6=E6=80=81=E8=B7=9F=E9=9A=8F=E6=AF=8D?=
 =?UTF-8?q?=E4=BA=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/dao/Archive_MasterMapper.java     |  1 +
 .../ipml/Archive_MasterServiceImpl.java       | 10 ++++++++
 .../resources/mapper/Archive_MasterMapper.xml | 23 ++++++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java
index 1fe7ec1..4c8b59f 100644
--- a/src/main/java/com/emr/dao/Archive_MasterMapper.java
+++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java
@@ -95,4 +95,5 @@ public interface Archive_MasterMapper {
                                              @Param("reDeadDate")String reDeadDate,
                                              @Param("startDateTo")String startDateTo,
                                              @Param("endDateTo")String endDateTo);
+    List<String> selectBabyIdWithScan();
 }
\ No newline at end of file
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index f0848f1..7cfe900 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -223,6 +223,8 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             Emr_Dictionary dictionary = new Emr_Dictionary();
             dictionary.setTypecode("dept_code");
             List<Emr_Dictionary> dictionaries = dictionaryMapper.dicByTypeCode(dictionary);
+            //查询孕妇有扫描的婴儿的id
+            List<String> scanBabyIdList = archiveMasterMapper.selectBabyIdWithScan();
             for (Archive_Master_Vo masterVo : list) {
                 //科室名称编码转名称
                 deptNameCode2Name(dictionaries, masterVo);
@@ -233,6 +235,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                 }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){
                     masterVo.setStatus(EnumVerify.DocState.CallBacked.getName());
                 }
+                if(!CollectionUtils.isEmpty(scanBabyIdList) && (StringUtils.isBlank(archiveMasterVo.getCheckName()) || "1".equals(archiveMasterVo.getCheckName()))){
+                    for(String scanBabyId : scanBabyIdList){
+                        if(masterVo.getId().equals(scanBabyId)){
+                            masterVo.setCheckName("是");
+                            break;
+                        }
+                    }
+                }
             }
         }
         return list;
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index c78f112..a3ab8eb 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -753,13 +753,12 @@
             </choose>
         </if>
         <if test="checkName != null and checkName != ''">
-            AND MasterID IS
             <choose>
                 <when test="checkName == 0">
-                    NULL
+                    AND MasterID IS NULL AND id not in (<include refid="selectBabyIdWithScanSql"></include>)
                 </when>
                 <when test="checkName == 1">
-                    NOT NULL
+                    AND (MasterID IS NOT NULL or id in (<include refid="selectBabyIdWithScanSql"></include>))
                 </when>
             </choose>
         </if>
@@ -1592,4 +1591,22 @@
             AND ArchiveState != '128'
             <include refid="disDateRangeWhereSql"></include>)
     </select>
+    <!--查询孕妇有扫描的婴儿的id-->
+    <select id="selectBabyIdWithScan" resultType="java.lang.String">
+        <include refid="selectBabyIdWithScanSql"></include>
+    </select>
+    <sql id="selectBabyIdWithScanSql">
+        SELECT
+            b.ID
+        FROM
+            archive_detail
+            INNER JOIN archive_master ON archive_master.id = archive_detail.MasterID
+            LEFT JOIN archive_master b ON archive_master.patient_id = b.ID_NO
+        WHERE
+            Source = '扫描上传'
+            AND archive_detail.flag = '0'
+            AND b.id IS NOT NULL
+        GROUP BY
+            b.ID
+    </sql>
 </mapper>
\ No newline at end of file