diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index e42f66d..521d491 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -26,6 +26,7 @@ #include "utilities/ScanProcessSequence.h" #include "utilities/AlarmHelper.h" #include "log/LogManager.h" +#include "forms/select/AccessionInformation.h" #define TRIGGER_EVENT EventCenter::Default()->triggerEvent @@ -339,9 +340,6 @@ void DeviceManager::startScan(const QString& json, bool empty) mCurrentPatientName = patientInfo["PatientName"].toString(); mCurrentLaterality = patientInfo["Laterality"].toString(); mCurrentOperatorName = patientInfo["OperatorName"].toString(); - mCurrentMPPSUID = patientInfo["MPPSUID"].toString(); - mCurrentModality = patientInfo["Modality"].toString(); - mCurrentStudyUID = patientInfo["StudyUID"].toString(); mScanProgressTimer = startTimer(500); } } @@ -988,6 +986,7 @@ void DeviceManager::insertEmptyScanRecord() void DeviceManager::insertScanRecord() { + AccessionInformation* currentAccession = ScanProcessSequence::getInstance()->topAccession().first; QString sql = QString("INSERT INTO Scan (ScanID, ReferenceID, PatientID, AccessionNumber, PatientName, ScanDateTime, Laterality, OperatorName, State, StudyUID, Modality, MPPSUID) VALUES ('%1','%2','%3','%4','%5','%6','%7','%8', %9, '%10', '%11', '%12')") .arg(mCurrentScanMeasurementID) .arg(mCurrentEmptyMeasurementID) @@ -998,9 +997,9 @@ void DeviceManager::insertScanRecord() .arg(mCurrentLaterality) .arg(mCurrentOperatorName) .arg(0) - .arg(mCurrentStudyUID) - .arg(mCurrentModality) - .arg(mCurrentMPPSUID); + .arg(currentAccession->mStudyUID) + .arg(currentAccession->mModality) + .arg(currentAccession->mMPPSUID); if(!SQLHelper::exec(sql)) { QString msg = "DB Error. G401"; diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h index 47c7b12..6a31e0a 100644 --- a/src/device/DeviceManager.h +++ b/src/device/DeviceManager.h @@ -214,9 +214,6 @@ private: QString mCurrentAccessionNumber = ""; QString mCurrentLaterality = ""; QString mCurrentOperatorName = ""; - QString mCurrentModality = ""; - QString mCurrentStudyUID = ""; - QString mCurrentMPPSUID = ""; QString mCurrentTransferMeasurementID = ""; QString mCurrentTransferPatientID = ""; QString mSoftwareVersion = ""; diff --git a/src/dicom/MPPSManager.cpp b/src/dicom/MPPSManager.cpp index 1b5cf23..21b1c10 100644 --- a/src/dicom/MPPSManager.cpp +++ b/src/dicom/MPPSManager.cpp @@ -23,13 +23,13 @@ void MPPSManager::processMPPSResult(const ActionResult& aResult) MultyMessageDialogManager::getInstance()->raiseDialog(tr("Create MPPSUID error!"),MessageLevel::Error); return; } - QString sql = "update Patient set MPPSUID=:mppsuid where PatientUID=:patuid"; - QMap params; - params[":mppsuid"] = list[1]; - params[":patuid"] = list[0]; +// QString sql = "update Patient set MPPSUID=:mppsuid where PatientUID=:patuid"; +// QMap params; +// params[":mppsuid"] = list[1]; +// params[":patuid"] = list[0]; - int result = SQLHelper::ExecuteNoQuery(sql,params); - if(result<1)return; +// int result = SQLHelper::ExecuteNoQuery(sql,params); +// if(result<1)return; MultyMessageDialogManager::getInstance()->raiseDialog(tr("Update MPPSUID success!"),MessageLevel::Info); } @@ -73,4 +73,8 @@ void MPPSManager::sendMPPS() action->setAccession(accession); action->execute(); } + else if(!accession->mMPPSUID.isEmpty()) + { + accession->mMPPSUID.clear(); + } }