Index: forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
===================================================================
diff -u -r23440 -r23455
--- forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java	(.../WorkFlowApprovalTaskManagerImpl.java)	(revision 23440)
+++ forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java	(.../WorkFlowApprovalTaskManagerImpl.java)	(revision 23455)
@@ -5,7 +5,6 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
@@ -23,7 +22,6 @@
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
-import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.util.ExtJsUtil;
 import com.forgon.util.ExtGridUtils;
 import com.forgon.workflow.model.NodeApproval;
@@ -146,22 +144,22 @@
 	//设是否省平台产品,是否院内目录产品,是否平台授权配送企业
 	private void setWorkFlowApprovalTaskOPTION(WorkFlowApprovalTaskVO workFlowApprovalTaskVO,WorkFlowApprovalTask workFlowApprovalTask){
 		//是否省平台产品
-		if(WorkFlowApprovalTask.OPTION_YES.equals(workFlowApprovalTaskVO.getIsProvinceProductStr())){
-			workFlowApprovalTask.setIsProvinceProduct(WorkFlowApprovalTask.OPTION_YES);
-		}else if(WorkFlowApprovalTask.OPTION_NO.equals(workFlowApprovalTaskVO.getIsProvinceProductStr())){
-			workFlowApprovalTask.setIsProvinceProduct(WorkFlowApprovalTask.OPTION_NO);
+		if(Constants.STR_YES.equals(workFlowApprovalTaskVO.getIsProvinceProductStr())){
+			workFlowApprovalTask.setIsProvinceProduct(Constants.STR_YES);
+		}else if(Constants.STR_NO.equals(workFlowApprovalTaskVO.getIsProvinceProductStr())){
+			workFlowApprovalTask.setIsProvinceProduct(Constants.STR_NO);
 		};
 		//是否院内目录产品
-		if(WorkFlowApprovalTask.OPTION_YES.equals(workFlowApprovalTaskVO.getIsHospitalProductStr())){
-			workFlowApprovalTask.setIsHospitalProduct(WorkFlowApprovalTask.OPTION_YES);
-		}else if(WorkFlowApprovalTask.OPTION_NO.equals(workFlowApprovalTaskVO.getIsHospitalProductStr())){
-			workFlowApprovalTask.setIsHospitalProduct(WorkFlowApprovalTask.OPTION_NO);
+		if(Constants.STR_YES.equals(workFlowApprovalTaskVO.getIsHospitalProductStr())){
+			workFlowApprovalTask.setIsHospitalProduct(Constants.STR_YES);
+		}else if(Constants.STR_NO.equals(workFlowApprovalTaskVO.getIsHospitalProductStr())){
+			workFlowApprovalTask.setIsHospitalProduct(Constants.STR_NO);
 		};
 		//是否平台授权配送企业
-		if(WorkFlowApprovalTask.OPTION_YES.equals(workFlowApprovalTaskVO.getIsPlatformAuthorizedEnterpriseStr())){
-			workFlowApprovalTask.setIsPlatformAuthorizedEnterprise(WorkFlowApprovalTask.OPTION_YES);
-		}else if(WorkFlowApprovalTask.OPTION_NO.equals(workFlowApprovalTaskVO.getIsPlatformAuthorizedEnterpriseStr())){
-			workFlowApprovalTask.setIsPlatformAuthorizedEnterprise(WorkFlowApprovalTask.OPTION_NO);
+		if(Constants.STR_YES.equals(workFlowApprovalTaskVO.getIsPlatformAuthorizedEnterpriseStr())){
+			workFlowApprovalTask.setIsPlatformAuthorizedEnterprise(Constants.STR_YES);
+		}else if(Constants.STR_NO.equals(workFlowApprovalTaskVO.getIsPlatformAuthorizedEnterpriseStr())){
+			workFlowApprovalTask.setIsPlatformAuthorizedEnterprise(Constants.STR_NO);
 		};
 	}
 	
@@ -428,6 +426,8 @@
 			if(user==null){
 				throw new RuntimeException("没有查询到起单人");
 			}
+			//设是否省平台产品,是否院内目录产品,是否平台授权配送企业
+			setWorkFlowApprovalTaskOPTION(workFlowApprovalTaskVO,workFlowApprovalTaskFail);
 			workFlowApprovalTaskFail.setUserId(user.getId());
 			save(workFlowApprovalTaskFail);
 		}else{
@@ -487,6 +487,8 @@
 				newWorkFlowApprovalTask.setCreateTaskTime(new Date());			
 			}
 			newWorkFlowApprovalTask.setStatus(0);
+			//设是否省平台产品,是否院内目录产品,是否平台授权配送企业
+			setWorkFlowApprovalTaskOPTION(workFlowApprovalTaskVO,newWorkFlowApprovalTask);
 			save(newWorkFlowApprovalTask);
 		}else{
 			throw new RuntimeException("待办任务已经被处理了");