diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index e86dab4..ce254ff 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/main.cpp b/xyylMCWEACSystem/main.cpp index 7d55032..6e122ec 100644 --- a/xyylMCWEACSystem/main.cpp +++ b/xyylMCWEACSystem/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) globalFont.setFamily("黑体"); QApplication::setFont(globalFont); -#if 0 +#if 1 CurChatWidget w; w.show(); diff --git a/xyylMCWEACSystem/medicalrecordwidget.cpp b/xyylMCWEACSystem/medicalrecordwidget.cpp index 08330cc..e11c598 100644 --- a/xyylMCWEACSystem/medicalrecordwidget.cpp +++ b/xyylMCWEACSystem/medicalrecordwidget.cpp @@ -4,6 +4,7 @@ #include #include #include +#include MedicalRecordWidget::MedicalRecordWidget(QWidget * parent ):QWidget(parent) { init(); @@ -16,31 +17,31 @@ MedicalRecordWidget::~MedicalRecordWidget() } void MedicalRecordWidget::init() { + + // setFixedSize(600,600); + m_labStar.setText(tr("*")); + m_labStar2.setText(tr("*")); + +#if 0 //检查号 m_labCheckNum.setText(tr("CheckNum")); //住院 hospitalized - m_labHospitalized.setText(tr("hospitalized")); - + m_labType.setText(tr("type")); + m_chHospitalized.setText(tr("hospitalized")); //门诊 - m_labOutpatient.setText(tr("Outpatient")); - + 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")); @@ -48,62 +49,193 @@ void MedicalRecordWidget::init() 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); + //m_labCheckNum.setFixedWidth(iwidth); + // m_labName.setFixedWidth(iwidth); + // m_labLaterality.setFixedWidth(iwidth); + //m_labDiagnosticRecord.setFixedWidth(iwidth); + +#else + //检查号 + m_labCheckNum.setText(tr("检查号")); + + //住院 hospitalized + m_labType.setText(tr("类型")); + m_chHospitalized.setText(tr("住院")); + //门诊 + m_chOutpatient.setText(tr("门诊")); + + //姓名 + m_labName.setText(tr("姓名")); + //性别 + m_labSex.setText(tr("性别"));; + //左右利 + m_labLaterality.setText(tr("左右利")); + //检查日期 + m_labDate_Of_inspection.setText(tr("检查日期")); + m_labAge.setText(tr("年龄")); + m_labBirthDay.setText(tr("出生日期")); + //诊断病历 + m_labDiagnosticRecord.setText(tr("其他:")); +m_labDiagnosticRecord.setFixedHeight(30); + 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); + +#endif } void MedicalRecordWidget::initLay() { -#if 1 - QHBoxLayout * hlayCheck = new QHBoxLayout; - QHBoxLayout * hlayName = new QHBoxLayout; - QHBoxLayout * hlayLaterality = new QHBoxLayout; - QHBoxLayout * hlayDiagnosticRecord = new QHBoxLayout; - QHBoxLayout * hlayokCancel = new QHBoxLayout; + QHBoxLayout * hlayStart1 = new QHBoxLayout; + hlayStart1->addWidget(&m_labStar); + hlayStart1->addWidget(&m_labCheckNum); + hlayStart1->addWidget(&m_editCheckNum); - QVBoxLayout * vlay = new QVBoxLayout; - vlay->addLayout(hlayCheck); - vlay->addLayout(hlayName); - vlay->addLayout(hlayLaterality); - vlay->addLayout(hlayDiagnosticRecord); - vlay->addWidget(&m_textDiagnosticRecord); - vlay->addLayout( hlayokCancel); + hlayStart1->addWidget(&m_labType); + hlayStart1->addWidget(&m_chHospitalized); + hlayStart1->addWidget(&m_chOutpatient); + + + QHBoxLayout * hlayStart2 = new QHBoxLayout; + hlayStart2->addWidget(&m_labStar2); + hlayStart2->addWidget(&m_labName); + hlayStart2->addWidget(&m_editName); + + + hlayStart2->addWidget(&m_labSex); + hlayStart2->addWidget(&m_chMan); + hlayStart2->addWidget(&m_chWan); + + QHBoxLayout * hlay3 = new QHBoxLayout; + hlay3->addWidget(&m_labBirthDay); + hlay3->addWidget(&m_dateBirthDay); + hlay3->addWidget(&m_labAge); + hlay3->addWidget(&m_editAge); + + QHBoxLayout * hlay4 = new QHBoxLayout; + hlay4->addWidget(&m_labLaterality); + hlay4->addWidget(&m_chLeft); + hlay4->addWidget(&m_chRfight); + hlay4->addWidget(&m_labDate_Of_inspection); + hlay4->addWidget(&m_dateInspection); + + QHBoxLayout * hlay5 = new QHBoxLayout; + hlay5->addWidget(&m_labDiagnosticRecord); + hlay5->addWidget(&m_textDiagnosticRecord); + + QVBoxLayout *vlay = new QVBoxLayout; + vlay->addLayout(hlayStart1); + vlay->addLayout(hlayStart2); + vlay->addLayout(hlay3); + vlay->addLayout(hlay4); + vlay->addLayout(hlay5); setLayout(vlay); +#if 0 - hlayCheck->addWidget(&m_labCheckNum,0,Qt::AlignHCenter); - hlayCheck->addWidget(&m_editCheckNum); - hlayCheck->addWidget(&m_labHospitalized); - hlayCheck->addWidget(&m_chHospitalized); - hlayCheck->addWidget(&m_labOutpatient); - hlayCheck->addWidget(&m_chOutpatient); - hlayCheck->addStretch(); + QGridLayout * gridlay = new QGridLayout; - hlayName->addWidget(&m_labName,0,Qt::AlignHCenter); - hlayName->addWidget(&m_editName); - hlayName->addWidget(&m_labSex); - hlayName->addWidget(&m_cbSex); - hlayName->addStretch(); - - hlayLaterality->addWidget(&m_labLaterality,0,Qt::AlignHCenter); - hlayLaterality->addWidget(&m_cbLaterality); - hlayLaterality->addWidget(&m_labDate_Of_inspection); - hlayLaterality->addWidget(&m_dateInspection); - hlayLaterality->addStretch(); - - hlayDiagnosticRecord->addWidget(&m_labDiagnosticRecord,0,Qt::AlignHCenter); - hlayDiagnosticRecord->addStretch(); - - hlayokCancel->addStretch(); - hlayokCancel->addWidget(&m_btnOk); - hlayokCancel->addSpacing(30); - hlayokCancel->addWidget(&m_btnCancel); - hlayokCancel->addStretch(); + int col=0,row = 0; + gridlay->addWidget(&m_labStar,0,col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_labCheckNum,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_editCheckNum,row,++col,1,2); + ++col; + gridlay->addWidget(&m_labType,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chHospitalized,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chOutpatient,row,++col,1,1); -#else + row ++; + col=0; + + gridlay->addWidget(&m_labStar2,row,0,1,1,Qt::AlignRight); + gridlay->addWidget(&m_labName,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_editName,row,++col,1,2); + ++col; + gridlay->addWidget(&m_labSex,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chMan,row,++col,1,1); + gridlay->addWidget(&m_chWan,row,++col,1,1); + + // + row ++; + col=0; + gridlay->addWidget(&m_labBirthDay,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_dateBirthDay,row,++col,1,2); + ++col; + gridlay->addWidget(&m_labAge,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_editAge,row,++col,1,2); + + row ++; + col=0; + gridlay->addWidget(&m_labLaterality,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chLeft,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chRfight,row,++col,1,1); + ++col; + gridlay->addWidget(&m_labDate_Of_inspection,row,col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_dateInspection,row,++col,1,2); + + row ++; + col=0; + gridlay->addWidget(&m_labDiagnosticRecord,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_textDiagnosticRecord,++row,++col,3,5); + gridlay->setSpacing(1); + // gridlay->setContentsMargins(0,0,0,0); + setLayout(gridlay); + +# //--------------- + QGridLayout * gridlay = new QGridLayout; + + int col=0,row = 0; + //gridlay->addWidget(&m_labStar,0,col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_labCheckNum,row,col,1,1); + gridlay->addWidget(&m_editCheckNum,row,++col,1,2,Qt::AlignLeft); + ++col; + gridlay->addWidget(&m_labType,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chHospitalized,row,++col,1,1,Qt::AlignLeft); + gridlay->addWidget(&m_chOutpatient,row,++col,1,1); + + + row ++; + col=0; + + // gridlay->addWidget(&m_labStar2,row,0,1,1,Qt::AlignRight); + gridlay->addWidget(&m_labName,row,col,1,1); + gridlay->addWidget(&m_editName,row,++col,1,2,Qt::AlignLeft); + ++col; + gridlay->addWidget(&m_labSex,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_chMan,row,++col,1,1,Qt::AlignLeft); + gridlay->addWidget(&m_chWan,row,++col,1,1); + + // + row ++; + col=0; + gridlay->addWidget(&m_labBirthDay,row,col,1,1); + gridlay->addWidget(&m_dateBirthDay,row,++col,1,2,Qt::AlignLeft); + ++col; + gridlay->addWidget(&m_labAge,row,++col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_editAge,row,++col,1,2); + + row ++; + col=0; + gridlay->addWidget(&m_labLaterality,row,col,1,1); + gridlay->addWidget(&m_chLeft,row,++col,1,1,Qt::AlignLeft); + gridlay->addWidget(&m_chRfight,row,++col,1,1); + ++col; + gridlay->addWidget(&m_labDate_Of_inspection,row,col,1,1,Qt::AlignRight); + gridlay->addWidget(&m_dateInspection,row,++col,1,2); + + row ++; + col=0; + gridlay->addWidget(&m_labDiagnosticRecord,row,col,1,1); + gridlay->addWidget(&m_textDiagnosticRecord,++row,++col,3,5); + //gridlay->setSpacing(1); + // gridlay->setContentsMargins(0,0,0,0); + setLayout(gridlay); #endif diff --git a/xyylMCWEACSystem/medicalrecordwidget.h b/xyylMCWEACSystem/medicalrecordwidget.h index 647c3e8..6282079 100644 --- a/xyylMCWEACSystem/medicalrecordwidget.h +++ b/xyylMCWEACSystem/medicalrecordwidget.h @@ -25,16 +25,15 @@ public: void initLay(); bool initConnect(); private: + QLabel m_labStar; + QLabel m_labStar2; //检查号 QLabel m_labCheckNum; QLineEdit m_editCheckNum; //住院 hospitalized - QLabel m_labHospitalized; + QLabel m_labType; QCheckBox m_chHospitalized; - - //门诊 - QLabel m_labOutpatient; QCheckBox m_chOutpatient; //姓名 @@ -42,11 +41,19 @@ private: QLineEdit m_editName; //性别 QLabel m_labSex; - QComboBox m_cbSex; + QCheckBox m_chMan; + QCheckBox m_chWan; + //年龄 + QLabel m_labAge; + QLineEdit m_editAge; //左右利 QLabel m_labLaterality; - QComboBox m_cbLaterality; + QCheckBox m_chLeft; + QCheckBox m_chRfight; + //出生日期 + QLabel m_labBirthDay; + QDateEdit m_dateBirthDay; //检查日期 QLabel m_labDate_Of_inspection; diff --git a/xyylMCWEACSystem/navlistwidget.cpp b/xyylMCWEACSystem/navlistwidget.cpp index 7e3a27b..6120050 100644 --- a/xyylMCWEACSystem/navlistwidget.cpp +++ b/xyylMCWEACSystem/navlistwidget.cpp @@ -36,7 +36,7 @@ bool NavListWidget::initConnect() { return; } - + emit SigClicked(button->objectName() ); qDebug()<< button->objectName()< m_listBtns; }; #endif // NAVLISTWIDGET_H diff --git a/xyylMCWEACSystem/systemsettingwidget.cpp b/xyylMCWEACSystem/systemsettingwidget.cpp index d6719e4..3e9939e 100644 --- a/xyylMCWEACSystem/systemsettingwidget.cpp +++ b/xyylMCWEACSystem/systemsettingwidget.cpp @@ -30,7 +30,9 @@ void SystemSettingWidget::init() m_btnRet.setMinimumSize(QSize(100,30)); m_NavListWidget.setList(QStringList()<<"填写病例"<<"病例管理"<<"导联方案"<<"参数设置"<<"医院信息", - QStringList()<<"ssss"<<"sss"<<"sk"<<"set"<<"info"); + QStringList()<<"fill-in-the-Case" << "case-management" << "leading-scheme" << "Parameter setting" << "hospital-information"); + + } void SystemSettingWidget::initLay() { @@ -39,12 +41,12 @@ void SystemSettingWidget::initLay() hlay->addWidget(&m_labDes,9, Qt::AlignHCenter); QWidget * w1 = new QWidget; w1->setFixedHeight(60); - w1->setStyleSheet("QWidget{background-color:#ffffff;}"); + w1->setStyleSheet("QWidget{background-color:#ffffff;}"); w1->setLayout(hlay); QVBoxLayout * vlay = new QVBoxLayout; vlay->addWidget(w1,1); QWidget * w = new QWidget; - w->setStyleSheet("QWidget{background: rgb(47, 61, 82);border:0px}"); + w->setStyleSheet("QWidget{background-color:#ffffff;border:1px solid blcak}"); vlay->addWidget(w,9); vlay->setContentsMargins(0,0,0,0); vlay->setSpacing(10); @@ -66,6 +68,12 @@ bool SystemSettingWidget::initConnect() { qDebug()<<"connect failed"<objectName()); - + QString strName = send->objectName(); + qDebug()<objectName()< #include #include +#include "medicalrecordwidget.h" class SystemSettingWidget: public QWidget { Q_OBJECT @@ -29,6 +30,7 @@ signals: void SigClicked(QString objName); private slots: void slotClickedChanged(); + void slotClickedBtn(QString); private: @@ -40,5 +42,7 @@ private: NavListWidget m_NavListWidget; QStackedWidget m_stackedWidget; + + MedicalRecordWidget m_MedicalRecordWidget; }; #endif // SYSTEMSETTINGWIDGET_H diff --git a/xyylMCWEACSystem/xyylMCWEACSystem.pro.user b/xyylMCWEACSystem/xyylMCWEACSystem.pro.user index e982c67..fb67421 100644 --- a/xyylMCWEACSystem/xyylMCWEACSystem.pro.user +++ b/xyylMCWEACSystem/xyylMCWEACSystem.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId