From 39d8675f273df7fff087e335e7c863d37cd96738 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 7 Mar 2022 22:03:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=94=B5=E5=AD=90=E7=97=85?=
 =?UTF-8?q?=E5=8E=86=E4=BB=BB=E5=8A=A1=E8=A7=86=E5=9B=BE=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?'=E6=89=8B=E6=9C=AF=E5=90=8C=E6=84=8F=E4=B9=A6'=E3=80=81'?=
 =?UTF-8?q?=E6=89=8B=E6=9C=AF=E5=AE=89=E5=85=A8=E5=AE=A1=E6=A0=B8=E5=8D=95?=
 =?UTF-8?q?'=E3=80=81'=E6=89=8B=E6=9C=AF=E9=A3=8E=E9=99=A9=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E5=8D=95'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/service/ipml/Archive_MasterServiceImpl.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 15566eb..30f9507 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -1347,7 +1347,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         StringBuilder failResult = new StringBuilder();
         //判断护理文书是否完成sysFlag = 1
         //查询护理文书采集任务
-        String sql1 = "SELECT SHOW_NAME,KDSJ FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND JZH = '"+jzh+"'";
+        String sql1 = "SELECT SHOW_NAME,KDSJ FROM V_JSWZH_HL_DATA WHERE (ENABLED_VALUE = 'Y' OR ENABLED_VALUE IS NULL) AND SHOW_NAME != '护嘱单' AND JZH = '"+jzh+"'";
         try {
             List<Map> selectList1 = OracleConnect.selectListConvertMap(sql1);
             if(!CollectionUtils.isEmpty(selectList1)) {
@@ -1402,7 +1402,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         }
         //判断电子病历是否完成sysFlag = 2
         //查询电子病历采集任务
-        String sql2 = "SELECT FPAT_NO,FREC_ID,FENTRY_NAME,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FPAT_NO = '"+jzh+"'";
+        String sql2 = "SELECT FPAT_NO,FREC_ID,FENTRY_NAME,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FENTRY_NAME NOT IN ('手术同意书'、'手术安全审核单'、'手术风险评估单') AND FPAT_NO = '"+jzh+"'";
         try {
             List<Map> selectList2 = OracleConnect.selectListConvertMap(sql2);
             if(!CollectionUtils.isEmpty(selectList2)) {