From 43576dca0b76636a24db7e3b3c16d98de9cce843 Mon Sep 17 00:00:00 2001
From: wzqgit <568275241@qq.com>
Date: Mon, 18 Oct 2021 17:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=8D=95=E7=8B=AC=E6=A0=A1=E9=AA=8C=E9=A6=96?=
 =?UTF-8?q?=E6=AC=A1=E6=8A=A4=E7=90=86=E8=AE=B0=E5=BD=95=E5=8D=95=20-wzq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interfaces/impl/HomepageDictionaryImpl.java  | 16 +++++++++++++++-
 .../demo/repository/ArchiveDetailRepository.java | 11 ++++++++++-
 .../ann/demo/service/ArchiveDetailService.java   |  2 ++
 .../service/impl/ArchiveDetailServiceImpl.java   |  5 +++++
 src/main/resources/application.yml               |  3 ++-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
index 9f3f46e..77d9351 100644
--- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
+++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java
@@ -101,6 +101,20 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
                     }
                 }
                 //----------------单独处理出院记录
+
+                //----------------单独处理重症单中“首次护理记录单”
+                List list2 = new ArrayList<String>();
+                list2.add("7");
+                String huliResult = archiveDetailService.getTypeNotExits(list2, masterId);
+                if (huliResult != null){
+                    //缺失首次护理记录单（来源V6护士）
+                    //再判断重症单中是否有首次护理记录单
+                    Integer result = archiveDetailService.countFirstNursingRecord(masterId, "121");
+                    if (result==0){
+                        //重症单中没有首次护理记录单
+                        sb.append("缺失首次护理记录单");
+                    }
+                }
             }
 
             // 检验申请单
@@ -124,7 +138,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary {
         }catch (Exception e){
             sb.setLength(0);
             sb.append("服务器正忙");
-            logger.error("出错了：",e);
+            logger.error("出错了：",e.getMessage());
         }
         return sb + "";
     }
diff --git a/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java b/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java
index 40fe762..9b6b545 100644
--- a/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java
+++ b/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java
@@ -21,7 +21,7 @@ public interface ArchiveDetailRepository extends JpaRepository<ArchiveDetail, St
     @Query(value = "SELECT stuff(" +
             "   (SELECT  '，' + CONVERT(VARCHAR,a.assort_name) " +
             "        FROM zd_assort a WHERE a.assort_id in ?1  " +
-            "        and NOT EXISTS(SELECT id FROM archive_detail d WHERE  a.assort_id = d.AssortID  and  d.MasterID = ?2 ) " +
+            "        and NOT EXISTS(SELECT id FROM archive_detail d WHERE  a.assort_id = d.AssortID and d.flag=0 and  d.MasterID = ?2 ) " +
             "    FOR XML PATH ('') " +
             "    ),1,1,'') ", nativeQuery = true)
     String getTypeNotExits(List<String> type, String masterId);
@@ -109,5 +109,14 @@ public interface ArchiveDetailRepository extends JpaRepository<ArchiveDetail, St
     @Query("select count(o) from ArchiveDetail o where o.masterID = ?1 and o.assortID = ?2 and o.flag = ?3 ")
     public Integer countDetail(String masterId,String assortId,String flag);
 
+    /**
+     * 检查重症单里是否有首次护理记录单 2021/4/8
+     * @param masterId
+     * @param assortId
+     * @param flag
+     * @return
+     */
+    @Query("select count(o.title) from ArchiveDetail o where o.masterID = ?1 and o.assortID = ?2 and o.flag = ?3 and o.title like '%首次护理记录%'")
+    public Integer countFirstNursingRecord(String masterId,String assortId,String flag);
 }
 
diff --git a/src/main/java/com/ann/demo/service/ArchiveDetailService.java b/src/main/java/com/ann/demo/service/ArchiveDetailService.java
index 8ffc6a9..e591122 100644
--- a/src/main/java/com/ann/demo/service/ArchiveDetailService.java
+++ b/src/main/java/com/ann/demo/service/ArchiveDetailService.java
@@ -25,4 +25,6 @@ public interface ArchiveDetailService {
     String getBeHospitalized(String masterId,String assortId);
 
     Integer countDetail(String masterId, String s);
+
+    Integer countFirstNursingRecord(String masterId, String s);
 }
diff --git a/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java b/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java
index 4e1d061..477129c 100644
--- a/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java
+++ b/src/main/java/com/ann/demo/service/impl/ArchiveDetailServiceImpl.java
@@ -113,6 +113,11 @@ public class ArchiveDetailServiceImpl implements ArchiveDetailService {
     public String getCheckReportNotExits1(List<String> types, String masterId) {
         return archiveDetailRepository.getCheckReportNotExits1( types,masterId);
     }
+
+    @Override
+    public Integer countFirstNursingRecord(String masterId, String s) {
+        return archiveDetailRepository.countFirstNursingRecord(masterId,s,"0");
+    }
 }
 
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b6f45bf..fcf06b3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -39,7 +39,8 @@ spring:
 
 #完整性核查 必查项，填类型id
 #9月 增加大类的校验
-mustCheckData: 3,9,20,122,123,5,7,2
+#mustCheckData: 3,9,20,122,123,5,7,2
+mustCheckData: 3,9,20,122,123,5,2
 #2020-9-23 1、新增60、110 核医学以及其他报告 2、将检查检验校验合并（因超声会有合并报告）
 inspectionReportType: 54,59,52,57,60,110,10
 checkReportType: 54,59,52,57