diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index b97be89..7116be6 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/medicalrecordwidget.cpp b/xyylMCWEACSystem/medicalrecordwidget.cpp index cb0dbc9..d0cb82a 100644 --- a/xyylMCWEACSystem/medicalrecordwidget.cpp +++ b/xyylMCWEACSystem/medicalrecordwidget.cpp @@ -33,39 +33,10 @@ void MedicalRecordWidget::init() m_labStar.setStyleSheet("color:red"); m_labStar2.setStyleSheet("color:red"); #if 0 - //检查号 - m_labCheckNum.setText(tr("CheckNum")); - - //住院 hospitalized - m_labType.setText(tr("type")); - m_chHospitalized.setText(tr("hospitalized")); - //门诊 - m_chOutpatient.setText(tr("Outpatient")); - - //姓名 - m_labName.setText(tr("Name")); - //性别 - m_labSex.setText(tr("Sex"));; - //左右利 - m_labLaterality.setText(tr("Laterality")); - //检查日期 - m_labDate_Of_inspection.setText(tr("DateInspection")); - m_labAge.setText(tr("Age")); - m_labBirthDay.setText(tr("birthDay")); - //诊断病历 - m_labDiagnosticRecord.setText(tr("Record")); - - m_btnOk.setText(tr("ok")); - m_btnCancel.setText(tr("Cancel")); - - int iwidth = QFontMetrics(this->font()).width("Laterality"); - //m_labCheckNum.setFixedWidth(iwidth); - // m_labName.setFixedWidth(iwidth); - // m_labLaterality.setFixedWidth(iwidth); - //m_labDiagnosticRecord.setFixedWidth(iwidth); #else - m_gbx.setTitle("病历资料"); + m_labTitle.setText("病历资料"); + m_labTitle.setStyleSheet("width: 136px;font-family: 思源黑体;color: #0D9DDB; font-size: 32px;font-weight: 500;height: 46px;"); //检查号 m_labCheckNum.setText(tr("检查号")); @@ -113,50 +84,12 @@ void MedicalRecordWidget::init() m_btnOk.setObjectName("ok"); m_btnCancel.setObjectName("cancel"); int iwidth = QFontMetrics(this->font()).width("Laterality"); - //m_labCheckNum.setFixedWidth(iwidth); - // m_labName.setFixedWidth(iwidth); - // m_labLaterality.setFixedWidth(iwidth); - //m_labDiagnosticRecord.setFixedWidth(iwidth); -#if 0 - m_btnOk.setStyleSheet("QPushButton{\ - background: white;\ - border-radius:10px;padding:7px 10px;\ - }\ - QPushButton:hover{\ - background: #0d9ddb;\ - border-radius:10px;padding:7px 10px;\ - }\ - QPushButton:pressed{\ - background: #0d9aab;\ - border-radius:10px;padding:7px 10px;\ - }\ - QPushButton:checked{\ - background: #0d9ddb;\ - border-radius:10px;padding:7px 10px;\ - }"); - m_btnCancel.setStyleSheet("QPushButton{\ - background: white;\ - border-radius:10px;padding:7px 10px;\ - }\ - QPushButton:hover{\ - background: #0d9ddb;\ - border-radius:10px;padding:7px 10px;\ - }\ - QPushButton:pressed{\ - background: #0d9aab;\ - border-radius:10px;padding:7px 10px;\ - }\ - QPushButton:checked{\ - background: #0d9ddb;\ - border-radius:10px;padding:7px 10px;\ - }"); -#endif #endif } void MedicalRecordWidget::initLay() { -#if 1 +#if 0 QHBoxLayout * hlayStart1 = new QHBoxLayout; hlayStart1->addWidget(&m_labStar); hlayStart1->addWidget(&m_labCheckNum); @@ -237,29 +170,92 @@ void MedicalRecordWidget::initLay() m_chRfight.setFixedWidth(iwidth/2); #else + QGridLayout * gridlay = new QGridLayout; + int col = 0; + int row = 0; + gridlay->addWidget(&m_labStar,row,col,Qt::AlignRight); + gridlay->addWidget(&m_labCheckNum,row,++col); + gridlay->addWidget(&m_editCheckNum,row,++col); - QVBoxLayout * vlay1 = new QVBoxLayout; - QHBoxLayout * hlayStart1 = new QHBoxLayout; - hlayStart1->addWidget(&m_labStar); - hlayStart1->addWidget(&m_labCheckNum); - vlay1->addLayout(hlayStart1); - QHBoxLayout * hlayStart2 = new QHBoxLayout; - hlayStart2->addWidget(&m_labStar2); - hlayStart2->addWidget(&m_labName); - vlay1->addLayout(hlayStart2); - vlay1->addWidget(&m_labBirthDay); - vlay1->addWidget(&m_labLaterality); - vlay1->addWidget(&m_labDiagnosticRecord); + gridlay->addWidget(&m_labType,row,++col,Qt::AlignRight); + QHBoxLayout * hlay_hostOut = new QHBoxLayout; + hlay_hostOut->addWidget(&m_chHospitalized); + hlay_hostOut->addWidget(&m_chOutpatient); + hlay_hostOut->addStretch(); + gridlay->addLayout(hlay_hostOut,row,++col) ; - QVBoxLayout * vlay2 = new QVBoxLayout; - vlay2->addWidget(&m_editCheckNum); - vlay2->addWidget(&m_editName); - vlay2->addWidget(&m_dateBirthDay); - QHBoxLayout * hlay3 = new QHBoxLayout; - hlay3->addWidget(&m_chLeft); - hlay3->addWidget(&m_chRfight); - vlay2->addLayout(hlay3); + row ++; + col = 0; + gridlay->addWidget(&m_labStar2,row,col,Qt::AlignRight); + gridlay->addWidget(&m_labName,row,++col); + gridlay->addWidget(&m_editName,row,++col); + + + gridlay->addWidget(&m_labSex,row,++col,Qt::AlignRight); + QHBoxLayout * hlay_ManWan = new QHBoxLayout; + hlay_ManWan->addWidget(&m_chMan); + hlay_ManWan->addWidget(&m_chWan); + hlay_ManWan->addStretch(); + gridlay->addLayout(hlay_ManWan,row,++col); + + + + row ++; + col = 1; + gridlay->addWidget(&m_labBirthDay,row,col ); + gridlay->addWidget(&m_dateBirthDay,row,++col); + + gridlay->addWidget(&m_labAge,row,++col,Qt::AlignRight); + gridlay->addWidget(&m_editAge,row,++col); + + row ++; + col = 1; + gridlay->addWidget(&m_labLaterality,row,col); + QHBoxLayout * Hlay_leftRight = new QHBoxLayout; + Hlay_leftRight->addWidget(&m_chLeft); + Hlay_leftRight->addWidget(&m_chRfight); + Hlay_leftRight->addStretch(); + gridlay->addLayout(Hlay_leftRight,row,++col); + + + gridlay->addWidget(&m_labDate_Of_inspection,row,++col,Qt::AlignRight); + gridlay->addWidget(&m_dateInspection,row,++col); + + row ++; + col = 1; + gridlay->addWidget(&m_labDiagnosticRecord,row,col); + gridlay->addWidget(&m_textDiagnosticRecord,row,++col,3,3); + + + QHBoxLayout * hlay_title = new QHBoxLayout; + hlay_title->addWidget(&m_labTitle); + + QHBoxLayout * hlay_grid = new QHBoxLayout; + //hlay_grid->addSpacing(30); + hlay_grid->addLayout(gridlay); + gridlay->setContentsMargins(50,50,50,50); + //hlay_grid->addSpacing(30); + + QVBoxLayout * vlay = new QVBoxLayout; + + + vlay->addLayout(hlay_title,1); + vlay->addLayout(hlay_grid,15); + + QHBoxLayout * hlay_okCancel = new QHBoxLayout; + hlay_okCancel->addStretch(); + hlay_okCancel->addWidget(&m_btnOk); + hlay_okCancel->addWidget(&m_btnCancel); + hlay_okCancel->addStretch(); + + QWidget * w = new QWidget; + w->setLayout(vlay); + + QVBoxLayout * vlayAll = new QVBoxLayout; + vlayAll->addWidget(w); + vlayAll->addLayout(hlay_okCancel); + setLayout(vlayAll); #endif diff --git a/xyylMCWEACSystem/medicalrecordwidget.h b/xyylMCWEACSystem/medicalrecordwidget.h index f69589d..d981e27 100644 --- a/xyylMCWEACSystem/medicalrecordwidget.h +++ b/xyylMCWEACSystem/medicalrecordwidget.h @@ -30,8 +30,7 @@ private slots: void slotCancel(); private: - QGroupBox m_gbx; - + QLabel m_labTitle; QLabel m_labStar; QLabel m_labStar2;