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 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 selectList2 = OracleConnect.selectListConvertMap(sql2); if(!CollectionUtils.isEmpty(selectList2)) {