Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
===================================================================
diff -u -r16284 -r16286
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 16284)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 16286)
@@ -586,8 +586,11 @@
 				json.put("haveFinishConfirm", false);
 				json.put("curLoginUserName", AcegiHelper.getLoginUserFullName());
 			}else{
-				if(sr.getIsSituationComfirm() == true){
+				if(sr.getIsSituationComfirm() != null && sr.getIsSituationComfirm() == true){
 					json.put("haveFinishConfirm", true);	
+				}else{
+					json.put("haveFinishConfirm", false);
+					json.put("curLoginUserName", AcegiHelper.getLoginUserFullName());
 				}
 			}
 			return json.toString();