diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index 1daf48e28..1a5668834 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -1015,6 +1015,37 @@ class PollNewQuestbank extends Component {
 					return;
 				}
 
+				if(object.question.max_choices){
+					if(object.question.max_choices>0){
+						if(object.question.min_choices){
+							if(object.question.min_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
+
+				if(object.question.min_choices){
+					if(object.question.min_choices>0){
+						if(object.question.max_choices){
+							if(object.question.max_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
 				var questiontwo = {};
 				var other = [];
 				var option = [];
@@ -1214,6 +1245,38 @@ class PollNewQuestbank extends Component {
 
 					return;
 				}
+
+				if(object.question.max_choices){
+					if(object.question.max_choices>0){
+						if(object.question.min_choices){
+							if(object.question.min_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
+
+				if(object.question.min_choices){
+					if(object.question.min_choices>0){
+						if(object.question.max_choices){
+							if(object.question.max_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
 				var questiontwo = {};
 				var other = [];
 				var option = [];
@@ -1503,6 +1566,39 @@ class PollNewQuestbank extends Component {
 					return;
 				}
 
+
+				if(object.question.max_choices){
+					if(object.question.max_choices>0){
+						if(object.question.min_choices){
+							if(object.question.min_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
+
+				if(object.question.min_choices){
+					if(object.question.min_choices>0){
+						if(object.question.max_choices){
+							if(object.question.max_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
+
 				var questiontwo = {};
 				var other = [];
 				var option = [];
@@ -1673,6 +1769,39 @@ class PollNewQuestbank extends Component {
 
 					return;
 				}
+
+
+				if(object.question.max_choices){
+					if(object.question.max_choices>0){
+						if(object.question.min_choices){
+							if(object.question.min_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
+
+				if(object.question.min_choices){
+					if(object.question.min_choices>0){
+						if(object.question.max_choices){
+							if(object.question.max_choices===0){
+								this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+								return;
+							}
+						}else {
+							this.props.showNotification(`最小和最大限制须同时为数值或者“--"`);
+							return;
+
+						}
+					}
+
+				}
 				var questiontwo = {};
 				var other = [];
 				var option = [];
@@ -2240,60 +2369,75 @@ class PollNewQuestbank extends Component {
 	}
 //最小值
 	HandleGradationGroupChangee = (value, index, max, length) => {
+		// console.log("最小值");
+		// console.log(value);
+		// console.log(index);
+		// console.log(max);
+		// console.log(length);
+
+		// debugger
 		var minbool = false;
 		var maxbool = false;
 		let arr = this.state.adddom;
-		if (parseInt(value) === 0 || parseInt(value) === "0" || parseInt(value) === null || parseInt(value) === undefined || parseInt(value) < 1) {
-			minbool = true;
-		}
-		if (max === 0 || max === "0" || max === null || max === undefined) {
-			maxbool = true;
-		}
-
-		if (minbool === true && maxbool === true) {
-			for (var i = 0; i < arr.length; i++) {
-				if (index === i) {
-					arr[i].question.min_choices = parseInt(value);
-				}
-			}
-			this.setState({
-				adddom: arr
-			})
-		} else {
-			for (var i = 0; i < arr.length; i++) {
-				if (index === i) {
-					arr[i].question.min_choices = parseInt(value);
-					arr[i].question.max_choices = length;
-					break;
-				}
+		// if (parseInt(value) === 0 || parseInt(value) === "0" || parseInt(value) === null || parseInt(value) === undefined || parseInt(value) < 1) {
+		// 	minbool = true;
+		// }
+		// if (max === 0 || max === "0" || max === null || max === undefined) {
+		// 	maxbool = true;
+		// }
+		//
+		// if (minbool === true && maxbool === true) {
+		// 	for (var i = 0; i < arr.length; i++) {
+		// 		if (index === i) {
+		// 					arr[i].question.min_choices = parseInt(value);
+		// 		}
+		// 	}
+		// 	this.setState({
+		// 		adddom: arr
+		// 	})
+		// } else {
+		for (var i = 0; i < arr.length; i++) {
+			if (index === i) {
+				arr[i].question.min_choices = parseInt(value);
+				// arr[i].question.max_choices = length;
+				break;
 			}
-			this.setState({
-				adddom: arr
-			})
 		}
+		this.setState({
+			adddom: arr
+		})
+		// }
 
 	}
 
 	//最大值
-	HandleGradationGroupChangeee = (value, index, minchoices, length) => {
+	HandleGradationGroupChangeee = (value, index,minchoices,length) => {
+		// 	console.log("2112");
+		//  console.log(value);
+		// console.log(minchoices);
+		// 	console.log("最大值");
+		// 	console.log(value);
+		// 	console.log(index);
+		// 	console.log(minchoices);
+		// 	console.log(length);
 		let arr = this.state.adddom;
 		for (var i = 0; i < arr.length; i++) {
 			if (index === i) {
-				if(parseInt(value)===0&&parseInt(minchoices)===0){
-					arr[i].question.min_choices= parseInt(0);
-					arr[i].question.max_choices = parseInt(0);
-				}else if(parseInt(minchoices)===0){
-					arr[i].question.min_choices= parseInt(2);
-					arr[i].question.max_choices = parseInt(value);
-				}
-				else if(parseInt(value)===0&&parseInt(minchoices)>0){
-					arr[i].question.min_choices= parseInt(minchoices);
-					arr[i].question.max_choices = parseInt(value);
-				}
-				else {
-					arr[i].question.min_choices= minchoices===null?2:minchoices===undefined?2:minchoices===0?2:parseInt(minchoices);
-					arr[i].question.max_choices =  parseInt(value);
-				}
+				// if(parseInt(value)===0&&parseInt(minchoices)===0){
+				// 	arr[i].question.min_choices= parseInt(0);
+				// 	arr[i].question.max_choices = parseInt(0);
+				// }else if(parseInt(minchoices)===0){
+				// 	arr[i].question.min_choices= parseInt(2);
+				// 	arr[i].question.max_choices = parseInt(value);
+				// }
+				// else if(parseInt(value)===0&&parseInt(minchoices)>0){
+				// 	arr[i].question.min_choices= parseInt(minchoices);
+				// 	arr[i].question.max_choices = parseInt(value);
+				// }
+				// else {
+				// 	arr[i].question.min_choices= minchoices===null?2:minchoices===undefined?2:minchoices===0?2:parseInt(minchoices);
+				arr[i].question.max_choices =  parseInt(value);
+				// }
 			}
 		}
 		// console.log(2119);
@@ -2301,6 +2445,7 @@ class PollNewQuestbank extends Component {
 		this.setState({
 			adddom: arr
 		})
+		// console.log(this.state.adddom);
 	}
 
 	//提交题目//没有就创建新的题库，新建问newz题和保存题目不一样不能同时保存 这里只是新建 和编辑 标题和须知
@@ -2831,7 +2976,7 @@ class PollNewQuestbank extends Component {
 									<span
 										className=" ml10">{item.question.is_necessary === 1 ? "(必答)" : item.question.question_type === 2 ? "(选答)" : "(选答)"}</span>
 									<span style={{color: "#4B4B4B"}}
-												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制"  : "可选" + item.question.min_choices + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
+												className="font-16 mt10 ml10">{(item.question.min_choices === undefined && item.question.max_choices === undefined ? "不限制" : item.question.min_choices === null && item.question.max_choices === null ? "不限制" : item.question.min_choices === 0 && item.question.max_choices === 0 ? "": item.question.min_choices === "null" && item.question.max_choices === "null" ? "不限制" : item.question.min_choices === item.question.max_choices && item.question.max_choices ===  item.question.min_choices  ? "可选"+(item.question.max_choices)+"项" : "可选" +(item.question.min_choices===undefined||item.question.min_choices===null||item.question.min_choices===""||item.question.min_choices==="null"?2:item.question.min_choices) + "-" + (item.question.max_choices===undefined||item.question.max_choices===null||item.question.max_choices===""||item.question.max_choices==="null"?item.question.answers.length:item.question.max_choices) + "项")}</span>
 									{
 										polls_status === undefined || polls_status === 1 ?
 											<span className="fr">