From 2ac9b2ae8b6d4c7916fa04a4c5d65092c61c982c Mon Sep 17 00:00:00 2001
From: lxx <466693313@qq.com>
Date: Fri, 17 Jan 2025 10:21:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=89=A9=E8=B5=84=E8=80=97=E6=9D=90=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F-=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7-=E7=89=A9?=
 =?UTF-8?q?=E8=B5=84=E9=80=80=E8=B4=A7=E5=88=B6=E5=8D=95=EF=BC=9A=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=AE=8C=E6=88=90=E9=99=90=E5=88=B6=202.=E8=8D=AF?=
 =?UTF-8?q?=E4=BA=8B=E7=B3=BB=E7=BB=9F-=E9=80=80=E8=B4=A7-=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=88=B6=E5=8D=95=EF=BC=9A=E5=B7=B2=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WEB-INF/src/com/his/yfyk/service/YptkService.java | 11 ++++++++---
 WEB-INF/src/com/mms/service/MMStkService.java     |  9 ++++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/WEB-INF/src/com/his/yfyk/service/YptkService.java b/WEB-INF/src/com/his/yfyk/service/YptkService.java
index 9cbf79a..8ca1029 100644
--- a/WEB-INF/src/com/his/yfyk/service/YptkService.java
+++ b/WEB-INF/src/com/his/yfyk/service/YptkService.java
@@ -2,14 +2,11 @@ package com.his.yfyk.service;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import com.his.yfyk.model.YptkModel;
-import com.util.MainLog;
 import com.util.MainUtil;
 import com.util.SnowIdUtils;
 import com.wat.core.config.DaoCreator;
@@ -285,6 +282,7 @@ public class YptkService {
 		String jgid=histhddao.getColumnValueAsString("JGID");
 		String dptid=histhddao.getColumnValueAsString("DPTID");
 		String djh=histhddao.getColumnValueAsString("DJH");
+		String SHZT=histhddao.getColumnValueAsString("SHZT");
 		if(lbwc){
 			for(int i=histhdmxdao.getRowCount()-1;i>=0;i--){
 	    		String rkpkey=histhdmxdao.getColumnValueAsString(i,"RKDMX_PKEY");
@@ -389,6 +387,13 @@ public class YptkService {
 			}
 			if(histhddao.getRowCount()>0) lb=true;
 		}else{
+			
+			if ("1".equals(SHZT)){
+				model.setResult(-1);
+    			model.setMessage("错误:已审核状态,不可取消完成!");
+    			return model;
+			}
+			
 			lb=true;
 			for(int i=0;i<histhdmxdao.getRowCount();i++){
 				String sfxbm=histhdmxdao.getColumnValueAsString(i,"SFX_BM");
diff --git a/WEB-INF/src/com/mms/service/MMStkService.java b/WEB-INF/src/com/mms/service/MMStkService.java
index afbb2ce..717f03f 100644
--- a/WEB-INF/src/com/mms/service/MMStkService.java
+++ b/WEB-INF/src/com/mms/service/MMStkService.java
@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-
 import com.mms.model.MMStkModel;
 import com.util.MainUtil;
 import com.util.SnowIdUtils;
@@ -273,6 +272,7 @@ public class MMStkService {
 		String jgid=mmsthddao.getColumnValueAsString("JGID");
 		String dptid=mmsthddao.getColumnValueAsString("DPTID");
 		String djh=mmsthddao.getColumnValueAsString("DJH");
+		String SHZT=mmsthddao.getColumnValueAsString("SHZT");
 		if(lbwc){
 			for(int i=mmsthdmxdao.getRowCount()-1;i>=0;i--){
 	    		String rkpkey=mmsthdmxdao.getColumnValueAsString(i,"RKDMX_PKEY");
@@ -369,6 +369,13 @@ public class MMStkService {
 			}
 			if(mmsthddao.getRowCount()>0) lb=true;
 		}else{
+			
+			if ("1".equals(SHZT)){
+				model.setResult(-1);
+    			model.setMessage("错误:已审核状态,不可取消完成!");
+    			return model;
+			}
+			
 			lb=true;
 			for(int i=0;i<mmsthdmxdao.getRowCount();i++){
 				String sfxbm=mmsthdmxdao.getColumnValueAsString(i,"SFX_BM");