Browse Source

Merge branch '1.3.8_lcq' into test

morphone1995 4 years ago
parent
commit
600626f904
2 changed files with 14 additions and 8 deletions
  1. 12 6
      src/css/readmission.less
  2. 2 2
      src/html/readmission.html

+ 12 - 6
src/css/readmission.less

@@ -22,15 +22,21 @@ h2{
 }
 .main-body{
     .main-body-com;
+    // border: none;
+    // // border:10px @disColor solid;
+    // border-top:10px @disColor solid;
+    // border-left:10px @disColor solid;
+    // margin: 44px 0 0;
+    // min-width: 1090px;
+    // min-height: calc(100% - 84px);
+    // // overflow: auto;
+    // // height:  calc(100% - 44px);
+    // height: 100%;
     border: none;
-    // border:10px @disColor solid;
-    border-top:10px @disColor solid;
     border-left:10px @disColor solid;
-    margin: 44px 0 0;
+    margin: 54px 0 0;
     min-width: 1090px;
-    min-height: calc(100% - 84px);
-    // overflow: auto;
-    // height:  calc(100% - 44px);
+    min-height: calc(100% - 54px);
     .selectDefect{
         min-width: 120px;
         width: auto;

+ 2 - 2
src/html/readmission.html

@@ -109,8 +109,8 @@
                       <th class="beHospitalId textCenter">病案号</th>
                       <th class="beHospitalId textCenter">病人姓名</th>
                       <th class="beHospitalId textCenter">性别</th>
-                      <th class="beHospitalId textCenter">病等级</th>
-                      <th class="beHospitalId textCenter">病得分</th>
+                      <th class="beHospitalId textCenter">病等级</th>
+                      <th class="beHospitalId textCenter">病得分</th>
                       <th class="beHospitalId textCenter">科室</th>
                       <th class="beHospitalId textCenter">主诊断</th>
                       <th class="beHospitalId textCenter">入院日期</th>