diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb
index e446448..61afb45 100644
--- a/ProductFunctionTester/Main_Form.vb
+++ b/ProductFunctionTester/Main_Form.vb
@@ -4666,6 +4666,7 @@ ErrorEnd:
         End Try
 
 RunSuccess:
+        txbWindow.AppendText("=== 합격 데이터 저장 시작 ===" & vbCrLf)
         If RF_PostReg() Then
 
             txbWindow.AppendText("PostgreSQL Data Save : OK" & vbCrLf)
@@ -4710,9 +4711,47 @@ RunSuccess:
             txbWindow.AppendText("PostgreSQL Data Save : FAIL" & vbCrLf)
             FailMain()
         End If
-
+        txbWindow.AppendText("=== 합격 데이터 저장 완료 ===" & vbCrLf)
 ProcessEnd:
         Jig_End()
+        txbWindow.AppendText("=== 불합격 데이터 저장 시작 ===" & vbCrLf)
+        ' 불합격 시에도 전체 데이터 저장 로직 실행
+        If RF_PostReg() Then
+            txbWindow.AppendText("PostgreSQL Data Save (NG) : OK" & vbCrLf)
+
+            If dbRFSave() Then
+                txbWindow.AppendText("DB Data Save (NG) : OK" & vbCrLf)
+
+                If CountChanage() Then
+                    txbWindow.AppendText("Run Count Change Save (NG) : OK" & vbCrLf)
+                    Dim csvData As String = "" & TestData.Test_Serial & "," & NowDate & "," & NowTime & "," & TestData.Test_Firmware & "," & TestData.Test_RFVRMS(0) & "," & TestData.Test_RFFreq(0) & "," & TestData.Test_RFVRMS(1) & "," & TestData.Test_RFFreq(1) & "," & TestData.Test_RFVRMS(2) & "," & TestData.Test_RFFreq(2) & "," & TestData.Test_MCWidth(0) & "," & TestData.Test_MCVpp(0) & "," & TestData.Test_MCFreq(0) & "," & TestData.Test_MCWidth(1) & "," & TestData.Test_MCVpp(1) & "," & TestData.Test_MCFreq(1) & "," & TestData.Test_EPVpp(0) & "," & TestData.Test_EPFreq(0) & "," & TestData.Test_EPPWidth(0) & "," & TestData.Test_EPNWidth(0) & "," & TestData.Test_EPVpp(1) & "," & TestData.Test_EPFreq(1) & "," & TestData.Test_EPPWidth(1) & "," & TestData.Test_EPNWidth(1) & "," & TestData.Test_EPVpp(2) & "," & TestData.Test_EPFreq(2) & "," & TestData.Test_EPPWidth(2) & "," & TestData.Test_EPNWidth(2) & "," & TestError & ""
+
+                    If Save_Csv(csvData) Then
+                        txbWindow.AppendText("CSV Data Save (NG) : FAIL" & vbCrLf)
+                        FailMain()
+                    Else
+                        txbWindow.AppendText("CSV Data Save (NG) : OK" & vbCrLf)
+                        If TestError = False Then
+                            FailMain()
+                        Else
+                            SuccessMain()
+                        End If
+                    End If
+                Else
+                    txbWindow.AppendText("Run Count Change Save (NG) : FAIL" & vbCrLf)
+                    FailMain()
+                End If
+            Else
+                txbWindow.AppendText("DB Data Save (NG) : FAIL" & vbCrLf)
+                FailMain()
+            End If
+        Else
+            txbWindow.AppendText("PostgreSQL Data Save (NG) : FAIL" & vbCrLf)
+            FailMain()
+        End If
+
+        txbWindow.AppendText("=== 불합격 데이터 저장 완료 ===" & vbCrLf)
+
 NormalEnd:
         myscope.IO.Clear()
         'txbWindow.AppendText("[" & MeasureTimeAll(MeasEnd) & "ms] Test Play" & vbCrLf)