修改打印

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -24,7 +24,7 @@
             </div>
             <div class="inline_block" style="margin-left: 15px;">
               年龄：
-              <div class="under_line" style="width: 50px;">{{jsGetAge(record.patient.birthday)}}</div>
+              <div class="under_line" style="width: 50px;">{{getAge(record.patient)}}</div>
               岁
             </div>
             <div class="inline_block" style="float: right;">
@@ -229,15 +229,6 @@
                       </div>
                     </div>
 
-                    <div class="inline_block">
-                      &emsp;病情：
-                      <check-box text="一般"
-                                 :checked="isCheckBoxChecked(record.receive_assessment, 'sick_condition', 1)"></check-box>
-                      <check-box text="重"
-                                 :checked="isCheckBoxChecked(record.receive_assessment, 'sick_condition', 2)"></check-box>
-                      <check-box text="危"
-                                 :checked="isCheckBoxChecked(record.receive_assessment, 'sick_condition', 3)"></check-box>
-                    </div>
 
                     <div class="inline_block">
                       跌倒风险评估：
@@ -300,15 +291,17 @@
                     </div>
 
                     <div class="inline_block">
-                      <div v-if="record.receive_assessment != null && record.receive_assessment.psychological_assessment == 2" class="under_line"
-                           style="width: 100px;">{{
+                      <div
+                        v-if="record.receive_assessment != null && record.receive_assessment.psychological_assessment == 2"
+                        class="under_line"
+                        style="width: 100px;">{{
                         record.receive_assessment?record.receive_assessment.psychological_assessment_other:''}}
                       </div>
                     </div>
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr style="display:none;">
                 <td width="25px">
                   透<br/>析<br/>处<br/>方
                 </td>
@@ -395,21 +388,24 @@
                     </div>
 
 
-                    <div class="inline_block" v-if="record.prescription != null &&record.prescription.displace_liqui_part == 0">
+                    <div class="inline_block"
+                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 0">
                       &emsp;置换液后/前稀释 总量:
                       <div class="under_line" style="width: 100px;">{{
                         record.prescription?record.prescription.displace_liqui_value:''}}
                       </div>
                       L
                     </div>
-                    <div class="inline_block" v-if="record.prescription != null &&record.prescription.displace_liqui_part == 1">
+                    <div class="inline_block"
+                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 1">
                       &emsp;置换液前稀释 总量:
                       <div class="under_line" style="width: 100px;">{{
                         record.prescription?record.prescription.displace_liqui_value:''}}
                       </div>
                       L
                     </div>
-                    <div class="inline_block" v-if="record.prescription != null &&record.prescription.displace_liqui_part == 2">
+                    <div class="inline_block"
+                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 2">
                       &emsp;置换液后稀释 总量:
                       <div class="under_line" style="width: 100px;">{{
                         record.prescription?record.prescription.displace_liqui_value:''}}
@@ -435,9 +431,6 @@
                   </div>
 
 
-
-
-
                   <div class="row" style="padding: 2px 0;">
                     <div class="inline_block">
                       血管通路:
@@ -493,7 +486,7 @@
                   </div>
                 </td>
               </tr>
-              <tr>
+              <tr style="display:none;">
                 <td colspan="2" style="padding: 0;">
                   <table class="inside_table">
                     <thead>
@@ -664,10 +657,11 @@
                       <td width="60">脉率<br/>次/分</td>
                       <td width="60">呼吸<br/>次/分</td>
                       <td width="60">血流量<br/>ml/min</td>
-                      <td width="60">超滤量<br/>L</td>
+                      <td width="60">超滤量累计<br/>L</td>
                       <td width="60">置换量<br/>L</td>
-                      <td width="60">静脉压<br/>mmHg</td>
-                      <td width="60">跨膜压<br/>mmHg</td>
+                      <td width="60">静脉压/动脉压<br/>mmHg</td>
+                      <td width="60">钠浓度<br/>mmol/L</td>
+
                       <td>病情特殊情况处理<br/>及专科护理措施记录</td>
                       <td>护士签名</td>
 
@@ -684,8 +678,10 @@
                       <td>{{monitor_record.blood_flow_volume?monitor_record.blood_flow_volume:''}}</td>
                       <td>{{monitor_record.ultrafiltration_volume?monitor_record.ultrafiltration_volume:''}}</td>
                       <td>{{monitor_record.displacement_quantity?monitor_record.displacement_quantity:''}}</td>
-                      <td>{{monitor_record.venous_pressure?monitor_record.venous_pressure:''}}</td>
-                      <td>{{monitor_record.transmembrane_pressure?monitor_record.transmembrane_pressure:''}}</td>
+                      <td>
+                        {{monitor_record.venous_pressure?monitor_record.venous_pressure:''}}/{{monitor_record.arterial_pressure?monitor_record.arterial_pressure:''}}
+                      </td>
+                      <td>{{monitor_record.sodium_concentration?monitor_record.sodium_concentration:''}}</td>
                       <td>
                         {{monitor_record.symptom}}
                         &nbsp;{{monitor_record.dispose}}
@@ -693,7 +689,8 @@
                       </td>
                       <td>
                         <span v-if="setAdminUserES(monitor_record, 'monitoring_nurse') == ''">{{getAdminUser(monitor_record, 'monitoring_nurse')}}</span>
-                        <img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset="" v-else
+                        <img class="es-img" :src="setAdminUserES(monitor_record, 'monitoring_nurse')" alt="" srcset=""
+                             v-else
                              style="height: 20px;">
                       </td>
                     </tr>
@@ -804,7 +801,7 @@
                   <div class="row" style="padding: 2px 0;">
                     <div class="inline_block">
                       透析器及血路管凝血情况:
-                      &emsp; 动脉管道:
+                       动脉管道:
                       <check-box text="0"
                                  :checked="isCheckBoxChecked(record.assessment_after_dislysis, 'arterial_tube', 1)"></check-box>
                       <check-box text="+"
@@ -839,6 +836,8 @@
                     </div>
 
                   </div>
+
+
                   <div class="row" style="padding: 2px 0;">
                     患者去向：
                     <check-box text="门诊"
@@ -879,8 +878,8 @@
                     </div>
 
 
-                    <div class="inline_block" >
-                      &emsp;时间：
+                    <div class="inline_block">
+                      &emsp;核对时间：
                       <div class="under_line" style="width: 200px;">
                         {{record.check?getTime(record.check.updated_time,'{y}年{m}月{d}日 {h}时'):''}}
                       </div>
@@ -897,8 +896,14 @@
                     </div>
 
 
-                    <div class="inline_block" style="float: left;">
-                      &emsp;血透室护士签名：
+
+
+                  </div>
+
+                  <div class="row" style="padding: 2px 0;">
+
+                    <div class="inline_block" >
+                      血透室护士签名：
                       <div class="under_line" style="width: 100px;">
                         <span v-if="setAdminUserES(record.dialysis_order, 'start_nurse') == ''">{{getAdminUser(record.dialysis_order, 'start_nurse')}}</span>
                         <img class="es-img" :src="setAdminUserES(record.dialysis_order, 'start_nurse')" alt="" srcset=""
@@ -907,33 +912,440 @@
                     </div>
 
 
+                    <div class="inline_block">
+                      病区护士签名：
+                      <div class="under_line" style="width: 100px;">
+                      </div>
+                    </div>
+
+                    <div class="inline_block">
+                      &emsp;时间：
+                      <div class="under_line" style="width: 200px;">
+                        {{record.dialysis_order?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
+                      </div>
+                    </div>
+                  </div>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+            <div class="row" style="font-size: 10px;margin-bottom: 300px">
+              注：透析器及血路管凝血:0级无凝血;
+              “+”(指Ⅰ级:束状纤维凝血或动/静脉壶/滤网见轻微凝血);“++”(指II级:近半数纤维凝血或动/静脉壶/滤网出现凝血块);“+++”(指III级:压力异常升高，须中途更换透析器/血路管A/V)。
+            </div>
+
+            <div class="order-yy-name">{{orgname}}</div>
+            <div class="order_title">
+              血液净化科医嘱及执行单
+            </div>
+
+            <div class="row" style="margin-top: 15px;">
+              <div class="inline_block">
+                姓名：
+                <div class="under_line" style="width: 120px;">{{ record.patient.name }}</div>
+              </div>
+              <div class="inline_block" style="margin-left: 20px;">
+                性别：
+                <check-box text="男" :checked="record.patient.gender == 1"></check-box>
+                <check-box text="女" :checked="record.patient.gender == 2"></check-box>
+              </div>
+              <div class="inline_block" style="margin-left: 15px;">
+                年龄：
+                <div class="under_line" style="width: 50px;">{{jsGetAge(record.patient.birthday)}}</div>
+                岁
+              </div>
+              <div class="inline_block" style="float: right;">
+                科室：
+                <check-box text="门诊透析" :checked="record.patient.source == 1"></check-box>
+                <check-box text="住院" :checked="record.patient.source == 2"></check-box>
+                <!-- TODO -->
+              </div>
+            </div>
+            <div class="row flex">
+              <div class="inline_block">
+                住院号/透析卡号：
+                <div class="under_line" style="width: 100px;">
+                  {{record.patient.admission_number?record.patient.admission_number:'无'}}/{{ record.patient.dialysis_no
+                  }}
+                </div>
+              </div>
+              <div class="inline_block">
+                诊断：
+                <div class="under_line" style="width: 500px;">{{record.patient.diagnose}}</div>
+              </div>
+            </div>
+            <table class="proj_table">
+              <tbody>
+              <tr>
+                <td width="25px">
+                  透<br/>析<br/>处<br/>方
+                </td>
+                <td>
+                  <div class="row" style="padding: 2px 0;">
+                    <div class="inline_block">
+                      治疗时间：
+                      <div class="under_line" style="width: 30px;">
+                        {{record.prescription&&record.prescription.dialysis_duration_hour?record.prescription.dialysis_duration_hour:''}}
+                      </div>
+                      h
+                      <div class="under_line" style="width: 30px;">
+                        {{record.prescription&&record.prescription.dialysis_duration_minute?record.prescription.dialysis_duration_minute:''}}
+                      </div>
+                      min
+                    </div>
+
+                    <div class="inline_block">
+                      &emsp;治疗方式:
+                      <check-box text="HD" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 1)"></check-box>
+                      <check-box text="HDF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 2)"></check-box>
+                      <check-box text="HF" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 5)"></check-box>
+                      <check-box text="HP" :checked="isCheckBoxChecked(record.prescription, 'mode_id', 4)"></check-box>
+                      <check-box text="HD+HP"
+                                 :checked="isCheckBoxChecked(record.prescription, 'mode_id', 3)"></check-box>
+                    </div>
+
+                    <div class="inline_block">
+                      其它：
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription&&record.prescription.mode_id>5?record.prescription.mode:''}}
+                      </div>
+                    </div>
+
+                  </div>
+                  <div class="row" style="padding: 2px 0;">
 
+                  <div class="inline_block">
+                    病情：
+                    <check-box text="一般"
+                               :checked="isCheckBoxChecked(record.receive_assessment, 'sick_condition', 1)"></check-box>
+                    <check-box text="重"
+                               :checked="isCheckBoxChecked(record.receive_assessment, 'sick_condition', 2)"></check-box>
+                    <check-box text="危"
+                               :checked="isCheckBoxChecked(record.receive_assessment, 'sick_condition', 3)"></check-box>
 
+                    <div class="inline_block">
+                      &emsp;透析器型号：
+                      <div class="under_line" style="width: 200px">
+                        {{record.prescription?record.prescription.dialyzer_perfusion_apparatus:''}}
+                      </div>
+                    </div>
 
                   </div>
 
+                  </div>
                   <div class="row" style="padding: 2px 0;">
 
-                    <div class="inline_block" >
-                      病区护士签名：
-                      <div class="under_line" style="width: 100px;">
+                    <div class="inline_block">
+                      体液过多症状:
+                      <check-box text="无"
+                                 :checked="isCheckBoxChecked(record.prescription, 'body_fluid', 1)"></check-box>
+                      <check-box text="下肢水肿+"
+                                 :checked="isCheckBoxChecked(record.prescription, 'body_fluid', 2)"></check-box>
+                      <check-box text="下肢水肿++"
+                                 :checked="isCheckBoxChecked(record.prescription, 'body_fluid', 4)"></check-box>
+                      <check-box text="下肢水肿+++"
+                                 :checked="isCheckBoxChecked(record.prescription, 'body_fluid', 4)"></check-box>
+                    </div>
+
+                    <div class="inline_block">
+                      其它：
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.body_fluid_other:''}}
                       </div>
                     </div>
 
-                    <div class="inline_block" >
-                      &emsp;时间：
-                      <div class="under_line" style="width: 200px;">
-                        {{record.dialysis_order?getTime(record.dialysis_order.end_time,'{y}年{m}月{d}日 {h}时'):''}}
+                  </div>
+
+
+
+
+
+                  <div class="row" style="padding: 2px 0;">
+                    <div class="inline_block">
+                      透析液(mol/l):
+                      &emsp;Ca<sup>2+</sup>:
+                      <div class="under_line" style="width: 30px;">
+                        {{record.prescription&&record.prescription.calcium?record.prescription.calcium:''}}
+                      </div>
+                      mol/l
+                      &emsp;Na<sup>+</sup>:
+                      <div class="under_line" style="width: 30px;">
+                        {{record.prescription&&record.prescription.sodium?record.prescription.sodium:''}}
+                      </div>
+                      mol/l
+                      &emsp;K<sup>+</sup>:
+                      <div class="under_line" style="width: 30px;">
+                        {{record.prescription&&record.prescription.kalium?record.prescription.kalium:''}}
+                      </div>
+                      mol/l
+                    </div>
+
+
+                    <div class="inline_block"
+                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 0">
+                      &emsp;置换液后/前稀释 总量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.displace_liqui_value:''}}
+                      </div>
+                      L
+                    </div>
+                    <div class="inline_block"
+                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 1">
+                      &emsp;置换液前稀释 总量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.displace_liqui_value:''}}
+                      </div>
+                      L
+                    </div>
+                    <div class="inline_block"
+                         v-if="record.prescription != null &&record.prescription.displace_liqui_part == 2">
+                      &emsp;置换液后稀释 总量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.displace_liqui_value:''}}
+                      </div>
+                      L
+                    </div>
+
+                  </div>
+                  <div class="row" style="padding: 2px 0;">
+
+                    <div class="inline_block">
+                      透析前使用特殊药物:
+                      <check-box text="无"
+                                 :checked="isCheckBoxChecked(record.prescription, 'special_medicine', 1)"></check-box>
+                      <check-box text="降压药"
+                                 :checked="isCheckBoxChecked(record.prescription, 'special_medicine', 2)"></check-box>
+                      <check-box text="抗凝"
+                                 :checked="isCheckBoxChecked(record.prescription, 'special_medicine', 3)"></check-box>
+                    </div>
+                    <div class="inline_block">
+                      其它：
+                      <div class="under_line" style="width: 150px;">{{
+                        record.prescription?record.prescription.special_medicine_other:''}}
+                      </div>
+                    </div>
+                  </div>
+
+
+                  <div class="row" style="padding: 2px 0;">
+                    <div class="inline_block">
+                      血管通路:
+                      <check-box text="内瘘"
+                                 :checked="isCheckBoxChecked(record.prescription, 'blood_access', 1)"></check-box>
+                      <check-box text="直穿"
+                                 :checked="isCheckBoxChecked(record.prescription, 'blood_access', 2)"></check-box>
+                      <check-box text="导管"
+                                 :checked="isCheckBoxChecked(record.prescription, 'blood_access', 3)"></check-box>
+                    </div>
+
+                    <div class="inline_block">
+                      &emsp;血流量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.blood_flow_volume:''}}
+                      </div>
+                      ml/min
+                    </div>
+
+                    <div class="inline_block">
+                      &emsp;透析液流量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.dialysate_flow:''}}
+                      </div>
+                      ml/min
+                    </div>
+                  </div>
+
+
+                  <div class="row" style="padding: 2px 0;">
+                    <div class="inline_block">
+                      透前体重:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.assessment_before_dislysis?record.assessment_before_dislysis.weight_before:''}}
+                      </div>
+                      kg
+                    </div>
+
+                    <div class="inline_block">
+                      &emsp;设定超滤量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.target_ultrafiltration:''}}
                       </div>
+                      L
+                    </div>
+                    <div class="inline_block">
+                      &emsp;实际超滤量:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.prescription?record.prescription.ultrafiltration:''}}
+                      </div>
+                      L
+                    </div>
+
+                    <div class="inline_block">
+                      透后体重:
+                      <div class="under_line" style="width: 100px;">{{
+                        record.assessment_after_dislysis?record.assessment_after_dislysis.weight_after:''}}
+                      </div>
+                      kg
                     </div>
                   </div>
                 </td>
               </tr>
+              <tr>
+                <td colspan="2" style="padding: 0;">
+                  <table class="inside_table">
+                    <thead>
+                    <tr>
+                      <td width="40px">时间</td>
+                      <td width="110px">医嘱内容</td>
+                      <td width="80px">医生签名</td>
+                      <td width="80px">执行护士</td>
+                      <td width="65px">执行时间</td>
+                      <td width="75px">核对护士</td>
+                      <td width="10px"></td>
+                      <td width="40px">时间</td>
+                      <td width="110px">医嘱内容</td>
+                      <td width="80px">医生签名</td>
+                      <td width="80px">执行护士</td>
+                      <td width="65px">执行时间</td>
+                      <td width="75px">核对护士</td>
+
+                      <!-- <td width="100">时间</td>
+                      <td>医嘱内容</td>
+                      <td width="120">医生签名</td>
+                      <td width="120">执行护士</td>
+                      <td width="100">执行时间</td>
+                      <td width="120">核对护士</td> -->
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr v-for="(advice, index) in record.advices" :key="index">
+                      <td>
+                                                    <span v-if="advice[0]&&advice[0].start_time">
+                                                    {{getTime(advice[0].start_time,'{h}:{i}')}}
+                                                    </span>
+                        <span v-else>&nbsp;<br/>&nbsp;</span>
+                      </td>
+                      <td class="advice-name">
+                        <span v-if="advice[0].parent_id>0">└</span>
+                        <span>{{advice[0].advice_name }}</span>
+                        <span>{{advice[0].advice_desc}}</span>
+                        <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                        <span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>
+                        <span v-if="advice[0].single_dose != 0">单次用量 {{advice[0].single_dose}}{{advice[0].single_dose_unit}}</span>
+                        <span>{{advice[0].delivery_way}}</span>
+                        <span>{{advice[0].execution_frequency}}</span>
+                        <div v-for="(child, childindex) in advice[0].children" :key="childindex"
+                             class="advice-children">
+                          <div>▲</div>
+                          <div>
+                            <span>{{child.advice_name }}</span>
+                            <span>{{child.advice_desc}}</span>
+                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span
+                              v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
+                            <span
+                              v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
+                          </div>
+                        </div>
+                      </td>
+                      <td>
+                        <span v-if="setAdminUserES(advice[0], 'advice_doctor') == ''">{{getAdminUser(advice[0], 'advice_doctor')}}</span>
+                        <img class="es-img" :src="setAdminUserES(advice[0], 'advice_doctor')" alt="" srcset="" v-else
+                             style="height: 20px;">
+                      </td>
+                      <td>
+                        <span v-if="setAdminUserES(advice[0], 'execution_staff') == ''">{{getAdminUser(advice[0], 'execution_staff')}}</span>
+                        <img class="es-img" :src="setAdminUserES(advice[0], 'execution_staff')" alt="" srcset="" v-else
+                             style="height: 20px;">
+                      </td>
+                      <td>
+                                                    <span v-if="advice[0].execution_time">
+                                                    {{getTime(advice[0].execution_time,'{h}:{i}')}}
+                                                    </span>
+                      </td>
+                      <td>
+                        <span
+                          v-if="setAdminUserES(advice[0], 'checker') == ''">{{getAdminUser(advice[0], 'checker')}}</span>
+                        <img class="es-img" :src="setAdminUserES(advice[0], 'checker')" alt="" srcset="" v-else
+                             style="height: 20px;">
+                      </td>
+                      <td></td>
+                      <td>
+                                                    <span v-if="advice[1]&&advice[1].start_time">
+                                                    {{getTime(advice[1].start_time,'{h}:{i}')}}
+                                                    </span>
+                        <span v-else>&nbsp;<br/>&nbsp;</span>
+                      </td>
+                      <td class="advice-name">
+                        <span v-if="advice[1].parent_id>0">└</span>
+                        <span>{{advice[1].advice_name }}</span>
+                        <span>{{advice[1].advice_desc}}</span>
+                        <!-- <span v-if="advice[1].drug_spec">{{advice[1].drug_spec}}{{advice[1].drug_spec_unit}}</span> -->
+                        <span v-if="advice[1].prescribing_number">* {{advice[1].prescribing_number}}{{advice[1].prescribing_number_unit}}</span>
+                        <span
+                          v-if="advice[1].single_dose ">单次用量 {{advice[1].single_dose}}{{advice[1].single_dose_unit}}</span>
+                        <span>{{advice[1].delivery_way}}</span>
+                        <span>{{advice[1].execution_frequency}}</span>
+                        <div v-for="(child, childindex) in advice[1].children" :key="childindex"
+                             class="advice-children">
+                          <div>▲</div>
+                          <div>
+                            <span>{{child.advice_name }}</span>
+                            <span>{{child.advice_desc}}</span>
+                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span
+                              v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
+                            <span
+                              v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
+                          </div>
+                        </div>
+                      </td>
+                      <td>
+                        <span v-if="setAdminUserES(advice[1], 'advice_doctor') == ''">{{getAdminUser(advice[1], 'advice_doctor')}}</span>
+                        <img class="es-img" :src="setAdminUserES(advice[1], 'advice_doctor')" alt="" srcset="" v-else
+                             style="height: 20px;">
+                      </td>
+                      <td>
+                        <span v-if="setAdminUserES(advice[1], 'execution_staff') == ''">{{getAdminUser(advice[1], 'execution_staff')}}</span>
+                        <img class="es-img" :src="setAdminUserES(advice[1], 'execution_staff')" alt="" srcset="" v-else
+                             style="height: 20px;">
+                      </td>
+                      <td>
+                                                    <span v-if="advice[1].execution_time">
+                                                    {{getTime(advice[1].execution_time,'{h}:{i}')}}
+                                                    </span>
+                      </td>
+                      <td>
+                        <span
+                          v-if="setAdminUserES(advice[1], 'checker') == ''">{{getAdminUser(advice[1], 'checker')}}</span>
+                        <img class="es-img" :src="setAdminUserES(advice[1], 'checker')" alt="" srcset="" v-else
+                             style="height: 20px;">
+                      </td>
+                    </tr>
+                    <!-- 使整个表有5行以上 -->
+                    <!-- <template v-if="record.advices.length < 1">
+                    <tr v-for="(num) in (5 - record.advices.length)" :key="'5_' + num">
+                        <td>&nbsp;</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>&nbsp;</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    </template> -->
+                    </tbody>
+                  </table>
+                </td>
+              </tr>
               </tbody>
             </table>
-            <div class="row" style="font-size: 10px">
-              注：透析器及血路管凝血:0级无凝血; “+”(指Ⅰ级:束状纤维凝血或动/静脉壶/滤网见轻微凝血);“++”(指II级:近半数纤维凝血或动/静脉壶/滤网出现凝血块);“+++”(指III级:压力异常升高，须中途更换透析器/血路管A/V)。
-            </div>
           </div>
 
         </div>
@@ -948,7 +1360,6 @@
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import { getDataConfig } from '@/utils/data'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import print from "print-js"
 
   export default {
     name: 'BatchPrintOrder',
@@ -1028,9 +1439,9 @@
           for (const recordIndex in this.records) {
             var dlegh = 0
             if (this.records[recordIndex].monitor_records && this.records[recordIndex].monitor_records.length < 8) {
-              dlegh = 8 - this.records[recordIndex].monitor_records.length
+              dlegh = 10 - this.records[recordIndex].monitor_records.length
             } else {
-              dlegh = 8
+              dlegh = 10
             }
             if (dlegh > 0) {
               if (typeof (this.records[recordIndex].monitor_records) == 'undefined' || this.records[recordIndex].monitor_records == null) {
@@ -1118,7 +1529,7 @@
     },
     methods: {
       printAction: function() {
-        const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 46px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 20px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}';
+        const style = '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 46px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 20px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}'
 
         printJS({
           printable: 'print_content',
@@ -1237,6 +1648,15 @@
         } else {
           return record[key] == target_value
         }
+      },getAge:function(val) {
+          if(val.age == 0){
+            if (val.birthday == 0) {
+              return ''
+            }
+            return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
+          }else{
+            return val.age
+          }
       }
     }
   }

src/xt_pages/user/components/PatientDetail.vue

@@ -22,6 +22,12 @@
                   </el-radio-group>
                 </el-form-item>
             </el-col>
+            <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>
+            </el-col>
+
             <el-col :span="8">
               <el-form-item label="身份证号 : "  class="is-required" prop="idCardNo" >
                   <el-input v-model="form.idCardNo" disabled></el-input>
@@ -666,6 +672,13 @@ export default {
             this.form.homeAddress = patietInfo.home_address
             this.form.work = patietInfo.work_unit
             this.form.unit_address = patietInfo.unit_address
+
+            if (patietInfo.age == 0){
+              this.form.age = jsGetAge(this.form.birth, '-')
+            }else{
+              this.form.age = patietInfo.age
+            }
+
             if (patietInfo.profession > 0) {
               this.form.profession = patietInfo.profession
             }

src/xt_pages/user/components/PatientForm.vue

@@ -3,7 +3,10 @@
     <div v-if="!isEdit" class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div class="" style="float:right;color: white">
-        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
+        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary"
+                   v-if="this.isEdit==false" @click="resetForm('form')" icon="el-icon-circle-plus-outline" size="small">
+          新增
+        </el-button>
       </div>
     </div>
 
@@ -15,31 +18,39 @@
     </div>
 
     <div class="app-container " v-loading="pageLoad">
-      <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" popper-append-to-body="false" >
+      <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix"
+               popper-append-to-body="false">
         <div class="dataTitle">一般资料</div>
-        <el-row >
-          <el-col :span="20" class="form-table" >
+        <el-row>
+          <el-col :span="20" class="form-table">
             <el-row :span="20">
               <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="姓名 : "  class="is-required" prop="name" >
-                  <el-input v-model="form.name" ></el-input>
+                <el-form-item label="姓名 : " class="is-required" prop="name">
+                  <el-input v-model="form.name"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;" >
-                <el-form-item label="性别 : " class="is-required" prop="gender" >
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+                <el-form-item label="性别 : " class="is-required" prop="gender">
                   <el-radio-group v-model="form.gender" @change="changeGender">
-                    <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+                    <el-radio v-for="item in sexOptions" :key="item.value" :label="item.value" :value="item.value">
+                      {{item.label}}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
 
 
               <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="身份证号 : "  class="is-required" prop="idCardNo" >
-                  <el-input v-model="form.idCardNo" @blur="checkIdCardNo" ></el-input>
+                <el-form-item label="身份证号 : " class="is-required" prop="idCardNo">
+                  <el-input v-model="form.idCardNo" @blur="checkIdCardNo"></el-input>
                 </el-form-item>
               </el-col>
 
+              <el-col :span="8" :style="isEdit?'width:360px':''" style="height:59px;">
+                <el-form-item label="年龄 : " class="is-required" prop="age">
+                  <el-input v-model="form.age" placeholder="请填写年龄"></el-input>
+                </el-form-item>
+              </el-col>
               <template v-if="isEdit">
                 <!-- <el-col  :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="患者类型 : " class="is-required" >
@@ -48,9 +59,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col> -->
+
+
                 <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="透析号 : " class="is-required">
-                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input>
+                    <el-input disabled v-model="form.dialysisNo" placeholder="填写或自动生成"
+                              style="width:62%;float:left;margin-right: 2%;"></el-input>
                     <el-button style="width:36%;padding:10px 0;" disabled type="primary">自动生成</el-button>
                   </el-form-item>
                 </el-col>
@@ -64,17 +78,23 @@
                   </el-form-item>
                 </el-col> -->
 
-                <el-col :span="8" >
-                  <el-form-item label="透析号 : " class="is-required" prop="dialysisNo" >
-                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成" style="width:62%;float:left;margin-right: 2%;" ></el-input>
-                    <el-button style="width:36%;padding:10px 0;" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" @click="generatedialysisno">自动生成</el-button>
+                <el-col :span="8">
+                  <el-form-item label="透析号 : " class="is-required" prop="dialysisNo">
+                    <el-input v-model="form.dialysisNo" placeholder="填写或自动生成"
+                              style="width:62%;float:left;margin-right: 2%;"></el-input>
+                    <el-button style="width:36%;padding:10px 0;"
+                               :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                               type="primary" @click="generatedialysisno">自动生成
+                    </el-button>
                   </el-form-item>
                 </el-col>
               </template>
 
               <el-col :span="8" :style="isEdit?'width:360px':''">
-                <el-form-item label="出生日期 : "  class="is-required" prop="birth" >
-                  <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'" @change="hadSelectBirth" format="yyyy-MM-dd" value-format="yyyy-MM-dd"></el-date-picker>
+                <el-form-item label="出生日期 : " class="is-required" prop="birth">
+                  <el-date-picker v-model="form.birth" type="date" placeholder="选择日期" :suffix-icon="'el-icon-menu'"
+                                  @change="hadSelectBirth" format="yyyy-MM-dd"
+                                  value-format="yyyy-MM-dd"></el-date-picker>
                 </el-form-item>
               </el-col>
               <el-col :span="8" :style="isEdit?'width:360px':''">
@@ -87,17 +107,21 @@
                   <el-input v-model="form.homeTelephone" maxlength="20"></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''"  >
-                <el-form-item label="患者来源 : " class="is-required" prop="source" >
+              <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-form-item label="患者来源 : " class="is-required" prop="source">
                   <el-radio-group v-model="form.source">
-                    <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+                    <el-radio v-for="item in sourceOptions" :key="item.value" :label="item.value" :value="item.value">
+                      {{item.label}}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
-              <el-col :span="8" :style="isEdit?'width:360px':''" >
-                <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto" >
+              <el-col :span="8" :style="isEdit?'width:360px':''">
+                <el-form-item label="治疗状态(转归) : " class="is-required" prop="lapseto">
                   <el-radio-group v-model="form.lapseto">
-                    <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+                    <el-radio v-for="item in lapsetoOptions" :key="item.value" :label="item.value" :value="item.value">
+                      {{item.label}}
+                    </el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -113,7 +137,7 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" :style="isEdit?'width:360px':''" >
+              <el-col :span="8" :style="isEdit?'width:360px':''">
                 <el-form-item label="家庭住址 : " prop="homeAddress">
                   <el-input v-model="form.homeAddress"></el-input>
                 </el-form-item>
@@ -121,49 +145,49 @@
 
               <div v-show="!generic_info_fold">
                 <el-col :span="8" :style="isEdit?'width:360px':''">
-                  <el-form-item label="别名 : "  prop="alias" >
-                    <el-input v-model="form.alias" ></el-input>
+                  <el-form-item label="别名 : " prop="alias">
+                    <el-input v-model="form.alias"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
-                  <el-form-item label="身高(cm) : "  prop="height">
+                  <el-form-item label="身高(cm) : " prop="height">
                     <el-input maxlength="5" v-model="form.height" @change="checkHeight"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="婚姻状况 : " prop="maritalStatus">
-                    <el-select v-model="form.maritalStatus"  placeholder="请选择婚姻状况">
+                    <el-select v-model="form.maritalStatus" placeholder="请选择婚姻状况">
                       <el-option v-for="item in maritalOptions" :key="item.id" :label="item.name" :value="item.id"/>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" style="clearfix" :style="isEdit?'width:360px':''">
                   <el-form-item label="子女情况(个) : " prop="children">
-                    <el-input maxlength="5" v-model="form.children" ></el-input>
+                    <el-input maxlength="5" v-model="form.children"></el-input>
                   </el-form-item>
                   <!-- <el-form-item label=" " style="float:left;" label-width="30px">
                   </el-form-item> -->
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
-                  <el-form-item label="住院(门诊)号 : "  >
+                  <el-form-item label="住院(门诊)号 : ">
                     <el-input v-model="form.admissionNumber"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="医保类型 : " prop="reimbursementWayID">
-                    <el-select v-model="form.reimbursementWayID"  >
+                    <el-select v-model="form.reimbursementWayID">
                       <el-option v-for="item in wayOptions" :key="item.id" :label="item.name" :value="item.id"/>
                     </el-select>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="医保号 : " prop="healthCareNo">
-                    <el-input v-model="form.healthCareNo" ></el-input>
+                    <el-input v-model="form.healthCareNo"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
-                  <el-form-item label="教育程度 : "  prop="educationOptions">
-                    <el-select v-model="form.education"  >
+                  <el-form-item label="教育程度 : " prop="educationOptions">
+                    <el-select v-model="form.education">
                       <el-option v-for="item in educationOptions" :key="item.id" :label="item.name" :value="item.id"/>
                     </el-select>
                   </el-form-item>
@@ -179,13 +203,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="8" :style="isEdit?'width:360px':''">
-                  <el-form-item label="职业 : "  prop="profession">
-                    <el-select v-model="form.profession"  >
+                  <el-form-item label="职业 : " prop="profession">
+                    <el-select v-model="form.profession">
                       <el-option v-for="item in professionOptions" :key="item.id" :label="item.name" :value="item.id"/>
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit?'width:360px':''" >
+                <el-col :span="8" :style="isEdit?'width:360px':''">
                   <el-form-item label="工作单位 : " prop="work">
                     <el-input v-model="form.work"></el-input>
                   </el-form-item>
@@ -198,23 +222,24 @@
               </div>
               <el-col :span="24">
                 <el-form-item>
-                  <el-button type="text" @click="generic_info_fold = !generic_info_fold">{{ generic_info_fold ? "更多资料" : "收起" }}<i class="el-icon--right" :class="generic_fold_icon"></i></el-button>
+                  <el-button type="text" @click="generic_info_fold = !generic_info_fold">{{ generic_info_fold ? '更多资料' :
+                    '收起' }}<i class="el-icon--right" :class="generic_fold_icon"></i></el-button>
                 </el-form-item>
               </el-col>
             </el-row>
           </el-col>
           <el-col :span="4" align="center">
-            <el-upload  style="width:100%;"
-                        :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
-                        :data="uploadData"
-                        class="uploadHead"
-                        :multiple="false"
-                        action="https://upload.qiniup.com"
-                        :show-file-list="false"
-                        :on-error="handleAvatarError"
-                        :on-success="handleAvatarSuccess"
-                        list-type="picture-card"
-                        :before-upload="beforeAvatarUpload">
+            <el-upload style="width:100%;"
+                       :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                       :data="uploadData"
+                       class="uploadHead"
+                       :multiple="false"
+                       action="https://upload.qiniup.com"
+                       :show-file-list="false"
+                       :on-error="handleAvatarError"
+                       :on-success="handleAvatarSuccess"
+                       list-type="picture-card"
+                       :before-upload="beforeAvatarUpload">
               <img width="100%" height="100%" v-if="form.avatar" :src="form.avatar" class="avatar">
               <i class="el-icon-plus" v-else></i>
             </el-upload>
@@ -230,10 +255,12 @@
               :on-error="handleAvatarError"
               :on-success="handleAvatarSuccess"
               :before-upload="beforeAvatarUpload">
-              <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" class="uploadHeadBtn" type="primary" >上传头像</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                         class="uploadHeadBtn" type="primary">上传头像
+              </el-button>
             </el-upload>
-            <el-form-item >
-              <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
+            <el-form-item>
+              <el-input v-model="form.avatar" type="hidden" placeholder=""></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -243,12 +270,14 @@
         <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-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-input type="textarea" :rows="3" v-model="form.present_history" resize="none"
+                        placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -256,7 +285,7 @@
               <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>
         <el-row :span="24">
           <el-col>
             <el-form-item label="体格检查">
@@ -265,11 +294,11 @@
                 <template slot="append">℃</template>
               </el-input>
               <el-input v-model="form.pulse" style="width: 220px;">
-                <template slot="prepend">脉搏: </template>
+                <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="prepend">呼吸:</template>
                 <template slot="append">次/分</template>
               </el-input>
               <!-- </el-form-item>
@@ -292,17 +321,21 @@
               <el-input type="textarea" :rows="3" v-model="form.remark" resize="none" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="传染病 : " prop="contagions">
               <el-checkbox-group v-model="form.contagions">
-                <el-checkbox v-for="item in contagionList" v-if="item.type==2" :label="item.id" :key="item.id" :value="item.id">{{item.name}}</el-checkbox>
+                <el-checkbox v-for="item in contagionList" v-if="item.type==2" :label="item.id" :key="item.id"
+                             :value="item.id">{{item.name}}
+                </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" >
+          <el-col :span="24">
             <el-form-item label="慢性病 : " prop="diseases">
-              <el-checkbox-group  v-model="form.diseases" >
-                <el-checkbox v-for="item in checkDisease" :label="item.id" :key="item.id" :value="item.id" >{{item.name}}</el-checkbox>
+              <el-checkbox-group v-model="form.diseases">
+                <el-checkbox v-for="item in checkDisease" :label="item.id" :key="item.id" :value="item.id">
+                  {{item.name}}
+                </el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
@@ -315,15 +348,18 @@
 
           <div v-show="!treat_info_fold">
             <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="本院首次透析 : " prop="is_hospital_first_dialysis" >
+              <el-form-item label="本院首次透析 : " prop="is_hospital_first_dialysis">
                 <el-radio-group v-model="form.is_hospital_first_dialysis">
-                  <el-radio v-for="item in isHospitalFirstDialysisOptions" :key="item.value" :label="item.value" :value="item.value" >{{item.label}}</el-radio>
+                  <el-radio v-for="item in isHospitalFirstDialysisOptions" :key="item.value" :label="item.value"
+                            :value="item.value">{{item.label}}
+                  </el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="首次透析日期 : "  prop="firstDialysisDate">
-                <el-date-picker v-model="form.firstDialysisDate" type="date"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="selectFirstDialysisDate"></el-date-picker>
+              <el-form-item label="首次透析日期 : " prop="firstDialysisDate">
+                <el-date-picker v-model="form.firstDialysisDate" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" @change="selectFirstDialysisDate"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="6" :style="isEdit?'width:360px':''">
@@ -331,10 +367,12 @@
                 <el-input v-model="form.first_dialysis_hospital"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" >
+            <el-col :span="24">
               <el-form-item label="透析之前情况 : " prop="predialysis_condition">
                 <el-checkbox-group v-model="form.predialysis_condition">
-                  <el-checkbox v-for="item in predialysisConditionOptions"  :label="item.label" :key="item.value" :value="item.label">{{item.label}}</el-checkbox>
+                  <el-checkbox v-for="item in predialysisConditionOptions" :label="item.label" :key="item.value"
+                               :value="item.label">{{item.label}}
+                  </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
@@ -349,14 +387,16 @@
               </el-form-item>
             </el-col>
             <el-col :span="6" :style="isEdit?'width:360px':''">
-              <el-form-item label="本院首次透析 : "  prop="hospital_first_dialysis_date">
-                <el-date-picker v-model="form.hospital_first_dialysis_date" type="date"  format="yyyy-MM-dd" value-format="yyyy-MM-dd" ></el-date-picker>
+              <el-form-item label="本院首次透析 : " prop="hospital_first_dialysis_date">
+                <el-date-picker v-model="form.hospital_first_dialysis_date" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
           </div>
           <el-col :span="24">
             <el-form-item>
-              <el-button type="text" @click="treat_info_fold = !treat_info_fold">{{ treat_info_fold ? "更多治疗信息" : "收起" }}<i class="el-icon--right" :class="treat_fold_icon"></i></el-button>
+              <el-button type="text" @click="treat_info_fold = !treat_info_fold">{{ treat_info_fold ? '更多治疗信息' : '收起' }}<i
+                class="el-icon--right" :class="treat_fold_icon"></i></el-button>
             </el-form-item>
           </el-col>
 
@@ -366,11 +406,16 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" align="right" >
+          <el-col :span="24" align="right">
             <el-form-item>
-                <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
-                <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="primary" icon="el-icon-setting" >保存</el-button>
-                <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="success" >保存并继续新增</el-button>
+              <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                         @click="onSubmit('form')" size="small" type="primary" icon="el-icon-setting">保存
+              </el-button>
+              <el-button v-if="isEdit==false" @click="onReSubmit('form')"
+                         :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false"
+                         icon="el-icon-document-add" size="small" type="success">保存并继续新增
+              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -385,21 +430,8 @@
 <script>
   import { getToken } from '@/api/qiniu'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {
-    getFileExtension,
-    isCardNo,
-    jsGetAge,
-    isPositiveInteger,
-    dialysisAge,
-    uParseTime
-  } from '@/utils/tools'
-  import {
-    generateDialysisNo,
-    createPatient,
-    editPatient,
-    fetchPatient,
-    GetPatientTotal
-  } from '@/api/patient'
+  import { dialysisAge, getFileExtension, isCardNo, isPositiveInteger, jsGetAge, uParseTime } from '@/utils/tools'
+  import { createPatient, editPatient, fetchPatient, generateDialysisNo, GetPatientTotal } from '@/api/patient'
   // import { fetchAllDoctorAndNurse } from "@/api/doctor";
   import { getDataConfig } from '@/utils/data'
 
@@ -441,6 +473,8 @@
     diseases: [],
     remark: '',
     diagnose: '',
+    age: '',
+
     //  patientType: "",
     //   partition: "",
     //   bed: "",
@@ -551,7 +585,9 @@
           name: [{ required: true, message: '请填写姓名', trigger: 'blur' }],
           gender: [{ required: true, message: '请选择性别', trigger: 'blur' }],
           idCardNo: [{ required: true, message: '请填写身份证号', trigger: 'blur' }],
-          birth: [{ required: true, message: '请填写生日', trigger: 'blur' }]
+          birth: [{ required: true, message: '请填写生日', trigger: 'blur' }],
+          age: [{ required: true, message: '请填写年龄', trigger: 'blur' }]
+
           // homeTelephone: [{ validator: checkFamilyPhone, trigger: "blur" }],
           // homeAddress: [{ required: true, message: "请填写住址", trigger: "blur" }],
         }
@@ -615,7 +651,7 @@
         GetPatientTotal().then(response => {
           if (response.data.state == 1) {
             this.patientTotal = response.data.data.total
-            this.subscibeFlag = true;
+            this.subscibeFlag = true
             // if ((this.subscibe.state == 2 && this.patientTotal >= 100) || (this.subscibe.state == 1 && this.patientTotal >= 200)) {
             //   this.$alert('患者数已达到当前服务版本病人数，需要升级到更高的版本', '提示', {
             //     confirmButtonText: '确定',
@@ -664,6 +700,7 @@
           if (valid) {
             this.formSubmit = false
             if (this.isEdit) {
+              this.form.age = parseInt(this.form.age)
               editPatient(this.patientID, this.form)
                 .then(response => {
                   if (response.data.state == 0) {
@@ -692,6 +729,7 @@
                   return false
                 })
             } else {
+              this.form.age = parseInt(this.form.age)
               createPatient(this.form)
                 .then(response => {
                   if (response.data.state == 0) {
@@ -843,6 +881,7 @@
         fetchPatient(id)
           .then(response => {
             if (response.data.state == 1) {
+
               this.$emit('tran-patient-info', response.data.data.patient)
               var patietInfo = response.data.data.patient
               this.form.avatar = patietInfo.avatar
@@ -858,7 +897,7 @@
               this.form.nation = patietInfo.nation
               this.form.native_place = patietInfo.native_place
               this.form.height = patietInfo.height + ''
-              // this.form.age = jsGetAge(this.form.birth, "-");
+              console.log(this.form.birth)
               if (patietInfo.marital_status > 0) {
                 this.form.maritalStatus = patietInfo.marital_status
               }
@@ -875,6 +914,7 @@
               this.form.homeAddress = patietInfo.home_address
               this.form.work = patietInfo.work_unit
               this.form.unit_address = patietInfo.unit_address
+
               if (patietInfo.profession > 0) {
                 this.form.profession = patietInfo.profession
               }
@@ -922,6 +962,15 @@
               this.form.sbp = patietInfo.sbp
               this.form.dbp = patietInfo.dbp
 
+              if (patietInfo.age == 0){
+                this.form.age = jsGetAge(this.form.birth, "-");
+              }else{
+                this.form.age = patietInfo.age
+              }
+
+
+
+
               // this.form.initial = patietInfo.initial_dialysis + "";
               // this.form.dialysisTotal = patietInfo.total_dialysis + "";
               // this.form.assessment = patietInfo.evaluate;
@@ -1007,28 +1056,35 @@
     width: 148px;
     margin-top: 10px;
   }
-  .el-form{
-  .el-col-6,.el-col-8{
+
+  .el-form {
+
+  .el-col-6, .el-col-8 {
     width: 430px;
-    height: 59px!important;
+    height: 59px !important;
   }
+
   .el-form-item {
+
   .el-select {
     width: 100%;
   }
+
   .el-date-editor.el-input {
     width: 100%;
   }
+
   .textarea {
     width: 100%;
     height: 70px;
     border-color: #dcdfe6;
     padding: 5px;
   }
+
+  }
   }
+  .el-select-dropdown {
+    z-index: 998 !important;
   }
-  .el-select-dropdown{
-  z-index: 998!important;
-}
 </style>