diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index e2da63f..3efbf3a 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -3060,101 +3060,7 @@
       DataMapList= GetDataReturnItemListByPistonGauge(itemCatoryName,resultData,DataMapList,headList);
       return DataMapList;
 };
-//检定项 示波器检定装置
-QMap<QString, QList<QStringList>> BaseCommonApi::getDeviceOscilloscopeCalibration(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList)
-{
-    QMap<QString, QList<QStringList>> DataMapList;
-    QList<QStringList> resultData;
-    QStringList result;
-    resultData.clear();
-
-    QSqlQuery query;
-     query.prepare("SELECT * FROM biz_business_device_measure_item_data_oscilloscope bbdmido"
-                 "  JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmido.item_id "
-                 " WHERE bbdmido.item_id = :itemId  ORDER BY bbdmido.update_time DESC");
-     // 将参数绑定到占位符
-      query.bindValue(":itemId", itemId);
-      if (query.exec()) {
-          while (query.next()) {
-              result.clear();
-              result.append(query.value("id").toString());
-              result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("time_base").toString());//时基
-              result.append(query.value("current_gain").toString());//直流增益(示波器-数字)
-              result.append(query.value("current_bias").toString());//直流偏置(示波器-数字)
-              result.append(query.value("band_width").toString());//频带宽度 (示波器-数字/模拟)
-              result.append(query.value("trigger_sensitivity").toString());//触发灵敏度(示波器-数字/模拟)
-              result.append(query.value("rise_time").toString());//上升时间(示波器-数字/模拟)
-              result.append(query.value("input_resistance").toString());//输入电阻 (示波器-数字/模拟)
-              result.append(query.value("calibrating_signal").toString());//校准信号(示波器-数字/模拟)
-              result.append(query.value("scan_time_coefficient").toString());//扫描时间系数及扩展(示波器-模拟)
-              result.append(query.value("cycle_signal").toString());//周期时标信号
-              result.append(query.value("cycle_signal_unit").toString());//周期时标信号单位
-              result.append(query.value("technical_index").toString());//技术指标
-              result.append(query.value("technical_index_unit").toString());//技术指标单位
-              result.append(query.value("thoroughfare").toString());//通道
-              result.append(query.value("impedance").toString());//阻抗
-              result.append(query.value("impedance_unit").toString());//阻抗单位
-              result.append(query.value("vertical_deflect_coefficient").toString());//垂直偏转系数/div
-              result.append(query.value("vertical_deflect_coefficient_unit").toString());//垂直偏转系数单位
-              result.append(query.value("standard_value").toString());//标准值
-              result.append(query.value("standard_value_unit").toString());//标准值单位
-              result.append(query.value("band_width").toString());//频带宽度
-              result.append(query.value("band_width_unit").toString());//频带宽度单位
-              result.append(query.value("amplitude").toString());//幅度
-              result.append(query.value("amplitude_unit").toString());//幅度单位
-              result.append(query.value("trigger_type").toString());//触发类型
-              result.append(query.value("signal_frequency").toString());//信号频率
-              result.append(query.value("nominal_value").toString());//标称值
-              result.append(query.value("nominal_value_unit").toString());//标称值单位
-              result.append(query.value("create_time").toString());
-              result.append(query.value("update_time").toString());
-              resultData.append(result);
-          }
-      } else {
-          qDebug() << "Query execution failed: " << query.lastError().text();
-      }
-
-
-      DataMapList= GetDataReturnItemListByPistonGauge(itemCatoryName,resultData,DataMapList,headList);
-      return DataMapList;
-};
-QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList)
-{
-    QList<QStringList> IndicationErrorList;
-    if(itemCatoryName.contains("数字示波器")){
-    for(const QStringList &row : ResultData)
-    {
-       QString VerificationItem=NULL;
-        if (!row.isEmpty() && row[2] =="1") {
-                VerificationItem = "示值误差";
-                //添加列头
-                QStringList head;
-                head  <<"序号"<<"检定项目"<<"轻敲前示值-正"<<"轻敲前示值-反"<<"轻敲后示值-正"
-                     <<"轻敲后示值-反"<<"轻敲前后变动量-正"<<"轻敲前后变动量-反" ;
-                HeadMapList->insert(VerificationItem,head);
-                //添加数据
-                QStringList Data;
-
-                Data.append(row[0]);  //ID
-                Data.append(row[2]);  //标准器示值
-
-                Data.append(row[2]);//轻敲前示值-正
-                Data.append(row[2]);//"轻敲前示值-反"
-                Data.append(row[2]);//轻敲后示值-正
-                Data.append(row[2]);//轻敲后示值-反
-                Data.append("0");//轻敲前后变动量-正
-                Data.append("0");//轻敲前后变动量-反
-                IndicationErrorList.append(Data);
-         }
-
-     }
- }
-    if(IndicationErrorList.count()!=0){
-        DataMapList.insert("示值误差",IndicationErrorList);
-    };
-    return  DataMapList;
-};
+//0.02压力表头
 QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByPistonGauge(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList)
 {
        QList<QStringList> IndicationErrorList;
@@ -3178,7 +3084,6 @@
 //                   Data.append(row[15]);  //分度值的五分之一
                    Data.append(row[0]);  //ID
                    Data.append(row[2]);  //标准器示值
-
                    Data.append(row[2]);//轻敲前示值-正
                    Data.append(row[2]);//"轻敲前示值-反"
                    Data.append(row[2]);//轻敲后示值-正
@@ -3195,10 +3100,12 @@
        };
        return  DataMapList;
 };
+
 //测试界面 外观及功能性检查和检定数据头
 //QMap<QString,QList<QMap<QString,QString>>> ;
 
 
+
 //自动检定数据结果保存 参数1：装置字典1,2,3 参数2:BaseClass父类， 子类赋值
 bool BaseCommonApi::SearchSelectTable(QString id, BaseClass *object) {
     bool result = false; // 初始化为 false 或根据需要初始化为其他值
@@ -3416,7 +3323,7 @@
           qDebug() << "Query execution failed: " << query.lastError().text();
       }
 
-        *HeadList <<"id"<<"检定数据管理基础信息表id"<<"检定数据类型"<<"标准器示值"<<"轻敲前被检设备示值-正行程"<<"轻敲前被检设备示值-反行程"<<"轻敲后被检设备示值-正行程"
+        *HeadList <<"序号"<<"检定数据管理基础信息表id"<<"检定数据类型"<<"标准器示值"<<"轻敲前被检设备示值-正行程"<<"轻敲前被检设备示值-反行程"<<"轻敲后被检设备示值-正行程"
                  <<"轻敲后被检设备示值-反行程"<<"理论输出值"<<"第一次正行程"<<"第一次反行程"<<"第二次正行程"<<"第二次反行程"<<"第三次正行程"
                  <<"第三次反行程"<<"示值误差"<<"回程误差"<<"正行程平均值"<<"反行程平均值"<<"平均值"<<"回程误差平均值"<<"项目(结果表)"<<"示值误差最大值(结果表)"
                 <<"轻敲位移最大值(结果表)"<<"最大允许误差绝对值"<<"正行程切换值(电接点一般压力表)"<<"反行程切换值(电接点一般压力表)"
@@ -3427,8 +3334,91 @@
            <<"线性ξL(结果表)"<<"基本误差A(结果表)"<<"周期稳定性Sb(结果表)"<<"创建日期"<<"更新日期";
       return resultData;
 };
+
+//检定数据管理-检定结果信息-直流稳压电源
+QList<QStringList> BaseCommonApi::getbizBusinessDeviceMeasureDataDcPower(QString data_id,QStringList *HeadList)
+{
+    QList<QStringList> resultData;
+    QStringList result;
+    resultData.clear();
+
+    QSqlQuery query;
+     query.prepare("SELECT * FROM biz_business_device_measure_data_dc_power WHERE data_id= :data_id ");
+     // 将参数绑定到占位符
+      query.bindValue(":data_id", data_id);
+      if (query.exec()) {
+          while (query.next()) {
+            result.clear();
+            result.append(query.value("id").toString());
+
+            result.append(query.value("data_id").toString());//检定数据管理基础信息表id
+
+            result.append(query.value("data_type").toString());//检定数据类型(一个检定数据中区分多个表格)(字典code)
+
+            result.append(query.value("data_type_type").toString());//检定项数据类型的类型(一个检定项中一个表格切换的类型)(字典value)
+
+            result.append(query.value("output_channel").toString());//输出通道
+
+            result.append(query.value("unit").toString());//单位
+
+            result.append(query.value("voltage_regulator_output_value").toString());//调压器输出值
+
+            result.append(query.value("voltage_max_difference").toString());//被检电源输出电压最大差值
+
+            result.append(query.value("technical_index").toString());//被检电源技术指标/仪器技术指标
+
+            result.append(query.value("technical_index_symbol").toString());//被检电源技术指标/仪器技术指标前符号
+
+            result.append(query.value("voltage_regulation").toString());//电源电压调整率
+
+            result.append(query.value("load_situation").toString());//负载情况
+
+            result.append(query.value("voltage_output_value").toString());//被检电源输出电压值
+
+            result.append(query.value("voltage_difference").toString());//电压差值
+
+            result.append(query.value("load_regulation").toString());//负载调整率
+
+            result.append(query.value("measure_indication_value").toString());//被检表示值
+
+            result.append(query.value("standard_value").toString());//标准值
+
+            result.append(query.value("maximum_error").toString());//最大允许误差
+
+            result.append(query.value("maximum_error_unit").toString());//最大允许误差单位
+
+            result.append(query.value("absolute_error").toString());//绝对误差
+
+            result.append(query.value("resolution").toString());//分辨力
+
+            result.append(query.value("standard_voltage_value").toString());//标准电压值
+
+            result.append(query.value("standard_voltage_value_unit").toString());//标准电压值单位
+
+            result.append(query.value("standard_resistance_value").toString());//标准电阻值
+
+            result.append(query.value("standard_resistance_value_unit").toString());//标准电阻值单位
+
+            result.append(query.value("ripple_voltage").toString());//纹波电压
+
+            result.append(query.value("output_voltage_max_change").toString());//输出电压最大变化值
+
+            result.append(query.value("short_term_stability").toString());//短期稳定性
+
+            result.append(query.value("exceed_mark").toString());//超出范围标*(1/0)
+
+            result.append(query.value("create_time").toString());
+
+            result.append(query.value("update_time").toString());
+          }
+      }
+      //待修改
+      *HeadList <<"序号";
+}
+
+
 //【查询】检定项直流稳压电源
- QMap<QString,QList<QStringList>> BaseCommonApi::getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList){
+QMap<QString,QList<QStringList>> BaseCommonApi::getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList){
     QMap<QString, QList<QStringList>> DataMapList;
     QList<QStringList> resultData;
     QStringList result;
@@ -3436,7 +3426,7 @@
 
     QSqlQuery query;
      query.prepare(
-                   "SELECT bbdmiddp.*,bbdmii.appearance_function_check,bbdmii.voltage_regulation,bbdmii.load_regulation,"
+                   " SELECT bbdmiddp.*,bbdmii.appearance_function_check,bbdmii.voltage_regulation,bbdmii.load_regulation,"
                    " bbdmii.voltage_represent_error,bbdmii.current_represent_error_direct,bbdmii.current_represent_error_indirect,"
                    " bbdmii.ripple_voltage,bbdmii.voltage_output_stability "
                    " FROM biz_business_device_measure_item_data_dc_power bbdmiddp "
@@ -3488,7 +3478,7 @@
       DataMapList= GetDataReturnItemListByDcPower(itemCatoryName,resultData,DataMapList,headList);
       return DataMapList;
 };
-
+//直流稳压电源 检定项头
 QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByDcPower(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList){
     QList<QStringList> VpsAdjustmentRateList;
     QList<QStringList> LoadAdjustmentRateList;
@@ -3501,7 +3491,7 @@
     for(const QStringList &row : ResultData)
     {
        QString VerificationItem=NULL;
-        if (!row.isEmpty() && row[20]=="1") {
+        if (!row.isEmpty() && row[20]=="1" && row[2] == "1") {
                 VerificationItem = "电源电压调整率";
                 //添加列头
                 QStringList head;
@@ -3520,7 +3510,7 @@
                 Data.append(row[8] + row[7]);//被检电源技术指标
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
-         }else if(!row.isEmpty() && row[21]=="1"){
+         }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
             VerificationItem = "负载调整率";
             //添加列头
             QStringList head;
@@ -3539,7 +3529,7 @@
             Data.append(row[8] + row[7]);//被检电源技术指标
             Data.append("");//负载调整率
             LoadAdjustmentRateList.append(Data);
-        }else if(!row.isEmpty() && row[22]=="1"){
+        }else if(!row.isEmpty() && row[22]=="1" && row[2] =="3"){
             VerificationItem = "电压示值误差";
             //添加列头
             QStringList head;
@@ -3557,7 +3547,7 @@
             Data.append(row[17]);//最大允许误差
             Data.append("");//绝对误差
             VoltageIndicationErrorList.append(Data);
-        }else if(!row.isEmpty() && row[23]=="1"){
+        }else if(!row.isEmpty() && row[23]=="1" && row[2] =="4"){
             VerificationItem = "电流示值误差(直接测量)";
             //添加列头
             QStringList head;
@@ -3575,7 +3565,7 @@
             Data.append(row[17]);//最大允许误差
             Data.append("");//绝对误差
             CurrentIndicationErrorDirectList.append(Data);
-        }else if(!row.isEmpty() && row[24]=="1"){
+        }else if(!row.isEmpty() && row[24]=="1" && row[2] =="5"){
             VerificationItem = "电流示值误差(间接测量)";
             //添加列头
             QStringList head;
@@ -3595,7 +3585,7 @@
             Data.append(row[17]);//最大允许误差
             Data.append("");//绝对误差
             CurrentIndicationErrorIndirectList.append(Data);
-        }else if(!row.isEmpty() && row[25]=="1"){
+        }else if(!row.isEmpty() && row[25]=="1" && row[2] =="6"){
             VerificationItem = "纹波电压";
             //添加列头
             QStringList head;
@@ -3610,7 +3600,7 @@
             Data.append(row[8] + row[7]);//被检电源技术指标
             Data.append("");//纹波电压
             RippleVoltageList.append(Data);
-        }else if(!row.isEmpty() && row[25]=="1"){
+        }else if(!row.isEmpty() && row[25]=="1" && row[2] =="7"){
             VerificationItem = "输出电压短期稳定性";
             //添加列头
             QStringList head;
@@ -3713,3 +3703,98 @@
   return isSuccess;
 };
 
+//检定项 示波器检定装置
+QMap<QString, QList<QStringList>> BaseCommonApi::getDeviceOscilloscopeCalibration(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList)
+{
+    QMap<QString, QList<QStringList>> DataMapList;
+    QList<QStringList> resultData;
+    QStringList result;
+    resultData.clear();
+
+    QSqlQuery query;
+     query.prepare("SELECT * FROM biz_business_device_measure_item_data_oscilloscope bbdmido"
+                 "  JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmido.item_id "
+                 " WHERE bbdmido.item_id = :itemId  ORDER BY bbdmido.update_time DESC");
+     // 将参数绑定到占位符
+      query.bindValue(":itemId", itemId);
+      if (query.exec()) {
+          while (query.next()) {
+              result.clear();
+              result.append(query.value("id").toString());
+              result.append(query.value("item_id").toString());  //检定项目ID
+              result.append(query.value("time_base").toString());//时基
+              result.append(query.value("current_gain").toString());//直流增益(示波器-数字)
+              result.append(query.value("current_bias").toString());//直流偏置(示波器-数字)
+              result.append(query.value("band_width").toString());//频带宽度 (示波器-数字/模拟)
+              result.append(query.value("trigger_sensitivity").toString());//触发灵敏度(示波器-数字/模拟)
+              result.append(query.value("rise_time").toString());//上升时间(示波器-数字/模拟)
+              result.append(query.value("input_resistance").toString());//输入电阻 (示波器-数字/模拟)
+              result.append(query.value("calibrating_signal").toString());//校准信号(示波器-数字/模拟)
+              result.append(query.value("scan_time_coefficient").toString());//扫描时间系数及扩展(示波器-模拟)
+              result.append(query.value("cycle_signal").toString());//周期时标信号
+              result.append(query.value("cycle_signal_unit").toString());//周期时标信号单位
+              result.append(query.value("technical_index").toString());//技术指标
+              result.append(query.value("technical_index_unit").toString());//技术指标单位
+              result.append(query.value("thoroughfare").toString());//通道
+              result.append(query.value("impedance").toString());//阻抗
+              result.append(query.value("impedance_unit").toString());//阻抗单位
+              result.append(query.value("vertical_deflect_coefficient").toString());//垂直偏转系数/div
+              result.append(query.value("vertical_deflect_coefficient_unit").toString());//垂直偏转系数单位
+              result.append(query.value("standard_value").toString());//标准值
+              result.append(query.value("standard_value_unit").toString());//标准值单位
+              result.append(query.value("band_width").toString());//频带宽度
+              result.append(query.value("band_width_unit").toString());//频带宽度单位
+              result.append(query.value("amplitude").toString());//幅度
+              result.append(query.value("amplitude_unit").toString());//幅度单位
+              result.append(query.value("trigger_type").toString());//触发类型
+              result.append(query.value("signal_frequency").toString());//信号频率
+              result.append(query.value("nominal_value").toString());//标称值
+              result.append(query.value("nominal_value_unit").toString());//标称值单位
+              result.append(query.value("create_time").toString());
+              result.append(query.value("update_time").toString());
+              resultData.append(result);
+          }
+      } else {
+          qDebug() << "Query execution failed: " << query.lastError().text();
+      }
+
+
+      DataMapList= GetDataReturnItemListByPistonGauge(itemCatoryName,resultData,DataMapList,headList);
+      return DataMapList;
+};
+QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList)
+{
+    QList<QStringList> IndicationErrorList;
+    if(itemCatoryName.contains("数字示波器")){
+    for(const QStringList &row : ResultData)
+    {
+       QString VerificationItem=NULL;
+        if (!row.isEmpty() && row[2] =="1") {
+                VerificationItem = "示值误差";
+                //添加列头
+                QStringList head;
+                head  <<"序号"<<"检定项目"<<"轻敲前示值-正"<<"轻敲前示值-反"<<"轻敲后示值-正"
+                     <<"轻敲后示值-反"<<"轻敲前后变动量-正"<<"轻敲前后变动量-反" ;
+                HeadMapList->insert(VerificationItem,head);
+                //添加数据
+                QStringList Data;
+
+                Data.append(row[0]);  //ID
+                Data.append(row[2]);  //标准器示值
+
+                Data.append(row[2]);//轻敲前示值-正
+                Data.append(row[2]);//"轻敲前示值-反"
+                Data.append(row[2]);//轻敲后示值-正
+                Data.append(row[2]);//轻敲后示值-反
+                Data.append("0");//轻敲前后变动量-正
+                Data.append("0");//轻敲前后变动量-反
+                IndicationErrorList.append(Data);
+         }
+
+     }
+ }
+    if(IndicationErrorList.count()!=0){
+        DataMapList.insert("示值误差",IndicationErrorList);
+    };
+    return  DataMapList;
+};

diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index e2da63f..3efbf3a 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -3060,101 +3060,7 @@
       DataMapList= GetDataReturnItemListByPistonGauge(itemCatoryName,resultData,DataMapList,headList);
       return DataMapList;
 };
-//检定项 示波器检定装置
-QMap<QString, QList<QStringList>> BaseCommonApi::getDeviceOscilloscopeCalibration(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList)
-{
-    QMap<QString, QList<QStringList>> DataMapList;
-    QList<QStringList> resultData;
-    QStringList result;
-    resultData.clear();
-
-    QSqlQuery query;
-     query.prepare("SELECT * FROM biz_business_device_measure_item_data_oscilloscope bbdmido"
-                 "  JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmido.item_id "
-                 " WHERE bbdmido.item_id = :itemId  ORDER BY bbdmido.update_time DESC");
-     // 将参数绑定到占位符
-      query.bindValue(":itemId", itemId);
-      if (query.exec()) {
-          while (query.next()) {
-              result.clear();
-              result.append(query.value("id").toString());
-              result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("time_base").toString());//时基
-              result.append(query.value("current_gain").toString());//直流增益(示波器-数字)
-              result.append(query.value("current_bias").toString());//直流偏置(示波器-数字)
-              result.append(query.value("band_width").toString());//频带宽度 (示波器-数字/模拟)
-              result.append(query.value("trigger_sensitivity").toString());//触发灵敏度(示波器-数字/模拟)
-              result.append(query.value("rise_time").toString());//上升时间(示波器-数字/模拟)
-              result.append(query.value("input_resistance").toString());//输入电阻 (示波器-数字/模拟)
-              result.append(query.value("calibrating_signal").toString());//校准信号(示波器-数字/模拟)
-              result.append(query.value("scan_time_coefficient").toString());//扫描时间系数及扩展(示波器-模拟)
-              result.append(query.value("cycle_signal").toString());//周期时标信号
-              result.append(query.value("cycle_signal_unit").toString());//周期时标信号单位
-              result.append(query.value("technical_index").toString());//技术指标
-              result.append(query.value("technical_index_unit").toString());//技术指标单位
-              result.append(query.value("thoroughfare").toString());//通道
-              result.append(query.value("impedance").toString());//阻抗
-              result.append(query.value("impedance_unit").toString());//阻抗单位
-              result.append(query.value("vertical_deflect_coefficient").toString());//垂直偏转系数/div
-              result.append(query.value("vertical_deflect_coefficient_unit").toString());//垂直偏转系数单位
-              result.append(query.value("standard_value").toString());//标准值
-              result.append(query.value("standard_value_unit").toString());//标准值单位
-              result.append(query.value("band_width").toString());//频带宽度
-              result.append(query.value("band_width_unit").toString());//频带宽度单位
-              result.append(query.value("amplitude").toString());//幅度
-              result.append(query.value("amplitude_unit").toString());//幅度单位
-              result.append(query.value("trigger_type").toString());//触发类型
-              result.append(query.value("signal_frequency").toString());//信号频率
-              result.append(query.value("nominal_value").toString());//标称值
-              result.append(query.value("nominal_value_unit").toString());//标称值单位
-              result.append(query.value("create_time").toString());
-              result.append(query.value("update_time").toString());
-              resultData.append(result);
-          }
-      } else {
-          qDebug() << "Query execution failed: " << query.lastError().text();
-      }
-
-
-      DataMapList= GetDataReturnItemListByPistonGauge(itemCatoryName,resultData,DataMapList,headList);
-      return DataMapList;
-};
-QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList)
-{
-    QList<QStringList> IndicationErrorList;
-    if(itemCatoryName.contains("数字示波器")){
-    for(const QStringList &row : ResultData)
-    {
-       QString VerificationItem=NULL;
-        if (!row.isEmpty() && row[2] =="1") {
-                VerificationItem = "示值误差";
-                //添加列头
-                QStringList head;
-                head  <<"序号"<<"检定项目"<<"轻敲前示值-正"<<"轻敲前示值-反"<<"轻敲后示值-正"
-                     <<"轻敲后示值-反"<<"轻敲前后变动量-正"<<"轻敲前后变动量-反" ;
-                HeadMapList->insert(VerificationItem,head);
-                //添加数据
-                QStringList Data;
-
-                Data.append(row[0]);  //ID
-                Data.append(row[2]);  //标准器示值
-
-                Data.append(row[2]);//轻敲前示值-正
-                Data.append(row[2]);//"轻敲前示值-反"
-                Data.append(row[2]);//轻敲后示值-正
-                Data.append(row[2]);//轻敲后示值-反
-                Data.append("0");//轻敲前后变动量-正
-                Data.append("0");//轻敲前后变动量-反
-                IndicationErrorList.append(Data);
-         }
-
-     }
- }
-    if(IndicationErrorList.count()!=0){
-        DataMapList.insert("示值误差",IndicationErrorList);
-    };
-    return  DataMapList;
-};
+//0.02压力表头
 QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByPistonGauge(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList)
 {
        QList<QStringList> IndicationErrorList;
@@ -3178,7 +3084,6 @@
 //                   Data.append(row[15]);  //分度值的五分之一
                    Data.append(row[0]);  //ID
                    Data.append(row[2]);  //标准器示值
-
                    Data.append(row[2]);//轻敲前示值-正
                    Data.append(row[2]);//"轻敲前示值-反"
                    Data.append(row[2]);//轻敲后示值-正
@@ -3195,10 +3100,12 @@
        };
        return  DataMapList;
 };
+
 //测试界面 外观及功能性检查和检定数据头
 //QMap<QString,QList<QMap<QString,QString>>> ;
 
 
+
 //自动检定数据结果保存 参数1：装置字典1,2,3 参数2:BaseClass父类， 子类赋值
 bool BaseCommonApi::SearchSelectTable(QString id, BaseClass *object) {
     bool result = false; // 初始化为 false 或根据需要初始化为其他值
@@ -3416,7 +3323,7 @@
           qDebug() << "Query execution failed: " << query.lastError().text();
       }
 
-        *HeadList <<"id"<<"检定数据管理基础信息表id"<<"检定数据类型"<<"标准器示值"<<"轻敲前被检设备示值-正行程"<<"轻敲前被检设备示值-反行程"<<"轻敲后被检设备示值-正行程"
+        *HeadList <<"序号"<<"检定数据管理基础信息表id"<<"检定数据类型"<<"标准器示值"<<"轻敲前被检设备示值-正行程"<<"轻敲前被检设备示值-反行程"<<"轻敲后被检设备示值-正行程"
                  <<"轻敲后被检设备示值-反行程"<<"理论输出值"<<"第一次正行程"<<"第一次反行程"<<"第二次正行程"<<"第二次反行程"<<"第三次正行程"
                  <<"第三次反行程"<<"示值误差"<<"回程误差"<<"正行程平均值"<<"反行程平均值"<<"平均值"<<"回程误差平均值"<<"项目(结果表)"<<"示值误差最大值(结果表)"
                 <<"轻敲位移最大值(结果表)"<<"最大允许误差绝对值"<<"正行程切换值(电接点一般压力表)"<<"反行程切换值(电接点一般压力表)"
@@ -3427,8 +3334,91 @@
            <<"线性ξL(结果表)"<<"基本误差A(结果表)"<<"周期稳定性Sb(结果表)"<<"创建日期"<<"更新日期";
       return resultData;
 };
+
+//检定数据管理-检定结果信息-直流稳压电源
+QList<QStringList> BaseCommonApi::getbizBusinessDeviceMeasureDataDcPower(QString data_id,QStringList *HeadList)
+{
+    QList<QStringList> resultData;
+    QStringList result;
+    resultData.clear();
+
+    QSqlQuery query;
+     query.prepare("SELECT * FROM biz_business_device_measure_data_dc_power WHERE data_id= :data_id ");
+     // 将参数绑定到占位符
+      query.bindValue(":data_id", data_id);
+      if (query.exec()) {
+          while (query.next()) {
+            result.clear();
+            result.append(query.value("id").toString());
+
+            result.append(query.value("data_id").toString());//检定数据管理基础信息表id
+
+            result.append(query.value("data_type").toString());//检定数据类型(一个检定数据中区分多个表格)(字典code)
+
+            result.append(query.value("data_type_type").toString());//检定项数据类型的类型(一个检定项中一个表格切换的类型)(字典value)
+
+            result.append(query.value("output_channel").toString());//输出通道
+
+            result.append(query.value("unit").toString());//单位
+
+            result.append(query.value("voltage_regulator_output_value").toString());//调压器输出值
+
+            result.append(query.value("voltage_max_difference").toString());//被检电源输出电压最大差值
+
+            result.append(query.value("technical_index").toString());//被检电源技术指标/仪器技术指标
+
+            result.append(query.value("technical_index_symbol").toString());//被检电源技术指标/仪器技术指标前符号
+
+            result.append(query.value("voltage_regulation").toString());//电源电压调整率
+
+            result.append(query.value("load_situation").toString());//负载情况
+
+            result.append(query.value("voltage_output_value").toString());//被检电源输出电压值
+
+            result.append(query.value("voltage_difference").toString());//电压差值
+
+            result.append(query.value("load_regulation").toString());//负载调整率
+
+            result.append(query.value("measure_indication_value").toString());//被检表示值
+
+            result.append(query.value("standard_value").toString());//标准值
+
+            result.append(query.value("maximum_error").toString());//最大允许误差
+
+            result.append(query.value("maximum_error_unit").toString());//最大允许误差单位
+
+            result.append(query.value("absolute_error").toString());//绝对误差
+
+            result.append(query.value("resolution").toString());//分辨力
+
+            result.append(query.value("standard_voltage_value").toString());//标准电压值
+
+            result.append(query.value("standard_voltage_value_unit").toString());//标准电压值单位
+
+            result.append(query.value("standard_resistance_value").toString());//标准电阻值
+
+            result.append(query.value("standard_resistance_value_unit").toString());//标准电阻值单位
+
+            result.append(query.value("ripple_voltage").toString());//纹波电压
+
+            result.append(query.value("output_voltage_max_change").toString());//输出电压最大变化值
+
+            result.append(query.value("short_term_stability").toString());//短期稳定性
+
+            result.append(query.value("exceed_mark").toString());//超出范围标*(1/0)
+
+            result.append(query.value("create_time").toString());
+
+            result.append(query.value("update_time").toString());
+          }
+      }
+      //待修改
+      *HeadList <<"序号";
+}
+
+
 //【查询】检定项直流稳压电源
- QMap<QString,QList<QStringList>> BaseCommonApi::getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList){
+QMap<QString,QList<QStringList>> BaseCommonApi::getDeviceMeasureItemDataDcPower(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList){
     QMap<QString, QList<QStringList>> DataMapList;
     QList<QStringList> resultData;
     QStringList result;
@@ -3436,7 +3426,7 @@
 
     QSqlQuery query;
      query.prepare(
-                   "SELECT bbdmiddp.*,bbdmii.appearance_function_check,bbdmii.voltage_regulation,bbdmii.load_regulation,"
+                   " SELECT bbdmiddp.*,bbdmii.appearance_function_check,bbdmii.voltage_regulation,bbdmii.load_regulation,"
                    " bbdmii.voltage_represent_error,bbdmii.current_represent_error_direct,bbdmii.current_represent_error_indirect,"
                    " bbdmii.ripple_voltage,bbdmii.voltage_output_stability "
                    " FROM biz_business_device_measure_item_data_dc_power bbdmiddp "
@@ -3488,7 +3478,7 @@
       DataMapList= GetDataReturnItemListByDcPower(itemCatoryName,resultData,DataMapList,headList);
       return DataMapList;
 };
-
+//直流稳压电源 检定项头
 QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByDcPower(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList){
     QList<QStringList> VpsAdjustmentRateList;
     QList<QStringList> LoadAdjustmentRateList;
@@ -3501,7 +3491,7 @@
     for(const QStringList &row : ResultData)
     {
        QString VerificationItem=NULL;
-        if (!row.isEmpty() && row[20]=="1") {
+        if (!row.isEmpty() && row[20]=="1" && row[2] == "1") {
                 VerificationItem = "电源电压调整率";
                 //添加列头
                 QStringList head;
@@ -3520,7 +3510,7 @@
                 Data.append(row[8] + row[7]);//被检电源技术指标
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
-         }else if(!row.isEmpty() && row[21]=="1"){
+         }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
             VerificationItem = "负载调整率";
             //添加列头
             QStringList head;
@@ -3539,7 +3529,7 @@
             Data.append(row[8] + row[7]);//被检电源技术指标
             Data.append("");//负载调整率
             LoadAdjustmentRateList.append(Data);
-        }else if(!row.isEmpty() && row[22]=="1"){
+        }else if(!row.isEmpty() && row[22]=="1" && row[2] =="3"){
             VerificationItem = "电压示值误差";
             //添加列头
             QStringList head;
@@ -3557,7 +3547,7 @@
             Data.append(row[17]);//最大允许误差
             Data.append("");//绝对误差
             VoltageIndicationErrorList.append(Data);
-        }else if(!row.isEmpty() && row[23]=="1"){
+        }else if(!row.isEmpty() && row[23]=="1" && row[2] =="4"){
             VerificationItem = "电流示值误差(直接测量)";
             //添加列头
             QStringList head;
@@ -3575,7 +3565,7 @@
             Data.append(row[17]);//最大允许误差
             Data.append("");//绝对误差
             CurrentIndicationErrorDirectList.append(Data);
-        }else if(!row.isEmpty() && row[24]=="1"){
+        }else if(!row.isEmpty() && row[24]=="1" && row[2] =="5"){
             VerificationItem = "电流示值误差(间接测量)";
             //添加列头
             QStringList head;
@@ -3595,7 +3585,7 @@
             Data.append(row[17]);//最大允许误差
             Data.append("");//绝对误差
             CurrentIndicationErrorIndirectList.append(Data);
-        }else if(!row.isEmpty() && row[25]=="1"){
+        }else if(!row.isEmpty() && row[25]=="1" && row[2] =="6"){
             VerificationItem = "纹波电压";
             //添加列头
             QStringList head;
@@ -3610,7 +3600,7 @@
             Data.append(row[8] + row[7]);//被检电源技术指标
             Data.append("");//纹波电压
             RippleVoltageList.append(Data);
-        }else if(!row.isEmpty() && row[25]=="1"){
+        }else if(!row.isEmpty() && row[25]=="1" && row[2] =="7"){
             VerificationItem = "输出电压短期稳定性";
             //添加列头
             QStringList head;
@@ -3713,3 +3703,98 @@
   return isSuccess;
 };
 
+//检定项 示波器检定装置
+QMap<QString, QList<QStringList>> BaseCommonApi::getDeviceOscilloscopeCalibration(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList)
+{
+    QMap<QString, QList<QStringList>> DataMapList;
+    QList<QStringList> resultData;
+    QStringList result;
+    resultData.clear();
+
+    QSqlQuery query;
+     query.prepare("SELECT * FROM biz_business_device_measure_item_data_oscilloscope bbdmido"
+                 "  JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmido.item_id "
+                 " WHERE bbdmido.item_id = :itemId  ORDER BY bbdmido.update_time DESC");
+     // 将参数绑定到占位符
+      query.bindValue(":itemId", itemId);
+      if (query.exec()) {
+          while (query.next()) {
+              result.clear();
+              result.append(query.value("id").toString());
+              result.append(query.value("item_id").toString());  //检定项目ID
+              result.append(query.value("time_base").toString());//时基
+              result.append(query.value("current_gain").toString());//直流增益(示波器-数字)
+              result.append(query.value("current_bias").toString());//直流偏置(示波器-数字)
+              result.append(query.value("band_width").toString());//频带宽度 (示波器-数字/模拟)
+              result.append(query.value("trigger_sensitivity").toString());//触发灵敏度(示波器-数字/模拟)
+              result.append(query.value("rise_time").toString());//上升时间(示波器-数字/模拟)
+              result.append(query.value("input_resistance").toString());//输入电阻 (示波器-数字/模拟)
+              result.append(query.value("calibrating_signal").toString());//校准信号(示波器-数字/模拟)
+              result.append(query.value("scan_time_coefficient").toString());//扫描时间系数及扩展(示波器-模拟)
+              result.append(query.value("cycle_signal").toString());//周期时标信号
+              result.append(query.value("cycle_signal_unit").toString());//周期时标信号单位
+              result.append(query.value("technical_index").toString());//技术指标
+              result.append(query.value("technical_index_unit").toString());//技术指标单位
+              result.append(query.value("thoroughfare").toString());//通道
+              result.append(query.value("impedance").toString());//阻抗
+              result.append(query.value("impedance_unit").toString());//阻抗单位
+              result.append(query.value("vertical_deflect_coefficient").toString());//垂直偏转系数/div
+              result.append(query.value("vertical_deflect_coefficient_unit").toString());//垂直偏转系数单位
+              result.append(query.value("standard_value").toString());//标准值
+              result.append(query.value("standard_value_unit").toString());//标准值单位
+              result.append(query.value("band_width").toString());//频带宽度
+              result.append(query.value("band_width_unit").toString());//频带宽度单位
+              result.append(query.value("amplitude").toString());//幅度
+              result.append(query.value("amplitude_unit").toString());//幅度单位
+              result.append(query.value("trigger_type").toString());//触发类型
+              result.append(query.value("signal_frequency").toString());//信号频率
+              result.append(query.value("nominal_value").toString());//标称值
+              result.append(query.value("nominal_value_unit").toString());//标称值单位
+              result.append(query.value("create_time").toString());
+              result.append(query.value("update_time").toString());
+              resultData.append(result);
+          }
+      } else {
+          qDebug() << "Query execution failed: " << query.lastError().text();
+      }
+
+
+      DataMapList= GetDataReturnItemListByPistonGauge(itemCatoryName,resultData,DataMapList,headList);
+      return DataMapList;
+};
+QMap<QString, QList<QStringList>> BaseCommonApi::GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList)
+{
+    QList<QStringList> IndicationErrorList;
+    if(itemCatoryName.contains("数字示波器")){
+    for(const QStringList &row : ResultData)
+    {
+       QString VerificationItem=NULL;
+        if (!row.isEmpty() && row[2] =="1") {
+                VerificationItem = "示值误差";
+                //添加列头
+                QStringList head;
+                head  <<"序号"<<"检定项目"<<"轻敲前示值-正"<<"轻敲前示值-反"<<"轻敲后示值-正"
+                     <<"轻敲后示值-反"<<"轻敲前后变动量-正"<<"轻敲前后变动量-反" ;
+                HeadMapList->insert(VerificationItem,head);
+                //添加数据
+                QStringList Data;
+
+                Data.append(row[0]);  //ID
+                Data.append(row[2]);  //标准器示值
+
+                Data.append(row[2]);//轻敲前示值-正
+                Data.append(row[2]);//"轻敲前示值-反"
+                Data.append(row[2]);//轻敲后示值-正
+                Data.append(row[2]);//轻敲后示值-反
+                Data.append("0");//轻敲前后变动量-正
+                Data.append("0");//轻敲前后变动量-反
+                IndicationErrorList.append(Data);
+         }
+
+     }
+ }
+    if(IndicationErrorList.count()!=0){
+        DataMapList.insert("示值误差",IndicationErrorList);
+    };
+    return  DataMapList;
+};
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 6c92e0b..331c23c 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -1023,7 +1023,7 @@
     QDateTime create_time;
     QDateTime update_time;
 };
-//结果保存-直流稳压电源
+//结果保存-直流稳压电源 - 查询
 class bizBusinessDeviceMeasureDataDcPower:public BaseClass
 {
 public:
@@ -1156,6 +1156,8 @@
     static QList<QStringList> getVerificationMultiCalResultData(QString dataId,QStringList *HeadList);
     //检定数据管理-检定结果信息-0.02压力
     static QList<QStringList> getDeviceMeasureDataPistonGauge(QString data_id,QStringList *HeadList);
+    //检定数据管理-检定结果信息-直流稳压电源
+    static QList<QStringList> getbizBusinessDeviceMeasureDataDcPower(QString data_id,QStringList *HeadList);
     //核查数据管理-首页
     static QList<CheckData> getCheckData();
     // 核查数据管理-基本信息-核查件
@@ -1293,7 +1295,6 @@
     //【结果保存】直流稳压电源
     static bool InsertbizBusinessDeviceMeasureDataDcPower(bizBusinessDeviceMeasureDataDcPower power);
 
-
     //示波器
     static  QMap<QString, QList<QStringList>> getDeviceOscilloscopeCalibration(QString itemCatoryName,QString itemId,QMap<QString, QStringList> *headList);
     QMap<QString, QList<QStringList>> GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList<QStringList> ResultData,QMap<QString, QList<QStringList>> DataMapList,QMap<QString, QStringList> *HeadMapList);