Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js
===================================================================
diff -u -r39073 -r39104
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js	(.../satisfactionSurveyTemplateForm.js)	(revision 39073)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateForm.js	(.../satisfactionSurveyTemplateForm.js)	(revision 39104)
@@ -68,7 +68,7 @@
 				}
 			}
 		});
-		if (ishidden) {
+		if (ishidden && sstsConfig.enableDefaultSatisfactionOptionsFunction) {
 			showDefaultSatisfactionOption = true;
 			columns.push({
 				header: '默认选项',
Index: ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js
===================================================================
diff -u -r39102 -r39104
--- ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js	(.../satisfactionSurveyTableForm.js)	(revision 39102)
+++ ssts-web/src/main/webapp/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableForm.js	(.../satisfactionSurveyTableForm.js)	(revision 39104)
@@ -424,24 +424,32 @@
 			if (sstsConfig.satisfactionSurveyMode == 1) {
 				var optionInstance;
 				var satifyResaon = childNode.get('satifyResaon') || '';
-				if (childNode.get('defaultSatisfactionOptionInstance') !== '') {
-					optionInstance = childNode.get('defaultSatisfactionOptionInstance');
+				var satisfactionDetail = childNode.get('satisfactionDetail') || '';
+				var defaultSatisfactionOptionInstance = childNode.get('defaultSatisfactionOptionInstance') || '';
+				if (defaultSatisfactionOptionInstance !== '') {
+					optionInstance = defaultSatisfactionOptionInstance;
 					node.satisfaction = satisfaction;
-				} else if (childNode.get('satisfactionDetail') !== '') {
-					optionInstance = childNode.get('satisfactionDetail').satisfactionOptionInstance;
-					node.satisfaction = optionInstance.satisfaction;
-				}else {
+					if (optionInstance.reasonNotNull == '是' && satifyResaon == '') {
+						showResult(node.content + '需要填写原因，请补充。');
+						return false;
+					}
+				} else if (satisfactionDetail !== '') {
+					optionInstance = satisfactionDetail.satisfactionOptionInstance || '';
+					if (optionInstance !== '') {
+						node.satisfaction = optionInstance.satisfaction;
+						if (optionInstance.reasonNotNull == '是' && satifyResaon == '') {
+							showResult(node.content + '需要填写原因，请补充。');
+							return false;
+						}
+					}
+				} else {
 					showResult("请为“" + node.content + "”内容项选择满意度！");
 					return false;
 				}
-				if (optionInstance.reasonNotNull == '是' && satifyResaon == '') {
-					showResult(node.content + '需要填写原因，请补充。');
-					return false;
-				}
 				node.satisfactionDetail = {
 					satifyResaon: satifyResaon,
 					satisfactionOptionInstance: {
-						id: optionInstance.id
+						id: (optionInstance !== '') ? optionInstance.id : ''
 					}
 				}
 			} else {
@@ -466,25 +474,36 @@
 				var node2 = {};
 				node2.id = childNode2.get('id');
 				node2.content = childNode2.get('content');
-				var satisfaction = childNode2.get('satisfaction');
+				var satisfaction = childNode2.get('satisfaction') || '';
 				if (sstsConfig.satisfactionSurveyMode == 1) {
 					var satifyResaon = childNode2.get('satifyResaon') || '';
+					var satisfactionDetail = childNode2.get('satisfactionDetail') || '';
+					var defaultSatisfactionOptionInstance = childNode2.get('defaultSatisfactionOptionInstance') || '';
 					var optionInstance;
-					if (childNode2.get('defaultSatisfactionOptionInstance')) {
-						optionInstance = childNode2.get('defaultSatisfactionOptionInstance');
+					if (defaultSatisfactionOptionInstance) {
+						optionInstance = defaultSatisfactionOptionInstance;
 						node2.satisfaction = satisfaction;
+						if (optionInstance.reasonNotNull == '是' && satifyResaon == '') {
+							showResult(node2.content + '需要填写原因，请补充。');
+							return false;
+						}
+					} else if (satisfactionDetail !== '') {
+						optionInstance = childNode2.get('satisfactionDetail').satisfactionOptionInstance || '';
+						if (optionInstance !== '') {
+							node2.satisfaction = optionInstance.satisfaction;
+							if (optionInstance.reasonNotNull == '是' && satifyResaon == '') {
+								showResult(node2.content + '需要填写原因，请补充。');
+								return false;
+							}
+						}
 					} else {
-						optionInstance = childNode2.get('satisfactionDetail').satisfactionOptionInstance;
-						node2.satisfaction = optionInstance.satisfaction;
-					}
-					if (optionInstance.reasonNotNull == '是' && satifyResaon == '') {
-						showResult(node2.content + '需要填写原因，请补充。');
+						showResult("请为“" + node2.content + "”内容项选择满意度！");
 						return false;
 					}
 					node2.satisfactionDetail = {
 						satifyResaon: satifyResaon,
 						satisfactionOptionInstance: {
-							id: optionInstance.id
+							id: (optionInstance !== '') ? optionInstance.id : ''
 						}
 					}
 				} else {