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

refactor: Modify the display and interaction related to worklist.

Browse Source
This commit is contained in:
sunwen
2024-09-06 17:29:25 +08:00
parent c6c3d81ecf
commit b60c4a8be9
60 changed files with 3336 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/device/DeviceManager.cpp
View File

@@ -331,6 +331,9 @@ 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);
}
}
@@ -467,8 +470,8 @@ void DeviceManager::stopFullScan()
DmsSyncActionResult result = mStopScanAction->execute();
if(!result.mIsSucessful)
{
THROW_ERROR(result.mData);
prepareFinishScan(false, "");
THROW_ERROR(result.mData);
return;
}
@@ -962,7 +965,7 @@ void DeviceManager::insertEmptyScanRecord()
void DeviceManager::insertScanRecord()
{
QString sql = QString("INSERT INTO Scan (ScanID, ReferenceID, PatientID, AccessionNumber, PatientName, ScanDateTime, Laterality, OperatorName, State) VALUES ('%1','%2','%3','%4','%5','%6','%7','%8', %9)")
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)
.arg(mCurrentPatientID)
@@ -971,7 +974,10 @@ void DeviceManager::insertScanRecord()
.arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"))
.arg(mCurrentLaterality)
.arg(mCurrentOperatorName)
.arg(0);
.arg(0)
.arg(mCurrentStudyUID)
.arg(mCurrentModality)
.arg(mCurrentMPPSUID);
if(!SQLHelper::exec(sql))
{
QString msg = "DB Error. G401";
@@ -1174,7 +1180,7 @@ void DeviceManager::startCreateReconRecord()
emit createEmptyScanToRecon(scanid, mReconTransferPath + "/" + scanid);
}
sql = "SELECT ScanID, ReferenceID, PatientID, AccessionNumber FROM Scan WHERE State < 300 And State >= 200 ORDER BY ScanDateTime ASC";
sql = "SELECT ScanID, ReferenceID, PatientID, AccessionNumber, StudyUID, MPPSUID FROM Scan WHERE State < 300 And State >= 200 ORDER BY ScanDateTime ASC";
result = SQLHelper::queryValues(sql);
for (const QVariant &variant : result)
{
@@ -1183,16 +1189,9 @@ void DeviceManager::startCreateReconRecord()
QString referenceID = record[1].toString();
QString patientID = record[2].toString();
QString AccessionNumber = record[3].toString();
QString studyUID = record[4].toString();
QString mppsUID = record[5].toString();
QString pat_sql = "SELECT AccessionNumber, StudyUID, Modality, MPPSUID FROM Patient WHERE PatientID=:patID and AccessionNumber=:accno";
QMap<QString,QVariant> map;
QMap<QString,QVariant> params;
params[":patID"] = patientID;
params[":accno"] = AccessionNumber;
SQLHelper::QueryFirst(pat_sql, map, params);
QString studyUID = map.contains("StudyUID")?map["StudyUID"].toString():"";
QString mppsUID = map.contains("MPPSUID")?map["MPPSUID"].toString():"";
emit createScanToRecon(scanID, studyUID, mppsUID, referenceID, mReconTransferPath + "/" + scanID);
}
startTransfer();
@@ -1344,6 +1343,7 @@ bool DeviceManager::startAutoLocate()
return true;
}
}
emit startAutoLocateResult(false);
TRIGGER_EVENT(StopScanProcess, nullptr, nullptr);
QString errorMessage = tr("Start auto locate failed");
THROW_ERROR(errorMessage)