Index: ssts-web/src/main/webapp/common/previewWangEditor.jsp
===================================================================
diff -u -r34251 -r34298
--- ssts-web/src/main/webapp/common/previewWangEditor.jsp	(.../previewWangEditor.jsp)	(revision 34251)
+++ ssts-web/src/main/webapp/common/previewWangEditor.jsp	(.../previewWangEditor.jsp)	(revision 34298)
@@ -15,6 +15,7 @@
 		<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
 		<script>
 			var WWWROOT = '${ctx}';
+			var objectId = '${param.id}';
 		</script>
 		<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js?version=${svnRevision}"></script>
 		<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
@@ -82,17 +83,48 @@
 	</body>
 	<script>
 		var text = '';
-		if(top.Ext.getCmp('previewNote')){
-			text = top.Ext.getCmp('previewNote').getValue();
-		}else if(window.parent.document.getElementById('iframe_packing')){
-			text = sessionStorage.getItem('hiddenNote');
-		}
 		var note = '';
-		if(text.split('<p>').length > 1){
-			note = text;
+		var id;
+		if(objectId.split('?').length >= 1){
+			id = objectId.split('?')[0];
 		}else {
-			note = '<p>'+text+'</p>';
+			id = objectId;
 		}
-		$('#editor-content-view').html(note);
+		if(id && id !== '' && id !== 'undefined'){
+			$.ajax({
+				type:'post',
+				dataType:'json',
+				url :  WWWROOT+'/disinfectSystem/baseData/tousseDefinitionAction!loadTousseDefinitionNote.do',
+				data:{
+					id:id
+				},
+				success : function(result) {
+					if(result.success){
+						if(result.data && result.data.note){
+							text = result.data.note;
+						}
+						if(text.indexOf('<p>') >= 0){
+							note = text;
+						}else {
+							note = '<p>'+text+'</p>';
+						}
+						$('#editor-content-view').html(note);
+					}else {
+						showResult(result.message);
+					}
+				}
+			})
+		}else {
+			if(sessionStorage.getItem('hiddenNote')){
+				text = sessionStorage.getItem('hiddenNote');
+				sessionStorage.removeItem('hiddenNote');
+			}
+			if(text.indexOf('<p>') >= 0){
+				note = text;
+			}else {
+				note = '<p>'+text+'</p>';
+			}
+			$('#editor-content-view').html(note);
+		}
 	</script>
 </html>
\ No newline at end of file