sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Mpps can't show result dialog.

Browse Source
This commit is contained in:
sunwen
2024-09-23 15:39:07 +08:00
parent 6766f46aa6
commit 6a1f8904f9
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/device/DeviceManager.cpp
View File

@@ -26,6 +26,7 @@
#include "utilities/ScanProcessSequence.h" #include "utilities/ScanProcessSequence.h"
#include "utilities/AlarmHelper.h" #include "utilities/AlarmHelper.h"
#include "log/LogManager.h" #include "log/LogManager.h"
#include "forms/select/AccessionInformation.h"
#define TRIGGER_EVENT EventCenter::Default()->triggerEvent #define TRIGGER_EVENT EventCenter::Default()->triggerEvent
@@ -339,9 +340,6 @@ void DeviceManager::startScan(const QString& json, bool empty)
mCurrentPatientName = patientInfo["PatientName"].toString(); mCurrentPatientName = patientInfo["PatientName"].toString();
mCurrentLaterality = patientInfo["Laterality"].toString(); mCurrentLaterality = patientInfo["Laterality"].toString();
mCurrentOperatorName = patientInfo["OperatorName"].toString(); mCurrentOperatorName = patientInfo["OperatorName"].toString();
mCurrentMPPSUID = patientInfo["MPPSUID"].toString();
mCurrentModality = patientInfo["Modality"].toString();
mCurrentStudyUID = patientInfo["StudyUID"].toString();
mScanProgressTimer = startTimer(500); mScanProgressTimer = startTimer(500);
} }
} }
@@ -988,6 +986,7 @@ void DeviceManager::insertEmptyScanRecord()
void DeviceManager::insertScanRecord() 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')") 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(mCurrentScanMeasurementID)
.arg(mCurrentEmptyMeasurementID) .arg(mCurrentEmptyMeasurementID)
@@ -998,9 +997,9 @@ void DeviceManager::insertScanRecord()
.arg(mCurrentLaterality) .arg(mCurrentLaterality)
.arg(mCurrentOperatorName) .arg(mCurrentOperatorName)
.arg(0) .arg(0)
.arg(mCurrentStudyUID) .arg(currentAccession->mStudyUID)
.arg(mCurrentModality) .arg(currentAccession->mModality)
.arg(mCurrentMPPSUID); .arg(currentAccession->mMPPSUID);
if(!SQLHelper::exec(sql)) if(!SQLHelper::exec(sql))
{ {
QString msg = "DB Error. G401"; QString msg = "DB Error. G401";

3
src/device/DeviceManager.h
View File

@@ -214,9 +214,6 @@ private:
QString mCurrentAccessionNumber = ""; QString mCurrentAccessionNumber = "";
QString mCurrentLaterality = ""; QString mCurrentLaterality = "";
QString mCurrentOperatorName = ""; QString mCurrentOperatorName = "";
QString mCurrentModality = "";
QString mCurrentStudyUID = "";
QString mCurrentMPPSUID = "";
QString mCurrentTransferMeasurementID = ""; QString mCurrentTransferMeasurementID = "";
QString mCurrentTransferPatientID = ""; QString mCurrentTransferPatientID = "";
QString mSoftwareVersion = ""; QString mSoftwareVersion = "";

16
src/dicom/MPPSManager.cpp
View File

@@ -23,13 +23,13 @@ void MPPSManager::processMPPSResult(const ActionResult& aResult)
MultyMessageDialogManager::getInstance()->raiseDialog(tr("Create MPPSUID error!"),MessageLevel::Error); MultyMessageDialogManager::getInstance()->raiseDialog(tr("Create MPPSUID error!"),MessageLevel::Error);
return; return;
} }
QString sql = "update Patient set MPPSUID=:mppsuid where PatientUID=:patuid"; // QString sql = "update Patient set MPPSUID=:mppsuid where PatientUID=:patuid";
QMap<QString,QVariant> params; // QMap<QString,QVariant> params;
params[":mppsuid"] = list[1]; // params[":mppsuid"] = list[1];
params[":patuid"] = list[0]; // params[":patuid"] = list[0];
int result = SQLHelper::ExecuteNoQuery(sql,params); // int result = SQLHelper::ExecuteNoQuery(sql,params);
if(result<1)return; // if(result<1)return;
MultyMessageDialogManager::getInstance()->raiseDialog(tr("Update MPPSUID success!"),MessageLevel::Info); MultyMessageDialogManager::getInstance()->raiseDialog(tr("Update MPPSUID success!"),MessageLevel::Info);
} }
@@ -73,4 +73,8 @@ void MPPSManager::sendMPPS()
action->setAccession(accession); action->setAccession(accession);
action->execute(); action->execute();
} }
else if(!accession->mMPPSUID.isEmpty())
{
accession->mMPPSUID.clear();
}
} }