Add accession number and fix a problem with create recon record automaticly.

This commit is contained in:
sunwen
2023-08-23 16:49:56 +08:00
parent a94269c487
commit 2aa6541085
15 changed files with 123 additions and 77 deletions

View File

@@ -57,6 +57,7 @@ void PatientDetailForm::setPatientInformation(PatientInformation* information) {
mCurrentPatientUID = information->PatientUID;
mAddDate = information->AddDate;
mStore.Sex = information->Sex;
mStore.AccessionNumber = information->AccessionNumber;
storePatientInformation();
}
}

View File

@@ -6,12 +6,12 @@
#define GUI_PATIENTINFORMATION_H
#define ADD_PATIENT()\
ADD_PATIENT_PROPERTY(ID)\
ADD_PATIENT_PROPERTY(AccessionNumber)\
ADD_PATIENT_PROPERTY(Name)\
ADD_PATIENT_PROPERTY(BirthDate)\
ADD_PATIENT_PROPERTY(Sex)\
ADD_PATIENT_PROPERTY(AddDate)\
ADD_PATIENT_PROPERTY(Comment)\
ADD_PATIENT_PROPERTY(Flag)
ADD_PATIENT_PROPERTY(Comment)
#define EDIT_PATIENT()\
ADD_PATIENT_PROPERTY(PatientUID)\
@@ -34,12 +34,11 @@ class PatientInformation:public QObject{
Q_OBJECT
public:
#define ADD_PATIENT_PROPERTY(val) QString val;
EDIT_PATIENT();
EDIT_PATIENT()
#undef ADD_PATIENT_PROPERTY
PatientInformation()
: QObject()
{
this->Flag = QString("0");
}
PatientInformation* Copy()
{
@@ -50,6 +49,7 @@ public:
n->BirthDate = this->BirthDate;
n->Sex = this->Sex;
n->Comment = this->Comment;
n->AccessionNumber = this->AccessionNumber;
return n;
}
};

View File

@@ -209,14 +209,14 @@ void SelectFormWidget::initTableView(QHBoxLayout *contentLayout) {// TableView f
mPatTable->setSortingEnabled(true); // enable sortingEnabled
mPatTable->setModel((QAbstractItemModel*) mModel);
mPatTable->hideColumn(0);
mPatTable->hideColumn(7);
mPatTable->show();
mPatTable->setColumnWidth(1, 250);
mPatTable->setColumnWidth(2, 250);
mPatTable->setColumnWidth(3, 160);
mPatTable->setColumnWidth(4, 120);
mPatTable->setColumnWidth(5, 250);
mPatTable->setColumnWidth(3, 250);
mPatTable->setColumnWidth(4, 160);
mPatTable->setColumnWidth(5, 120);
mPatTable->setColumnWidth(6, 250);
contentLayout->addWidget(mPatTable);
//table current row selection changing event
connect(mPatTable, &SlideTableView::currentRowChanged, [=](int row) {
@@ -240,11 +240,12 @@ void SelectFormWidget::initDataModel() {//TODO:单独初始化预防SQL错误
mModel->sort(5, Qt::DescendingOrder);
mModel->select();
mModel->setHeaderData(1, Qt::Horizontal, "ID");
mModel->setHeaderData(2, Qt::Horizontal, tr("Name"));
mModel->setHeaderData(3, Qt::Horizontal, tr("Birth Date"));
mModel->setHeaderData(4, Qt::Horizontal, tr("Gender"));
mModel->setHeaderData(5, Qt::Horizontal, tr("Add Date"));
mModel->setHeaderData(6, Qt::Horizontal, tr("Comment"));
mModel->setHeaderData(2, Qt::Horizontal, tr("AccessionNumber"));
mModel->setHeaderData(3, Qt::Horizontal, tr("Name"));
mModel->setHeaderData(4, Qt::Horizontal, tr("Birth Date"));
mModel->setHeaderData(5, Qt::Horizontal, tr("Gender"));
mModel->setHeaderData(6, Qt::Horizontal, tr("Add Date"));
mModel->setHeaderData(7, Qt::Horizontal, tr("Comment"));
}
void SelectFormWidget::setPatientDetail(const SlideTableView *table, const QSqlTableModel *model,
@@ -259,11 +260,12 @@ void SelectFormWidget::setPatientDetail(const SlideTableView *table, const QSqlT
void SelectFormWidget::reloadLanguage(){
mModel->setHeaderData(1, Qt::Horizontal, "ID");
mModel->setHeaderData(2, Qt::Horizontal, tr("Name"));
mModel->setHeaderData(3, Qt::Horizontal, tr("Birth Date"));
mModel->setHeaderData(4, Qt::Horizontal, tr("Gender"));
mModel->setHeaderData(5, Qt::Horizontal, tr("Add Date"));
mModel->setHeaderData(6, Qt::Horizontal, tr("Comment"));
mModel->setHeaderData(2, Qt::Horizontal, tr("AccessionNumber"));
mModel->setHeaderData(3, Qt::Horizontal, tr("Name"));
mModel->setHeaderData(4, Qt::Horizontal, tr("Birth Date"));
mModel->setHeaderData(5, Qt::Horizontal, tr("Gender"));
mModel->setHeaderData(6, Qt::Horizontal, tr("Add Date"));
mModel->setHeaderData(7, Qt::Horizontal, tr("Comment"));
mBtnAccount->setText(tr("Account"));
//mBtnWorklist->setText(tr("Worklist"));