diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 9956c43..21f2e96 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -8176,7 +8176,7 @@ return result; } //【保存】核查数据-直流稳压电源 -bool InsertStandardCheckItemDataDcPower(StandardCheckDataDcPower power) +bool BaseCommonApi::InsertStandardCheckItemDataDcPower(StandardCheckDataDcPower power) { QSqlQuery query; query.prepare("INSERT INTO biz_equipment_standard_check_data_dc_power (" diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 9956c43..21f2e96 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -8176,7 +8176,7 @@ return result; } //【保存】核查数据-直流稳压电源 -bool InsertStandardCheckItemDataDcPower(StandardCheckDataDcPower power) +bool BaseCommonApi::InsertStandardCheckItemDataDcPower(StandardCheckDataDcPower power) { QSqlQuery query; query.prepare("INSERT INTO biz_equipment_standard_check_data_dc_power (" diff --git a/softwareDirectory/AutoVerScheme/dialogverifyresult.cpp b/softwareDirectory/AutoVerScheme/dialogverifyresult.cpp index bbec5c1..26629cc 100644 --- a/softwareDirectory/AutoVerScheme/dialogverifyresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogverifyresult.cpp @@ -273,6 +273,7 @@ if(headers[k]=="算数平均值"){ calData.average_value=dataRes[i][k]; calData.test_value_six=dataRes[i][k-1]; + calData.test_value_six_date = QDateTime::currentDateTime().toString("yyyy-MM-dd"); break; } } @@ -287,6 +288,52 @@ } } break; + case 2: + for(QString sLabel : veriHeadList->keys()){ + QMap items = veriHeadList->value(sLabel); + for(QString sLabel2 : items.keys()){ + QList dataRes = veriDataMapList->value(sLabel).value(sLabel2); + QStringList headers = items.value(sLabel2); + for (int i = 0; i < dataRes.count(); ++i) { + StandardCheckDataDcPower calData; + calData.id= QString::number(api.generateId()); + calData.data_id = baseInfo.id;//核查数据管理基础信息表id + calData.check_type=getValueByHeader(dataRes[i],headers,"核查类型");//核查类型(直接存字典value) + calData.params=getValueByHeader(dataRes[i],headers,"核查项目"); + calData.check_param=getValueByHeader(dataRes[i],headers,"核查参数"); + calData.unit=getValueByHeader(dataRes[i],headers,"单位"); + calData.check_point=getValueByHeader(dataRes[i],headers,"核查点"); + calData.unit=getValueByHeader(dataRes[i],headers,"单位"); + if(sLabel2=="重复性"){ + calData.test_value_one=getValueByHeader(dataRes[i],headers,"示值1"); + calData.test_value_two=getValueByHeader(dataRes[i],headers,"示值2"); + calData.test_value_three=getValueByHeader(dataRes[i],headers,"示值3"); + calData.test_value_four=getValueByHeader(dataRes[i],headers,"示值4"); + calData.test_value_five=getValueByHeader(dataRes[i],headers,"示值5"); + calData.test_value_six=getValueByHeader(dataRes[i],headers,"示值6"); + calData.average_value=getValueByHeader(dataRes[i],headers,"平均值"); + calData.standard_deviation=getValueByHeader(dataRes[i],headers,"标准偏差"); + calData.relative_repeatability=getValueByHeader(dataRes[i],headers,"相对标准偏差"); + }else{ + for(int k=0;kkeys()){ + QMap items = veriHeadList->value(sLabel); + for(QString sLabel2 : items.keys()){ + QList dataRes = veriDataMapList->value(sLabel).value(sLabel2); + QStringList headers = items.value(sLabel2); + for (int i = 0; i < dataRes.count(); ++i) { + StandardCheckDataDcPower calData; + calData.id= QString::number(api.generateId()); + calData.data_id = baseInfo.id;//核查数据管理基础信息表id + calData.check_type=getValueByHeader(dataRes[i],headers,"核查类型");//核查类型(直接存字典value) + calData.params=getValueByHeader(dataRes[i],headers,"核查项目"); + calData.check_param=getValueByHeader(dataRes[i],headers,"核查参数"); + calData.unit=getValueByHeader(dataRes[i],headers,"单位"); + calData.check_point=getValueByHeader(dataRes[i],headers,"核查点"); + calData.unit=getValueByHeader(dataRes[i],headers,"单位"); + if(sLabel2=="重复性"){ + calData.test_value_one=getValueByHeader(dataRes[i],headers,"示值1"); + calData.test_value_two=getValueByHeader(dataRes[i],headers,"示值2"); + calData.test_value_three=getValueByHeader(dataRes[i],headers,"示值3"); + calData.test_value_four=getValueByHeader(dataRes[i],headers,"示值4"); + calData.test_value_five=getValueByHeader(dataRes[i],headers,"示值5"); + calData.test_value_six=getValueByHeader(dataRes[i],headers,"示值6"); + calData.average_value=getValueByHeader(dataRes[i],headers,"平均值"); + calData.standard_deviation=getValueByHeader(dataRes[i],headers,"标准偏差"); + calData.relative_repeatability=getValueByHeader(dataRes[i],headers,"相对标准偏差"); + }else{ + for(int k=0;ktableWidgetCheck->setItem(i,idx,new QTableWidgetItem(newdStdValue)); //示值 } - if(iEquipType==1 ){ + if(iEquipType==1||iEquipType==2){ if(header==readItems.last()){ //计算平均值 double dMean=0; @@ -973,7 +973,7 @@ } dMean /=readItems.count(); newdStdValue=QString::number(dMean,'f',4); - idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("算数平均值")); + idx= getIndexByHeader(sLabel,labelItem,{"算数平均值","平均值"}); if(idx!=-1) { dataRes[i][idx] = newdStdValue; @@ -987,7 +987,7 @@ } dStdErr = sqrt(dStdErr/(readItems.count()-1)); newdStdValue=QString::number(dStdErr,'f',4); - idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("标准偏差S(X)")); + idx= getIndexByHeader(sLabel,labelItem,{"标准偏差S(X)","标准偏差"}); if(idx!=-1) { dataRes[i][idx] = newdStdValue; @@ -995,7 +995,7 @@ } //计算相对重复性 newdStdValue=QString::number(dStdErr/dMean,'f',4); - idx= getIndexByHeader(sLabel,labelItem,QStrTranQStrList("相对重复性")); + idx= getIndexByHeader(sLabel,labelItem,{"相对重复性","相对标准偏差"}); if(idx!=-1) { dataRes[i][idx] = newdStdValue; @@ -1006,7 +1006,7 @@ QString labelStable="稳定性"; //auto veriData = veriDataMapList.value(constsLable); QList dataStable = veriData.value(labelStable); - idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("算数平均值")); + idx= getIndexByHeader(sLabel,labelStable,{"算数平均值","平均值"}); newdStdValue=QString::number(dMean,'f',4); if(idx!=-1) { @@ -1042,25 +1042,25 @@ dStdErr = sqrt(dStdErr/5); } newdStdValue=QString::number(dStdErr,'f',4); - idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("标准偏差S(X)")); + idx= getIndexByHeader(sLabel,labelStable,{"标准偏差S(X)","标准偏差"}); if(idx!=-1) { dataStable[i][idx] = newdStdValue; } //计算相对重复性 newdStdValue=QString::number(dStdErr/dMean,'f',4); - idx= getIndexByHeader(sLabel,labelStable,QStrTranQStrList("相对重复性")); + idx= getIndexByHeader(sLabel,labelStable,{"相对重复性","相对标准偏差"}); if(idx!=-1) { dataStable[i][idx] = newdStdValue; } - idx = getIndexByHeader(sLabel,labelStable,QStrTranQStrList("Urel")); + idx = getIndexByHeader(sLabel,labelStable,{"Urel","相对扩展不确定度Urel"}); QString sRet=""; if(dStdErr/dMean