Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -462,7 +462,10 @@
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block" style="flex: 1">
-                        透析方式：
+                        <span v-if="org_id == 10138 || org_id == 9675"
+                          >治疗模式：</span
+                        >
+                        <span v-else>透析方式：</span>
                         <div
                           class="under_line"
                           style="
@@ -1202,8 +1205,22 @@
                             透析液温度(°C)
                           </td>
                           <td width="60" v-if="org_id == 9836">体温(°C)</td>
-                        <td width="50" v-if="org_id != 10121 && org_id != 9675&& org_id != 0">电导度<br />(ms/cm)</td>
-                        <td width="50" v-if="org_id == 10121|| org_id == 9675|| org_id == 0">SpO₂<br />(%)</td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id != 10121 && org_id != 9675 && org_id != 0
+                            "
+                          >
+                            电导度<br />(ms/cm)
+                          </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 10121 || org_id == 9675 || org_id == 0
+                            "
+                          >
+                            SpO₂<br />(%)
+                          </td>
                           <td width="50">超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1215,8 +1232,20 @@
                           >
                             置换量<br />(ml)
                           </td>
-                          <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675">KT/V</td>
-                          <td width="50" v-if="org_id == 9538|| org_id == 9675">血容量<br />(L)</td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          >
+                            KT/V
+                          </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9538 || org_id == 9675"
+                          >
+                            血容量<br />(L)
+                          </td>
                           <td width="200">病情变化及处理</td>
                         </tr>
                         <tr
@@ -1288,38 +1317,48 @@
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id != 10121 && org_id != 9675&& org_id != 0">
+                          <td
+                            v-if="
+                              org_id != 10121 && org_id != 9675 && org_id != 0
+                            "
+                          >
                             {{
                               monitor_record.conductivity
                                 ? monitor_record.conductivity
                                 : ""
                             }}
                           </td>
-                          <td v-if="org_id == 10121|| org_id == 9675|| org_id == 0">
-                          {{
-                            monitor_record.blood_oxygen_saturation
-                              ? monitor_record.blood_oxygen_saturation
-                              : ""
-                          }}
-                        </td>
-                        <td
-                          v-if="
-                            org_id != 9538 &&
-                            org_id != 10121 &&
-                            org_id != 9675 &&
-                            org_id != 0
-                          "
-                        >
-                          {{ monitor.conductivity ? monitor.conductivity : "" }}
-                        </td>
+                          <td
+                            v-if="
+                              org_id == 10121 || org_id == 9675 || org_id == 0
+                            "
+                          >
+                            {{
+                              monitor_record.blood_oxygen_saturation
+                                ? monitor_record.blood_oxygen_saturation
+                                : ""
+                            }}
+                          </td>
+                          <td
+                            v-if="
+                              org_id != 9538 &&
+                              org_id != 10121 &&
+                              org_id != 9675 &&
+                              org_id != 0
+                            "
+                          >
+                            {{
+                              monitor_record.conductivity ? monitor_record.conductivity : ""
+                            }}
+                          </td>
 
-                        <td v-if="org_id == 9538">
-                          {{
-                            monitor.sodium_concentration
-                              ? monitor.sodium_concentration
-                              : ""
-                          }}
-                        </td>
+                          <td v-if="org_id == 9538">
+                            {{
+                              monitor_record.sodium_concentration
+                                ? monitor_record.sodium_concentration
+                                : ""
+                            }}
+                          </td>
 
                           <td>
                             <span v-if="monitor_record.operate_time">{{
@@ -1342,12 +1381,20 @@
                                 : ""
                             }}
                           </td>
-                          <td width="50" v-if="org_id == 9919 || org_id == 9538|| org_id == 9675">
-                          {{ monitor_record.ktv }}
-                        </td>
-                        <td width="50" v-if="org_id == 9538|| org_id == 9675">
-                          {{ monitor_record.accumulated_blood_volume }}
-                        </td>
+                          <td
+                            width="50"
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          >
+                            {{ monitor_record.ktv }}
+                          </td>
+                          <td
+                            width="50"
+                            v-if="org_id == 9538 || org_id == 9675"
+                          >
+                            {{ monitor_record.accumulated_blood_volume }}
+                          </td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -1407,8 +1454,12 @@
                           <td></td>
                           <td></td>
                           <td></td>
-                          <td v-if="org_id == 9919||org_id == 9538|| org_id == 9675"></td>
-                          <td v-if="org_id == 9538|| org_id == 9675"></td>
+                          <td
+                            v-if="
+                              org_id == 9919 || org_id == 9538 || org_id == 9675
+                            "
+                          ></td>
+                          <td v-if="org_id == 9538 || org_id == 9675"></td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
                               style="
@@ -2622,7 +2673,6 @@ export default {
     };
   },
   created() {
-    
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -2642,15 +2692,15 @@ export default {
     this.modeOptions = this.$store.getters.treatment_mode;
     //   this.replacementWays = this.$store.getters.replacement_ways;
     //   this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
-    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+    this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
     // for(let i = 0 ; i < this.records.length ; i++){
     //   console.log(i,'jhk')
     //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
     //   i.assessment_before_dislysis.blood_access_part_opera_id
     // );
     // }
-    console.log(this.bloodAccessParOpera,'this.bloodAccessParOpera')
-    
+    console.log(this.bloodAccessParOpera, "this.bloodAccessParOpera");
+
     for (var key in bloodAccessParOpera) {
       this.bloodAccessParOpera[bloodAccessParOpera[key].id] =
         bloodAccessParOpera[key];
@@ -2677,7 +2727,6 @@ export default {
     //     this.$message.error("参数不齐");
     //     return false;
     //   }
-    
   },
   mounted() {
     this.loading = true;
@@ -2690,7 +2739,6 @@ export default {
       .then((rs) => {
         var resp = rs.data;
         if (resp.state == 1) {
-
           this.records = this.records.concat(resp.data.schedules);
 
           for (const recordIndex in this.records) {
@@ -2812,7 +2860,7 @@ export default {
           //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
           //   o.assessment_before_dislysis.blood_access_part_opera_id)
           // })
-          
+
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;
@@ -2911,7 +2959,7 @@ export default {
       return "";
     },
     bloodAccessParOperaName(id) {
-      console.log(tihs.records,'hhh')
+      console.log(tihs.records, "hhh");
       if (id in this.bloodAccessParOpera) {
         return this.bloodAccessParOpera[id].name;
       }

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -730,6 +730,20 @@
           >打印</el-button
         >
       </template>
+      <template
+        v-if="
+          org_template_info.template_id == 58
+        "
+      >
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
       
     </div>
     <div class="app-container" style="min-height: 0">
@@ -1146,6 +1160,10 @@
             v-bind:childResponse="childResponse"
             v-if="org_template_info.template_id == 57">
           </DialysisPrintOrderFiftySeven>
+          <DialysisPrintOrderFiftyEight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 58">
+          </DialysisPrintOrderFiftyEight>
           
         </div>
       </el-container>
@@ -1219,12 +1237,14 @@ import DialysisPrintOrderFiftyOne from "./template/DialysisPrintOrderFiftyOne";
 import DialysisPrintOrderFiftyTwo from "./template/DialysisPrintOrderFiftyTwo";
 import DialysisPrintOrderFiftyThree from "./template/DialysisPrintOrderFiftyThree";
 import DialysisPrintOrderFiftyFour from "./template/DialysisPrintOrderFiftyFour";
-import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive"
-import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix"
-import DialysisPrintOrderFiftySeven from "./template/DialysisPrintOrderFiftySeven"
+import DialysisPrintOrderFiftyfive from "./template/DialysisPrintOrderFiftyfive";
+import DialysisPrintOrderFiftySix from "./template/DialysisPrintOrderFiftySix";
+import DialysisPrintOrderFiftySeven from "./template/DialysisPrintOrderFiftySeven";
+import DialysisPrintOrderFiftyEight from "./template/DialysisPrintOrderFiftyEight";
 export default {
   name: "dialysisPrintOrder",
   components: {
+    DialysisPrintOrderFiftyEight,
     DialysisPrintOrderFiftySeven,
     DialysisPrintOrderFiftySix,
     DialysisPrintOrderFiftyfive,
@@ -1518,7 +1538,8 @@ export default {
         this.org_template_info.template_id == 11 ||
         this.org_template_info.template_id == 49 ||
         this.org_template_info.template_id == 50 ||
-        this.org_template_info.template_id == 51
+        this.org_template_info.template_id == 51 ||
+        this.org_template_info.template_id == 58
       ) {
         printJS({
           printable: "dialysis-print-box-1",

src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue

@@ -595,7 +595,7 @@
               {{
                 monitor.blood_oxygen_saturation
                   ? monitor.blood_oxygen_saturation
-                  : "0"
+                  : ""
               }}
             </span>
           </td>
@@ -746,7 +746,7 @@
 
           <tr v-for="(advice, advice_index) in advices" :key="advice_index">
             <td>{{ getTime(advice.start_time, "{h}:{i}") }}</td>
-            <td>
+            <td style="text-align:left;">
               <span v-if="advice.parent_id > 0">---></span>
               <span>{{ advice.advice_name }}</span>
               <span v-if="advice && advice.advice_desc"

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -292,14 +292,14 @@
               <p style="height:20px;line-height:20px">血流量</p>
               <p style="height:20px;line-height:20px">ml/min</p>
             </th>
-            <!-- <th style="min-width:60px">
+            <th style="min-width:60px" v-if="org_id!=9990||org_id!=9675">
               <p style="height:20px;line-height:20px">超滤量</p>
               <p style="height:20px;line-height:20px">L</p>
             </th>
-            <th style="min-width:60px">
+            <th style="min-width:60px" v-if="org_id!=9990||org_id!=9675">
               <p style="height:20px;line-height:20px">置换量</p>
               <p style="height:20px;line-height:20px">L</p>
-            </th> -->
+            </th>
             <th style="min-width:60px">
               <p style="height:20px;line-height:20px">静脉压</p>
               <p style="height:20px;line-height:20px">(mmHg)</p>
@@ -343,16 +343,16 @@
                 {{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "0" }}
               </span>
             </td>
-            <!-- <td>
+            <td v-if="org_id!=9990||org_id!=9675">
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}
               </span>
             </td>
-            <td>
+            <td v-if="org_id!=9990||org_id!=9675">
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.displacement_quantity ? monitor.displacement_quantity : "0" }}
               </span>
-            </td> -->
+            </td>
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
                 {{ monitor.venous_pressure ? monitor.venous_pressure : "0" }}
@@ -684,7 +684,8 @@ export default {
         finish_nurse: "",
         url: ""
       },
-      displaceLiquiPartOptions: []
+      displaceLiquiPartOptions: [],
+      org_id: 0,
     };
   },
   methods: {
@@ -1501,7 +1502,7 @@ export default {
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
     this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
-
+    this.org_id = this.$store.getters.xt_user.org.id;
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -59,7 +59,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121">{{
+              <span v-if="org_id == 10121||org_id == 10138">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -1672,14 +1672,26 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
-              </div>
+              <span v-if="org_id == 10121||org_id == 10138">{{
+                patientInfo.DialysisSchedule.device_zone.name
+                  ? patientInfo.DialysisSchedule.device_zone.name
+                  : ""
+              }}</span>
+              <span v-else>{{ "/" }}</span>
+            </div>
             </div>
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-                {{ "/" }}
-              </div>
+              <span v-if="org_id == 10121">{{
+                dialysisOrder &&
+                dialysisOrder.DeviceNumber &&
+                dialysisOrder.DeviceNumber.number.length > 0
+                  ? dialysisOrder.DeviceNumber.number
+                  : patientInfo.DialysisSchedule.device_number.number
+              }}</span>
+              <span v-else>{{ "/" }}</span>
+            </div>
             </div>
             <div class="inline_block">
               透析号：
@@ -1688,23 +1700,23 @@
               </div>
             </div>
             <div class="inline_block" style="margin-left: 5px">
-              住院号/门诊号：
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-if="receiverTreatmentAccess.admission_number"
-              >
-                {{ receiverTreatmentAccess.admission_number }}
-              </div>
-              <div
-                class="under_line"
-                style="width: 70px; text-align: left"
-                v-else
-              >
-                {{ "/" }}
-              </div>
+            住院号/门诊号：
+            <div
+              class="under_line"
+              style="width: 70px; text-align: left"
+              v-if="receiverTreatmentAccess.admission_number"
+            >
+              {{ receiverTreatmentAccess.admission_number }}
+            </div>
+            <div
+              class="under_line"
+              style="width: 70px; text-align: left"
+              v-else
+            >
+              {{ "/" }}
             </div>
           </div>
+          </div>
           <div class="row" style="margin-bottom: 10px">
             <div class="inline_block">
               入科方式：
@@ -2427,7 +2439,8 @@
                       </div>
                     </div>
                     <div class="inline_block" style="flex: 1">
-                      核对人员：
+                      <span v-if="org_id==10387||org_id==9675" >核对护士：</span> 
+                      <span v-else >核对人员：</span> 
                       <div
                         class="under_line"
                         style="width: 80px; text-align: center"

src/xt_pages/user/components/PatientDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container ">
+  <div class="app-container">
     <el-dialog
       title="查看传染病检查结果"
       :visible.sync="dialogFormVisible"
@@ -21,7 +21,7 @@
                 <el-input
                   placeholder="请填入"
                   v-model="item.value"
-                  style="width:95%"
+                  style="width: 95%"
                   type="number"
                   disabled
                 >
@@ -37,7 +37,7 @@
                 <el-select
                   v-model="item.value"
                   placeholder="请选择"
-                  style="width:95%"
+                  style="width: 95%"
                   disabled
                 >
                   <el-option
@@ -67,12 +67,12 @@
       class="clearfix"
       id="patient-info"
     >
-      <div style="float:right;z-index:8;position: absolute;right: 16px;">
+      <div style="float: right; z-index: 8; position: absolute; right: 16px">
         <el-button
           size="small"
           type="primary"
           @click="printCard()"
-          style="margin:0 6px 6px 0;z-index:1;"
+          style="margin: 0 6px 6px 0; z-index: 1"
           >打印签到卡</el-button
         >
         <el-button
@@ -80,14 +80,14 @@
           :disabled="$store.getters.xt_user.subscibe.state == 3 ? true : false"
           type="primary"
           @click="$router.push('/patients/patient/' + patientID + '/edit')"
-          style="margin:0 0 6px 0;z-index:1;"
+          style="margin: 0 0 6px 0; z-index: 1"
           >修改</el-button
         >
         <el-button
           size="small"
           type="primary"
           @click="printThisInfo()"
-          style="margin:0 6px 6px 0;z-index:1;"
+          style="margin: 0 6px 6px 0; z-index: 1"
           >打印</el-button
         >
       </div>
@@ -100,7 +100,7 @@
                 <el-input v-model="form.name" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item label="性别 : " class="is-required" prop="gender">
                 <el-radio-group v-model="form.gender">
                   <el-radio
@@ -124,7 +124,7 @@
                 <el-input v-model="form.idCardNo" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item label="年龄 : " class="is-required" prop="age">
                 <el-input v-model="form.age" disabled></el-input>
               </el-form-item>
@@ -136,7 +136,7 @@
                   disabled
                   v-model="form.dialysisNo"
                   placeholder="填写或自动生成"
-                  style="width:110px;float:left;margin-right: 1%;"
+                  style="width: 110px; float: left; margin-right: 1%"
                 ></el-input>
                 <el-button disabled type="primary">自动生成</el-button>
               </el-form-item>
@@ -205,7 +205,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="患者来源 : "
                 class="is-required"
@@ -223,7 +223,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="8" style="height:59px;">
+            <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="治疗状态(转归) : "
                 class="is-required"
@@ -244,7 +244,7 @@
 
             <el-col :span="24">
               <el-form-item label="传染病 : " required prop="is_infectious">
-                <el-radio-group v-model="form.is_infectious" disabled >
+                <el-radio-group v-model="form.is_infectious" disabled>
                   <el-radio :label="1">阴性</el-radio>
                   <el-radio :label="2">阳性</el-radio>
                 </el-radio-group>
@@ -266,7 +266,6 @@
               </el-form-item>
 
               <el-form-item label="疑难内瘘:">
-
                 <el-radio-group v-model="form.troble_shoot" disabled>
                   <el-radio :label="1">是</el-radio>
                   <el-radio :label="2">否</el-radio>m
@@ -274,9 +273,7 @@
               </el-form-item>
 
               <el-form-item label="人员编码: ">
-                <el-input
-                    v-model="form.zb_patient_id"
-                ></el-input>
+                <el-input v-model="form.zb_patient_id"></el-input>
               </el-form-item>
             </el-col>
 
@@ -307,7 +304,7 @@
                   :suffix-icon="'el-icon-menu'"
                   format="yyyy-MM-dd"
                   disabled
-                  style="width: 200px;"
+                  style="width: 200px"
                   value-format="yyyy-MM-dd"
                 ></el-date-picker>
                 <el-button type="primary" @click="showInspectDialog()"
@@ -347,17 +344,17 @@
             </el-col>
 
             <el-col :span="24">
-                <el-form-item label="诊疗计划 : " prop="diagnose">
-                  <el-input
-                    type="textarea"
-                    :rows="3"
-                    v-model="form.treatment_plan"
-                    resize="none"
-                    placeholder
-                    readonly
-                  ></el-input>
-                </el-form-item>
-             </el-col>
+              <el-form-item label="诊疗计划 : " prop="diagnose">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.treatment_plan"
+                  resize="none"
+                  placeholder
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
 
             <el-col :span="8">
               <el-form-item label="民族 : " prop="nation">
@@ -561,91 +558,97 @@
       </el-row>
 
       <div class="dataTitle">治疗信息</div>
+      <div style="display: flex">
+        <div style="flex: 1 1 9%;">
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="主诉 : " prop="patient_complains">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.patient_complains"
+                  resize="none"
+                  placeholder=""
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="既往史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.past_history"
+                  resize="none"
+                  placeholder=""
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="体格检查">
+                <el-input
+                  v-model="form.temperature"
+                  style="width: 200px"
+                  disabled
+                >
+                  <template slot="prepend">体温:</template>
+                  <template slot="append">℃</template>
+                </el-input>
+                <el-input v-model="form.pulse" style="width: 220px" disabled>
+                  <template slot="prepend">脉搏: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+                <el-input
+                  v-model="form.respiratory"
+                  style="width: 220px"
+                  disabled
+                >
+                  <template slot="prepend">呼吸: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col>
+              <el-form-item>
+                <el-input v-model="form.sbp" style="width: 240px" disabled>
+                  <template slot="prepend">收缩压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+                <el-input v-model="form.dbp" style="width: 240px" disabled>
+                  <template slot="prepend">舒张压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div style="flex: 1;" class="now_his">
+          <el-row :gutter="24" style="height:100%;">
+            <el-col :span="24" style="height:100%;">
+              <el-form-item label="现病史 : " prop="present_history" style="height:100%;">
+                <el-input
+                  style="height:100%;"
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.present_history"
+                  resize="none"
+                  placeholder=""
+                  readonly
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
       <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="主诉 : " prop="patient_complains">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="form.patient_complains"
-              resize="none"
-              placeholder=""
-              readonly
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="现病史 : " prop="present_history">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="form.present_history"
-              resize="none"
-              placeholder=""
-              readonly
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="既往史 : " prop="past_history">
-            <el-input
-              type="textarea"
-              :rows="3"
-              v-model="form.past_history"
-              resize="none"
-              placeholder=""
-              readonly
-            ></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item label="体格检查">
-            <el-input v-model="form.temperature" style="width: 200px;" disabled>
-              <template slot="prepend"
-                >体温:</template
-              >
-              <template slot="append"
-                >℃</template
-              >
-            </el-input>
-            <el-input v-model="form.pulse" style="width: 220px;" disabled>
-              <template slot="prepend"
-                >脉搏:
-              </template>
-              <template slot="append"
-                >次/分</template
-              >
-            </el-input>
-            <el-input v-model="form.respiratory" style="width: 220px;" disabled>
-              <template slot="prepend"
-                >呼吸:
-              </template>
-              <template slot="append"
-                >次/分</template
-              >
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col>
-          <el-form-item>
-            <el-input v-model="form.sbp" style="width: 240px;" disabled>
-              <template slot="prepend"
-                >收缩压:</template
-              >
-              <template slot="append"
-                >mmHg</template
-              >
-            </el-input>
-            <el-input v-model="form.dbp" style="width: 240px;" disabled>
-              <template slot="prepend"
-                >舒张压:</template
-              >
-              <template slot="append"
-                >mmHg</template
-              >
-            </el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="24">
           <el-form-item label="" prop="remark">
             <!-- <textarea v-model="form.remark" class="textarea" disabled></textarea> -->
@@ -800,7 +803,8 @@
         </el-form-item>
       </el-col>
     </el-form>
-    <div style="display:none;">
+
+    <div style="display: none">
       <div id="print-info-box">
         <div class="print_main_content">
           <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
@@ -916,7 +920,7 @@
                     ></div>
                   </td>
                 </tr>
-                
+
                 <tr>
                   <td>
                     <div class="td_proj_title">既<br />往<br />史</div>
@@ -938,7 +942,7 @@
                     </div>
                   </td>
                 </tr>
-              
+
                 <tr>
                   <td colspan="8"><div class="td_proj_title">体格检查</div></td>
                 </tr>
@@ -967,7 +971,7 @@
                     ></div>
                   </td>
                 </tr>
-             
+
                 <tr>
                   <td>
                     <div class="td_proj_title">诊<br />断</div>
@@ -996,8 +1000,10 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                <span v-if="org_id ==3907 || org_id == 9671">{{ getTime(patientPrint.created_time) }}</span>
-                <span v-else>{{printDate}}</span>
+                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 10138|| org_id == 9675">{{
+                  getTime(patientPrint.created_time)
+                }}</span>
+                <span v-else>{{ printDate }}</span>
               </div>
               <div class="proj"><span class="proj_title">医生签名：</span></div>
             </div>
@@ -1010,7 +1016,7 @@
         <div
           class="order_title"
           align="center"
-          style="margin-bottom:20px;font-size:35px"
+          style="margin-bottom: 20px; font-size: 35px"
           v-if="org_id != 10223"
         >
           签到卡
@@ -1018,14 +1024,16 @@
         <div
           class="order_title"
           align="center"
-          style="margin-bottom:20px;font-size:25px"
+          style="margin-bottom: 20px; font-size: 25px"
           v-if="org_id == 10223"
-        >三优血液透析中心</div>
-        <div align="center" style="margin-bottom:4px;font-size:25px">
+        >
+          三优血液透析中心
+        </div>
+        <div align="center" style="margin-bottom: 4px; font-size: 25px">
           姓名:<span>&nbsp;&nbsp;{{ patientPrint.name }}</span
           ><br />
         </div>
-        <div align="center" style="margin-bottom:20px;font-size:25px">
+        <div align="center" style="margin-bottom: 20px; font-size: 25px">
           透析号:<span>&nbsp;&nbsp;{{ patientPrint.dialysis_no }}</span>
         </div>
         <div>
@@ -1045,13 +1053,13 @@ import {
   jsGetAge,
   isPositiveInteger,
   dialysisAge,
-  uParseTime
+  uParseTime,
 } from "@/utils/tools";
 import {
   generateDialysisNo,
   createPatient,
   editPatient,
-  fetchPatient
+  fetchPatient,
 } from "@/api/patient";
 import { fetchAllDoctorAndNurse, fetchAllAdminUsers } from "@/api/doctor";
 import { getZones } from "@/api/device/device";
@@ -1120,11 +1128,11 @@ const defaultForm = {
   dialysis_age: "",
   expense_kind: "",
   contact_name: "",
-  sch_remark:"",
-  org_id:0,
-  troble_shoot:"",
-  zb_patient_id:"",
-  treatment_plan:"",
+  sch_remark: "",
+  org_id: 0,
+  troble_shoot: "",
+  zb_patient_id: "",
+  treatment_plan: "",
 };
 
 export default {
@@ -1140,7 +1148,7 @@ export default {
         { id: 4, name: "公费医疗" },
         { id: 5, name: "商业保险" },
         { id: 6, name: "军队医疗" },
-        { id: 7, name: "其他" }
+        { id: 7, name: "其他" },
       ],
 
       generic_info_fold: true,
@@ -1157,20 +1165,26 @@ export default {
       dialogVisible: false,
       typeOptions: null,
       styleOptions: null,
-      sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }],
+      sourceOptions: [
+        { value: 1, label: "门诊" },
+        { value: 2, label: "住院" },
+      ],
       lapsetoOptions: [
         { value: 1, label: "留治" },
-        { value: 2, label: "转出" }
+        { value: 2, label: "转出" },
       ],
       partitionOptions: [],
-      sexOptions: [{ value: 1, label: "男" }, { value: 2, label: "女" }],
+      sexOptions: [
+        { value: 1, label: "男" },
+        { value: 2, label: "女" },
+      ],
       isHospitalFirstDialysisOptions: [
         { value: 1, label: "是" },
-        { value: 2, label: "否" }
+        { value: 2, label: "否" },
       ],
       predialysisConditionOptions: [
         { value: 1, label: "腹膜透析" },
-        { value: 2, label: "肾移植" }
+        { value: 2, label: "肾移植" },
       ],
       maritalOptions: null,
       wayOptions: null,
@@ -1188,48 +1202,48 @@ export default {
       patientID: 0,
       patientPrint: {},
       print_time: "",
-      printDate:"",
+      printDate: "",
       rules: {
         contagions: [{ type: "array", required: false, trigger: "change" }],
         avatar: [{ required: true, message: "请上传头像", trigger: "blur" }],
         patientType: [
-          { required: true, message: "请选择患者类型", trigger: "blur" }
+          { required: true, message: "请选择患者类型", trigger: "blur" },
         ],
         dialysisNo: [
-          { required: true, message: "请填写透析号", trigger: "blur" }
+          { required: true, message: "请填写透析号", trigger: "blur" },
         ],
         admissionNumber: [
-          { required: true, message: "请填写住院(门诊)号", trigger: "blur" }
+          { required: true, message: "请填写住院(门诊)号", trigger: "blur" },
         ],
         source: [
-          { required: true, message: "请选择患者来源", trigger: "blur" }
+          { required: true, message: "请选择患者来源", trigger: "blur" },
         ],
         lapseto: [
-          { required: true, message: "请选择治疗状态", trigger: "blur" }
+          { required: true, message: "请选择治疗状态", trigger: "blur" },
         ],
         name: [{ required: true, message: "请填写姓名", trigger: "blur" }],
         gender: [{ required: true, message: "请选择性别", trigger: "blur" }],
         idCardNo: [
-          { required: true, message: "请填写身份证号", trigger: "blur" }
+          { required: true, message: "请填写身份证号", trigger: "blur" },
         ],
-        birth: [{ required: true, message: "请填写生日", trigger: "blur" }]
+        birth: [{ required: true, message: "请填写生日", trigger: "blur" }],
       },
-      shootList:[
-       {id:1,name:"是"},
-       {id:2,name:"否"}
-      ]
+      shootList: [
+        { id: 1, name: "是" },
+        { id: 2, name: "否" },
+      ],
     };
   },
   computed: {
-    generic_fold_icon: function() {
+    generic_fold_icon: function () {
       return this.generic_info_fold ? "el-icon-arrow-down" : "el-icon-arrow-up";
     },
-    treat_fold_icon: function() {
+    treat_fold_icon: function () {
       return this.treat_info_fold ? "el-icon-arrow-down" : "el-icon-arrow-up";
-    }
+    },
   },
   created() {
-    this.org_id = this.$store.getters.xt_user.org.id
+    this.org_id = this.$store.getters.xt_user.org.id;
     this.styleOptions = this.$store.getters.patient_types;
     // this.partitionOptions = this.$store.getters.partitions;
     this.maritalOptions = getDataConfig("patient", "marital_options");
@@ -1254,7 +1268,7 @@ export default {
       console.log("patient detail not had id");
       this.$notify.error({
         title: "错误",
-        message: "无效的id"
+        message: "无效的id",
       });
       this.$router.push("/patients/patients");
     }
@@ -1264,7 +1278,8 @@ export default {
     // this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}');
 
     var data = new Date();
-    var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+    var month =
+      data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
     var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
     this.printDate = data.getFullYear() + "-" + month + "-" + date;
   },
@@ -1277,19 +1292,19 @@ export default {
       this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
 
       const style =
-        "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px;border:none; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
+        "@page {margin-top:10px;}@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0; } .print_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .print_main_content table { width: 100%; border-collapse: collapse; padding: 2px; }  .print_main_content table tbody tr{page-break-inside:avoid;} .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px; } .td_proj_title { font-size: 18px; line-height: 25px; font-weight: 500; } .td_proj_content { font-size: 18px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 17px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj .proj_title { font-weight: 500;} }";
 
       setTimeout(() => {
         printJS({
           printable: "print-info-box",
           type: "html",
           style: style,
-          scanStyles: false
+          scanStyles: false,
         });
       }, 1);
     },
     getZones() {
-      getZones().then(response => {
+      getZones().then((response) => {
         if (response.data.state === 1) {
           this.partitionOptions = response.data.data.zones;
         }
@@ -1297,12 +1312,12 @@ export default {
     },
     fetchPatient(id) {
       fetchPatient(id)
-        .then(response => {
+        .then((response) => {
           console.log(response.data.data);
           if (response.data.state === 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
-            console.log("触发了吗无222222",patietInfo)
+            console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;
             this.form.alias = patietInfo.alias;
@@ -1311,17 +1326,16 @@ export default {
             this.form.dialysisNo = patietInfo.dialysis_no;
             this.form.gender = patietInfo.gender;
             this.form.is_infectious = patietInfo.is_infectious;
-            this.form.troble_shoot = patietInfo.troble_shoot
-            this.form.zb_patient_id = patietInfo.zb_patient_id
+            this.form.troble_shoot = patietInfo.troble_shoot;
+            this.form.zb_patient_id = patietInfo.zb_patient_id;
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;
-            this.form.treatment_plan = patietInfo.treatment_plan
-            if(patietInfo.is_infectious == 1){
-               this.form.remind_cycle = 0
-
+            this.form.treatment_plan = patietInfo.treatment_plan;
+            if (patietInfo.is_infectious == 1) {
+              this.form.remind_cycle = 0;
             }
-            console.log("222222",this.form.remind_cycle)
+            console.log("222222", this.form.remind_cycle);
             this.form.user_sys_before_count = patietInfo.user_sys_before_count;
 
             this.infections = response.data.data.infections;
@@ -1335,9 +1349,8 @@ export default {
                 const select_options = ["阴性", "阳性", "弱阳性"];
                 for (let i = 0; i < this.infections.length; i++) {
                   this.infections[i]["select_options"] = select_options;
-                  this.infections[i]["value"] = this.infections[
-                    i
-                  ].inspect_value;
+                  this.infections[i]["value"] =
+                    this.infections[i].inspect_value;
                 }
               }
             }
@@ -1405,9 +1418,8 @@ export default {
             this.form.first_dialysis_hospital =
               patietInfo.first_dialysis_hospital;
             if (patietInfo.predialysis_condition.length > 0) {
-              this.form.predialysis_condition = patietInfo.predialysis_condition.split(
-                ","
-              );
+              this.form.predialysis_condition =
+                patietInfo.predialysis_condition.split(",");
             }
             this.form.pre_hospital_dialysis_frequency =
               patietInfo.pre_hospital_dialysis_frequency;
@@ -1518,9 +1530,8 @@ export default {
             var partitionLen = this.partitionOptions.length;
             for (let index = 0; index < partitionLen; index++) {
               if (this.partitionOptions[index].id === patietInfo.partition_id) {
-                this.patientPrint.partition_id = this.partitionOptions[
-                  index
-                ].name;
+                this.patientPrint.partition_id =
+                  this.partitionOptions[index].name;
                 break;
               }
             }
@@ -1540,9 +1551,8 @@ export default {
                 this.maritalOptions[index].id ==
                 response.data.data.patient.marital_status
               ) {
-                this.patientPrint.marital_status = this.maritalOptions[
-                  index
-                ].name;
+                this.patientPrint.marital_status =
+                  this.maritalOptions[index].name;
               }
             }
 
@@ -1552,14 +1562,10 @@ export default {
             );
             this.patientPrint.age = jsGetAge(this.patientPrint.birthday, "-");
 
-            this.patientPrint.patient_complains = patietInfo.patient_complains.replace(
-              /\n/g,
-              "<br/>"
-            );
-            this.patientPrint.present_history = patietInfo.present_history.replace(
-              /\n/g,
-              "<br/>"
-            );
+            this.patientPrint.patient_complains =
+              patietInfo.patient_complains.replace(/\n/g, "<br/>");
+            this.patientPrint.present_history =
+              patietInfo.present_history.replace(/\n/g, "<br/>");
             this.patientPrint.past_history = patietInfo.past_history.replace(
               /\n/g,
               "<br/>"
@@ -1586,9 +1592,8 @@ export default {
                 if (
                   this.wayOptions[index].id === patietInfo.reimbursement_way_id
                 ) {
-                  this.patientPrint.reimbursement_way_id = this.wayOptions[
-                    index
-                  ].name;
+                  this.patientPrint.reimbursement_way_id =
+                    this.wayOptions[index].name;
                   break;
                 }
               }
@@ -1639,9 +1644,8 @@ export default {
                 if (
                   this.educationOptions[index].id === patietInfo.education_level
                 ) {
-                  this.patientPrint.education_level = this.educationOptions[
-                    index
-                  ].name;
+                  this.patientPrint.education_level =
+                    this.educationOptions[index].name;
                   break;
                 }
               }
@@ -1654,9 +1658,8 @@ export default {
                 if (
                   this.professionOptions[index].id === patietInfo.profession
                 ) {
-                  this.patientPrint.profession = this.professionOptions[
-                    index
-                  ].name;
+                  this.patientPrint.profession =
+                    this.professionOptions[index].name;
                   break;
                 }
               }
@@ -1690,9 +1693,8 @@ export default {
                   this.inductionOptions[index].id ===
                   patietInfo.induction_period
                 ) {
-                  this.patientPrint.induction_period = this.inductionOptions[
-                    index
-                  ].name;
+                  this.patientPrint.induction_period =
+                    this.inductionOptions[index].name;
                   break;
                 }
               }
@@ -1706,9 +1708,8 @@ export default {
                   this.adminUserOptions[index].id ===
                   patietInfo.attending_doctor_id
                 ) {
-                  this.patientPrint.attending_doctor_id = this.adminUserOptions[
-                    index
-                  ].name;
+                  this.patientPrint.attending_doctor_id =
+                    this.adminUserOptions[index].name;
                   break;
                 }
               }
@@ -1721,9 +1722,8 @@ export default {
                 if (
                   this.adminUserOptions[index].id === patietInfo.head_nurse_id
                 ) {
-                  this.patientPrint.head_nurse_id = this.adminUserOptions[
-                    index
-                  ].name;
+                  this.patientPrint.head_nurse_id =
+                    this.adminUserOptions[index].name;
                   break;
                 }
               }
@@ -1773,9 +1773,8 @@ export default {
                 if (
                   this.adminUserOptions[index].id === patietInfo.registrars_id
                 ) {
-                  this.patientPrint.registrars = this.adminUserOptions[
-                    index
-                  ].name;
+                  this.patientPrint.registrars =
+                    this.adminUserOptions[index].name;
                   this.form.registrars = this.adminUserOptions[index].name;
                   break;
                 }
@@ -1798,7 +1797,7 @@ export default {
             console.log("patient get err state");
             this.$notify.error({
               title: "错误",
-              message: "网络异常"
+              message: "网络异常",
             });
             this.$router.push("/patients/patients");
           }
@@ -1808,17 +1807,17 @@ export default {
           // this.postForm.title += `   Article Id:${this.postForm.id}`
           // this.postForm.content_short += `   Article Id:${this.postForm.id}`
         })
-        .catch(err => {
+        .catch((err) => {
           console.log("patient get err", err);
           this.$notify.error({
             title: "错误",
-            message: "网络异常"
+            message: "网络异常",
           });
           this.$router.push("/patients/patients");
         });
     },
     fetchAllDoctorAndNurse() {
-      fetchAllDoctorAndNurse().then(response => {
+      fetchAllDoctorAndNurse().then((response) => {
         if (response.data.state === 1) {
           this.doctorOptions = response.data.data.doctors;
           this.nurseOptions = response.data.data.nursers;
@@ -1826,7 +1825,7 @@ export default {
       });
     },
     fetchAllAdminUsers() {
-      fetchAllAdminUsers().then(response => {
+      fetchAllAdminUsers().then((response) => {
         if (response.data.state === 1) {
           this.adminUserOptions = response.data.data.users;
         }
@@ -1845,7 +1844,7 @@ export default {
           printable: "print-card-info",
           type: "html",
           style: style,
-          scanStyles: false
+          scanStyles: false,
         });
       }, 1);
 
@@ -1924,7 +1923,7 @@ export default {
           phone +
           "," +
           "healthcare_no:" +
-          healthCareNo
+          healthCareNo,
       });
     },
     checkIdCardNo() {
@@ -1948,7 +1947,7 @@ export default {
         birth.substr(6, 2);
 
       this.form.age = jsGetAge(this.form.birth, "-");
-    }
+    },
 
     // qrcode(params){
     //    new QRCode('qrcode',{
@@ -1957,7 +1956,7 @@ export default {
     //        text:params,
     //    })
     // }
-  }
+  },
 };
 </script>
 
@@ -1992,6 +1991,23 @@ export default {
   }
 }
 
+/deep/ .now_his{
+  .el-row{
+    .el-col-24{
+      .el-form-item{
+        .el-form-item__content{
+          height: 100%;
+          .el-textarea{
+            .el-textarea__inner{
+              height: 93%;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 // #print-info-box .info_print {
 //     width: 920px;
 //     margin: 0 auto !important;

src/xt_pages/user/components/PatientForm.vue

@@ -672,87 +672,94 @@
         </el-row>
 
         <div class="dataTitle">治疗信息</div>
-        <el-row :span="24">
-          <el-col :span="12">
-            <el-form-item label="主诉 : " prop="patient_complains">
-              <el-input
-                type="textarea"
-                :rows="3"
-                v-model="form.patient_complains"
-                resize="none"
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="现病史 : " prop="present_history">
-              <el-input
-                type="textarea"
-                :rows="3"
-                v-model="form.present_history"
-                resize="none"
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="既往史 : " prop="past_history">
-              <el-input
-                type="textarea"
-                :rows="3"
-                v-model="form.past_history"
-                resize="none"
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :span="24">
-          <el-col>
-            <el-form-item label="体格检查">
-              <el-input v-model="form.temperature" style="width: 200px;">
-                <template slot="prepend"
-                  >体温:</template
-                >
-                <template slot="append"
-                  >℃</template
-                >
-              </el-input>
-              <el-input v-model="form.pulse" style="width: 220px;">
-                <template slot="prepend"
-                  >脉搏:</template
-                >
-                <template slot="append"
-                  >次/分</template
-                >
-              </el-input>
-              <el-input v-model="form.respiratory" style="width: 220px;">
-                <template slot="prepend"
-                  >呼吸:</template
-                >
-                <template slot="append"
-                  >次/分</template
-                >
-              </el-input>
-              <!-- </el-form-item>
-              <el-form-item>-->
-              <el-input v-model="form.sbp" style="width: 240px;">
-                <template slot="prepend"
-                  >收缩压:</template
-                >
-                <template slot="append"
-                  >mmHg</template
-                >
-              </el-input>
-              <el-input v-model="form.dbp" style="width: 240px;">
-                <template slot="prepend"
-                  >舒张压:</template
+        <div style="display: flex">
+        <div style="flex: 1 1 9%;">
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="主诉 : " prop="patient_complains">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.patient_complains"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="既往史 : " prop="past_history">
+                <el-input
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.past_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="体格检查">
+                <el-input
+                  v-model="form.temperature"
+                  style="width: 200px"
                 >
-                <template slot="append"
-                  >mmHg</template
+                  <template slot="prepend">体温:</template>
+                  <template slot="append">℃</template>
+                </el-input>
+                <el-input v-model="form.pulse" style="width: 220px" >
+                  <template slot="prepend">脉搏: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+                <el-input
+                  v-model="form.respiratory"
+                  style="width: 220px"
+                  
                 >
-              </el-input>
-            </el-form-item>
+                  <template slot="prepend">呼吸: </template>
+                  <template slot="append">次/分</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col>
+              <el-form-item>
+                <el-input v-model="form.sbp" style="width: 240px" >
+                  <template slot="prepend">收缩压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+                <el-input v-model="form.dbp" style="width: 240px" >
+                  <template slot="prepend">舒张压:</template>
+                  <template slot="append">mmHg</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div style="flex: 1;" class="now_his">
+          <el-row :gutter="24" style="height:100%;">
+            <el-col :span="24" style="height:100%;">
+              <el-form-item label="现病史 : " prop="present_history" style="height:100%;">
+                <el-input
+                  style="height:100%;"
+                  type="textarea"
+                  :rows="3"
+                  v-model="form.present_history"
+                  resize="none"
+                  placeholder=""
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
+      </div>
+        <el-row :span="24">
+          <el-col>
           </el-col>
           <el-col></el-col>
           <el-col :span="24">
@@ -1907,4 +1914,21 @@ export default {
   bottom: 0;
   right: 50px;
 }
+
+/deep/ .now_his{
+  .el-row{
+    .el-col-24{
+      .el-form-item{
+        .el-form-item__content{
+          height: 100%;
+          .el-textarea{
+            .el-textarea__inner{
+              height: 93%;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>