diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
index cfd9dec7..aeb03122 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsPqcTaskRecordControllerService.java
@@ -117,21 +117,21 @@ public class QmsPqcTaskRecordControllerService {
                         .setTaskId(taskRecord.getId())
                         .setInspectionPointItemId(item.getId())
                         .setType((short) 0)
-                        .setSelfCheck(false));
+                        .setSelfCheck(null));
 
                 // 类型1：关键物料拍照
                 details.add(new QmsPqcTaskRecordDetails()
                         .setTaskId(taskRecord.getId())
                         .setInspectionPointItemId(item.getId())
                         .setType((short) 1)
-                        .setSelfCheck(false));
+                        .setSelfCheck(null));
             } else {
                 // 其他类型，直接创建
                 details.add(new QmsPqcTaskRecordDetails()
                         .setTaskId(taskRecord.getId())
                         .setInspectionPointItemId(item.getId())
                         .setType(item.getInspectionType() != null ? item.getInspectionType().shortValue() : null)
-                        .setSelfCheck(false));
+                        .setSelfCheck(null));
             }
         }
 
@@ -1094,7 +1094,7 @@ public class QmsPqcTaskRecordControllerService {
             QmsPqcTaskRecordDraftQO.ProcessInspectionItem item = request.getProcessInspections().get(i);
             QmsPqcTaskRecordDetails detail = type0Details.get(i);
             QmsPqcInspectionPointItems pointItem = itemMap.get(detail.getInspectionPointItemId());
-            if (pointItem == null || !Boolean.TRUE.equals(detail.getSelfCheck())) {
+            if (pointItem == null || !Boolean.TRUE.equals(item.getSelfCheck())) {
                 continue;
             }
             if (Objects.equals(pointItem.getInspectionMethods(), 2) && StrUtil.isBlank(item.getSelfTestData())) {
@@ -1127,6 +1127,10 @@ public class QmsPqcTaskRecordControllerService {
                 QmsPqcTaskRecordDraftQO.ProcessInspectionLevel3Item item = request.getProcessInspectionsLevel3().get(i);
                 if (item.getEnable() == null) {
                     emptyFields.add("processInspectionsLevel3[" + i + "].enable");
+                    continue;
+                }
+                if (Objects.equals(item.getInspectionMethods(), 2) && StrUtil.isBlank(item.getQcTestData())) {
+                    emptyFields.add("processInspectionsLevel3[" + i + "].qcTestData");
                 }
             }
         }
@@ -1169,7 +1173,7 @@ public class QmsPqcTaskRecordControllerService {
                         .setType((short) 1)
                         .setInspectionPointItemId(i < type1ItemIds.size() ? type1ItemIds.get(i) : null)
                         .setSelfTestData(item.getSerialNo())
-                        .setSelfCheck(item.getFiles() != null && !item.getFiles().isEmpty())
+                        .setSelfCheck(item.getFiles() != null && !item.getFiles().isEmpty() ? true : null)
                         .setReviewData(item.getBatchNo())
                         .setSelfTestAttachments(serializeFileList(item.getFiles()))
                         .setSelfTestUploadTime(now);
@@ -1186,8 +1190,7 @@ public class QmsPqcTaskRecordControllerService {
                         .setType((short) 0)
                         .setInspectionPointItemId(i < type0ItemIds.size() ? type0ItemIds.get(i) : null)
                         .setSelfTestData(item.getSelfTestData())
-                        .setSelfCheck(StrUtil.isNotBlank(item.getSelfTestData())
-                                || (item.getSelfTestFiles() != null && !item.getSelfTestFiles().isEmpty()))
+                        .setSelfCheck(item.getSelfCheck())
                         .setReviewData(item.getReviewData())
                         .setReviewEnable(item.getEnable())
                         .setSelfTestAttachments(serializeFileList(item.getSelfTestFiles()))
@@ -1209,7 +1212,7 @@ public class QmsPqcTaskRecordControllerService {
                         .setTaskId(taskId)
                         .setType((short) 0)
                         .setInspectionPointItemId(idx < type0ItemIds.size() ? type0ItemIds.get(idx) : null)
-                        .setSelfCheck(false)
+                        .setSelfCheck(null)
                         .setReviewEnable(item.getEnable());
                 if (hasReviewContent) {
                     detail.setReviewData(item.getQcTestData())
@@ -1353,7 +1356,7 @@ public class QmsPqcTaskRecordControllerService {
                     .setTaskId(repairTask.getId())
                     .setInspectionPointItemId(old.getInspectionPointItemId())
                     .setType(old.getType())
-                    .setSelfCheck(false);
+                    .setSelfCheck(null);
 
             if (old.getType() != null && old.getType() == 1) {
                 // 关键物料采集：全部复制
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordDraftQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordDraftQO.java
index 83f7a06d..30bed88b 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordDraftQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordDraftQO.java
@@ -116,6 +116,11 @@ public class QmsPqcTaskRecordDraftQO {
          */
         private String selfTestData;
 
+        /**
+         * 是否自检
+         */
+        private Boolean selfCheck;
+
         /**
          * 复核数据
          */