修改Bug

src/views/allcase/components/CaseRecord2.vue

@@ -114,7 +114,7 @@
         </template>
         <el-col :span="24" class="mt80">
           <div class="fr" style="margin-right: 100px;">
-            <span class="text-blod">医生签名：</span>
+            <span class="text-blod">医生签名：</span><span>{{ data.doctor_name }}</span>
             <!-- 接口暂无字段 -->
           </div>
         </el-col>

src/views/allcase/components/OutHospitalRecord.vue

@@ -5,12 +5,12 @@
       <el-row :gutter="32">
         <el-col :span="6">
           <span class="text-blod">科室：</span>
-          <span></span>
+          <span v-if="data.department">{{data.department}}</span>
           <!-- 接口暂无字段 -->
         </el-col>
         <el-col :span="6">
           <span class="text-blod">姓名：</span>
-          <span></span>
+          <span v-if="data.name">{{ data.name.value }}</span>
           <!-- 接口暂无字段 -->
         </el-col>
         <el-col :span="6">
@@ -19,8 +19,8 @@
           <!-- 接口暂无字段 -->
         </el-col>
         <el-col :span="6">
-          <span class="text-blod">住院号：</span>
-          <span></span>
+          <span class="text-blod" v-if="data.hospital_no">住院号：</span>
+          <span>{{data.hospital_no.value}}</span>
           <!-- 接口暂无字段 -->
         </el-col>
       </el-row>
@@ -79,13 +79,30 @@
           <span class="text-blod">出院医嘱：</span>
           <div class="pl76 mb20" v-if="data.cyyz">{{ data.cyyz.value }}</div>
         </el-col>
-        <el-col :span="24" class="mb10">
+        <el-col :span="24" class="mb40">
           <div class="text_right">
             医生签名：
+            <span v-if="data.doctor_name">{{data.doctor_name}}</span>
           <!-- 接口暂无字段 -->
           </div>
         </el-col>
       </el-row>
+       <div class="admrec-bottom-time">
+              <div class="admrec-bottom-time-list">
+                <span class="text-blod">创建时间:</span>
+                <span v-if="data.CJSJ">{{data.CJSJ}}</span>
+              </div>
+              <div class="admrec-bottom-time-list">
+                <span  class="text-blod">修改时间:</span>
+                <span v-if="data.ZXSJ">{{data.ZXSJ}}</span>
+              </div>
+          </div>
+          <div class="admrec-bottom-time">   
+              <div class="admrec-bottom-time-list">
+                <span  class="text-blod">完成时间:</span>
+                <span v-if="data.WCSJ">{{data.WCSJ}}</span>
+              </div>
+          </div>
     </div>
   </div>
 </template>
@@ -168,4 +185,16 @@ export default {
     }
   }
 }
+  .admrec-bottom-time{
+      width: 100%;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      margin-bottom: 20px;
+      .admrec-bottom-time-list{
+        width: 50%;
+      }
+
+  }
+
 </style>

src/views/allcase/contFile/admissionRecord.vue

@@ -3,20 +3,21 @@
     <div id="MyDivA" >
         <div class="admrec-cont">
           <div class="cont-title-description">入院记录</div>
+          
           <div class="admrec-cont-header">
               <div class="admrec-cont-header-list">
                 <span class="cont-textbold">科室:</span>
-                <!-- <span>心脏重症监护室</span> -->
+                <span>{{data.department}}</span>
               </div>
-              <div>
+              <div class="admrec-cont-header-list">
                 <span  class="cont-textbold">姓名:</span>
                 <span v-if="data.name">{{data.name.value}}</span>
               </div>
-              <div>
+              <div class="admrec-cont-header-list">
                 <span  class="cont-textbold">床号:</span>
                 <span v-if="data.bed_no">{{data.bed_no.value}}</span>
               </div>
-              <div>
+              <div class="admrec-cont-header-list">
                 <span  class="cont-textbold">住院号:</span>
                 <span v-if="data.hospital_no">{{data.hospital_no.value}}</span>
               </div>
@@ -36,14 +37,14 @@
           <div class="admrec-cont-infor">
             <div class="admrec-cont-infor-list admrec-cont-infor-text cont-textbold">年龄:</div>
             <div class="admrec-cont-infor-list"><span v-if="data.age">{{data.age.value}}</span></div>
-            <div class="cont-textbold">入院时间:</div>
-            <div class="admrec-cont-infor-list"><span v-if="data.ry_time">{{data.ry_time.value}}</span> </div>
+            <div class="cont-textbold">入院时间: </div>
+            <div class="admrec-cont-infor-list"><span v-if="data.ry_time">{{ data.ry_time.value}}</span> </div>
           </div>
           <div class="admrec-cont-infor">
             <div class="admrec-cont-infor-list admrec-cont-infor-text cont-textbold">民族:</div>
             <div class="admrec-cont-infor-list"> <span v-if="data.nation">{{data.nation.value}}</span> </div>
-            <div class="cont-textbold">记录时间:</div>
-            <div class="admrec-cont-infor-list"> <span v-if="data.record_time">{{data.record_time.value}}</span> </div>
+            <div class="cont-textbold">记录时间: </div>
+            <div class="admrec-cont-infor-list"> <span v-if="data.record_time">{{ data.record_time.value}}</span> </div>
           </div>
           <div class="admrec-cont-infor">
             <div class="admrec-cont-infor-list admrec-cont-infor-text cont-textbold">婚姻:</div>
@@ -105,7 +106,23 @@
             初步诊断：
           </div>
           <div class="admrec-cont-prel-text"   v-for="(item,index) in data.diagnose_list" :key="index">{{item}}</div>
-          <div class="admrec-cont-physing cont-textbold">医师签名:</div>
+          <div class="admrec-cont-physing"><span class="cont-textbold">医师签名:</span>{{data.doctor_name}}</div>
+          <div class="admrec-bottom-time">
+              <div class="admrec-bottom-time-list">
+                <span class="cont-textbold">创建时间:</span>
+                <span v-if="data.CJSJ">{{data.CJSJ}}</span>
+              </div>
+              <div class="admrec-bottom-time-list">
+                <span  class="cont-textbold">修改时间:</span>
+                <span v-if="data.ZXSJ">{{data.ZXSJ}}</span>
+              </div>
+          </div>
+          <div class="admrec-bottom-time">   
+              <div class="admrec-bottom-time-list">
+                <span  class="cont-textbold">完成时间:</span>
+                <span v-if="data.WCSJ">{{data.WCSJ}}</span>
+              </div>
+          </div>
         </div>
     </div>
 </template>
@@ -218,6 +235,18 @@ export default {
           width: 25%;
         }
 
+      }
+      .admrec-cont-header-top{
+
+        width: 100%;
+        display: flex;
+        justify-content: flex-start;
+        align-items: center;
+        margin-top: 20px;
+        .admrec-cont-header-list{
+          width: 25%;
+        }
+
       }
       .admrec-cont-infor{
         width: 100%;
@@ -226,6 +255,7 @@ export default {
         align-items: center;
         .admrec-cont-infor-list{
           width: 25%;
+          padding-left: 5px;
         }
         .admrec-cont-infor-text{
           text-align: right;
@@ -296,7 +326,17 @@ export default {
       }
     }
   }
+  .admrec-bottom-time{
+      width: 100%;
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      margin-bottom: 20px;
+      .admrec-bottom-time-list{
+        width: 50%;
+      }
 
+  }
 
 
 

src/views/allcase/report/caseImageText.vue

@@ -3,6 +3,7 @@
     <div  id="caseImageTextA">
         <div class="caseit-cont" v-for="(dataObj,index) in dataObjArr" :key="index">
           <div class="cont-title-description">入滨州医学院烟台附属医院病历图文报告</div>
+          <div class="examType">{{dataObj.ExamType}}</div>
           <div class="caseit-cont-header">
               <div>
                 <span  class="cont-textbold">病理:</span>
@@ -241,6 +242,11 @@ export default {
 
 
 
-
+ .examType{
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 50px;
+  }
 
 </style>

src/views/allcase/report/checkout.vue

@@ -3,6 +3,7 @@
     <div  id="checkoutA">
         <div class="checkout-cont" v-for="(dataObj,index) in dataObjArr" :key="index">
           <div class="cont-title-description">滨州医学院烟台附属医院检验报告单</div>
+          <div class="examType">{{dataObj.ExamType}}</div>
           <div class="checkout-cont-header">
               <div>
                 <span  class="cont-textbold">住院</span>
@@ -302,5 +303,10 @@ export default {
       }
     }
   }
-
+ .examType{
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 50px;
+  }
 </style>

src/views/allcase/report/electrocar.vue

@@ -3,6 +3,7 @@
     <div  id="electrocarA">
         <div class="elect-cont" v-for="(dataObj,index) in dataObjArr" :key="index">
           <div class="cont-title-description">滨州医学院烟台附属医院心电图诊断报告</div>
+          <div class="examType">{{dataObj.ExamType}}</div>
           <div class="elect-cont-header">
               <!-- <div>
                 <span  class="cont-textbold">病理:</span>
@@ -267,7 +268,12 @@ export default {
       }
     }
   }
-
+ .examType{
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 50px;
+  }
 
 
 

src/views/allcase/report/imaging.vue

@@ -3,6 +3,7 @@
     <div  id="imagingA" >
         <div class="uimag-cont" v-for="(dataObj,index) in dataObjArr" :key="index">
           <div class="cont-title-description">滨州医学院烟台附属医院影像诊断报告</div>
+          <div class="examType">{{dataObj.ExamType}}</div>
           <div class="uimag-cont-header">
               <!-- <div>
                 <span  class="cont-textbold">病理:</span>
@@ -268,7 +269,12 @@ export default {
       }
     }
   }
-
+  .examType{
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 50px;
+  }
 
 
 

src/views/allcase/report/ultrasound.vue

@@ -3,6 +3,7 @@
     <div  id="ultrasTextA">
         <div class="ultras-cont" v-for="(dataObj,index) in dataObjArr" :key="index">
           <div class="cont-title-description">滨州医学院烟台附属医院超声诊断报告</div>
+          <div class="examType">{{dataObj.ExamType}}</div>
           <div class="ultras-cont-header">
               <!-- <div>
                 <span  class="cont-textbold">病理:</span>
@@ -255,7 +256,12 @@ export default {
       }
     }
   }
-
+ .examType{
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 50px;
+  }