调整填写病历为新的布局、增加填写病历对应的逻辑转换、导航按钮修改

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();

xyylMCWEACSystem/medicalrecordwidget.cpp

@@ -4,6 +4,7 @@
 #include <QGridLayout>
 #include <QFontMetrics>
 #include <QDebug>
+#include <QGroupBox>
 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_labCheckNum.setFixedWidth(iwidth);
-   m_labName.setFixedWidth(iwidth);
+  // m_labName.setFixedWidth(iwidth);
-   m_labLaterality.setFixedWidth(iwidth);
+  // m_labLaterality.setFixedWidth(iwidth);
-   m_labDiagnosticRecord.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 * hlayStart1  = new QHBoxLayout;
-    QHBoxLayout * hlayCheck  = new QHBoxLayout;
+    hlayStart1->addWidget(&m_labStar);
-    QHBoxLayout * hlayName   = new QHBoxLayout;
+    hlayStart1->addWidget(&m_labCheckNum);
-    QHBoxLayout * hlayLaterality  =  new QHBoxLayout;
+    hlayStart1->addWidget(&m_editCheckNum);
-    QHBoxLayout * hlayDiagnosticRecord  =  new QHBoxLayout;
-    QHBoxLayout * hlayokCancel  =  new QHBoxLayout;
 
 
-    QVBoxLayout * vlay = new  QVBoxLayout;
+    hlayStart1->addWidget(&m_labType);
-    vlay->addLayout(hlayCheck);
+    hlayStart1->addWidget(&m_chHospitalized);
-    vlay->addLayout(hlayName);
+    hlayStart1->addWidget(&m_chOutpatient);
-    vlay->addLayout(hlayLaterality);
+
-    vlay->addLayout(hlayDiagnosticRecord);
+
-    vlay->addWidget(&m_textDiagnosticRecord);
+    QHBoxLayout * hlayStart2  = new QHBoxLayout;
-    vlay->addLayout( hlayokCancel);
+    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);
+    QGridLayout * gridlay  = new QGridLayout;
-    hlayCheck->addWidget(&m_editCheckNum);
-    hlayCheck->addWidget(&m_labHospitalized);
-    hlayCheck->addWidget(&m_chHospitalized);
-    hlayCheck->addWidget(&m_labOutpatient);
-    hlayCheck->addWidget(&m_chOutpatient);
-    hlayCheck->addStretch();
 
-    hlayName->addWidget(&m_labName,0,Qt::AlignHCenter);
+    int col=0,row = 0;
-    hlayName->addWidget(&m_editName);
+    gridlay->addWidget(&m_labStar,0,col,1,1,Qt::AlignRight);
-    hlayName->addWidget(&m_labSex);
+    gridlay->addWidget(&m_labCheckNum,row,++col,1,1,Qt::AlignRight);
-    hlayName->addWidget(&m_cbSex);
+    gridlay->addWidget(&m_editCheckNum,row,++col,1,2);
-    hlayName->addStretch();
+    ++col;
-
+    gridlay->addWidget(&m_labType,row,++col,1,1,Qt::AlignRight);
-    hlayLaterality->addWidget(&m_labLaterality,0,Qt::AlignHCenter);
+    gridlay->addWidget(&m_chHospitalized,row,++col,1,1,Qt::AlignRight);
-    hlayLaterality->addWidget(&m_cbLaterality);
+    gridlay->addWidget(&m_chOutpatient,row,++col,1,1);
-    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();
 
 
-#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
 

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;

xyylMCWEACSystem/navlistwidget.cpp

@@ -36,7 +36,7 @@ bool  NavListWidget::initConnect()
      {
          return;
      }
-
+     emit SigClicked(button->objectName() );
      qDebug()<< button->objectName()<<endl;
  }
  void  NavListWidget::setList(QStringList strlist,QStringList strlistObjectName)

xyylMCWEACSystem/navlistwidget.h

@@ -18,10 +18,11 @@ public:
     void  initLay();
     bool  initConnect();
     void  setList(QStringList strlist,QStringList strlistObjectName);
+signals:
+    void  SigClicked(QString );
 private slots:
     void onButtonClicked( QAbstractButton *button);
 private:
-
     QList<QPushButton*> m_listBtns;
 };
 #endif // NAVLISTWIDGET_H

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"<<endl;
 
+    }
+    bCon = connect(&m_NavListWidget,SIGNAL(SigClicked(QString)),this,SLOT(slotClickedBtn(QString)));
+    if(!bCon)
+    {
+        qDebug()<<"connect failed"<<endl;
+
     }
     return bCon;
 }
@@ -78,5 +86,16 @@ void SystemSettingWidget::slotClickedChanged()
         return;
     }
     emit SigClicked(send->objectName());
-
+    QString strName = send->objectName();
+    qDebug()<<send->objectName()<<endl;
 }
+ void SystemSettingWidget::slotClickedBtn(QString strName)
+ {
+     if(strName.compare("fill-in-the-Case")==0)
+     {
+         m_stackedWidget.addWidget(&m_MedicalRecordWidget);
+         m_stackedWidget.setCurrentWidget(&m_MedicalRecordWidget);
+
+     }
+ }
+

xyylMCWEACSystem/systemsettingwidget.h

@@ -9,6 +9,7 @@
 #include <QStyleOption>
 #include <QPainter>
 #include <QStackedWidget>
+#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

xyylMCWEACSystem/xyylMCWEACSystem.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.9.1, 2024-10-31T13:05:27. -->
+<!-- Written by QtCreator 4.9.1, 2024-10-31T18:02:10. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>