Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/data/prescription.vue

@@ -796,10 +796,17 @@
         })
 
       }, selectnDialysisTime(val) {
+        console.log(val)
+
+        console.log( this.addPlan.dialysis_duration)
+        console.log( this.addPlan.dialysis_duration_hour)
+        console.log( this.addPlan.dialysis_duration_minute)
+
         var valTime = val.split(':')
         this.addPlan.dialysis_duration = parseFloat(valTime[0]) + parseFloat((valTime[1] / 60).toFixed(2))
         this.addPlan.dialysis_duration_hour = valTime[0]
         this.addPlan.dialysis_duration_minute = valTime[1]
+
       }, changeThisAnticoagulant() {
         var thismode = parseInt(this.addPlan.anticoagulant)
         if (isNaN(thismode) || thismode <= 0) {
@@ -871,6 +878,10 @@
 
     }, watch: {
       'addPlan.dialysis_duration': function() {
+        console.log(this.addPlan.anticoagulant_shouji)
+        console.log(this.addPlan.dialysis_duration)
+        console.log(this.addPlan.anticoagulant_weichi)
+
         this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.addPlan.anticoagulant_shouji,
           this.addPlan.dialysis_duration,
@@ -878,6 +889,9 @@
         )
       },
       'addPlan.anticoagulant_shouji': function() {
+        console.log(this.addPlan.anticoagulant_shouji)
+        console.log(this.addPlan.dialysis_duration)
+        console.log(this.addPlan.anticoagulant_weichi)
         this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.addPlan.anticoagulant_shouji,
           this.addPlan.dialysis_duration,
@@ -885,6 +899,9 @@
         )
       },
       'addPlan.anticoagulant_weichi': function() {
+        console.log(this.addPlan.anticoagulant_shouji)
+        console.log(this.addPlan.dialysis_duration)
+        console.log(this.addPlan.anticoagulant_weichi)
         this.addPlan.anticoagulant_zongliang = calculateAnticoagulantZL(1,
           this.addPlan.anticoagulant_shouji,
           this.addPlan.dialysis_duration,

src/xt_pages/dialysis/PatientBox.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <!-- <router-link to="/dialysis/details"> -->
-    <div class="patient" v-for="schedule in schedules" v-if="schedule.patient" :class="borderColor(schedule)"  @click="detailAction(schedule)" :key="schedule.id"> 
+    <div class="patient" v-for="schedule in schedules" v-if="schedule.patient" :class="borderColor(schedule)"  @click="detailAction(schedule)" :key="schedule.id">
         <div class="kehu" >
           <div class="tx">
             <img :src="schedule.patient.avatar.length > 0 ? schedule.patient.avatar : '../../assets/home/analyze.png'" alt="">
@@ -28,6 +28,7 @@
 
 <script>
 import { parseTime } from "@/utils"
+import { jsGetAge } from '@/utils/tools'
 
 export default {
   name: "PatientBox",
@@ -125,7 +126,7 @@ export default {
         return 1
       }
     },
-    
+
     orderState: function(schedual) {
       if (schedual.dialysis_order == null) { // 未上机
         return 4
@@ -159,12 +160,18 @@ export default {
       }
     },
     age: function(schedual) {
-      var now = new Date()
-      var nowYear = parseTime(now, "{y}")
-      var birthdayYear = parseTime(schedual.patient.birthday, "{y}")
-      // console.log(nowYear)
-      // console.log(birthdayYear)
-      return nowYear - birthdayYear
+      if (schedual.patient.birthday == 0){
+        return ''
+      }else{
+        return jsGetAge(parseTime(schedual.patient.birthday, '{y}-{m}-{d}'), '-')
+      }
+
+      // var now = new Date()
+      // var nowYear = parseTime(now, "{y}")
+      // var birthdayYear = parseTime(schedual.patient.birthday, "{y}")
+      // // console.log(nowYear)
+      // // console.log(birthdayYear)
+      // return nowYear - birthdayYear
     },
     detailAction: function(schedual) {
       var patient_id = schedual.patient_id

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -1706,14 +1706,11 @@
           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
-        }
+
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/batch_print/batch_print_order_five_one.vue

@@ -1253,14 +1253,10 @@
           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
-        }
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/batch_print/batch_print_order_five_two.vue

@@ -81,7 +81,8 @@
                   <!--</div>-->
                   <div class="inline_block" style="margin-left:20px;">
                     其它：
-                    <div class="under_line" style="width: 100px;text-align: left">{{ record.prescription&&record.prescription.mode_id>5?record.prescription.mode:''}}
+                    <div class="under_line" style="width: 100px;text-align: left">{{
+                      record.prescription&&record.prescription.mode_id>5?record.prescription.mode:''}}
                     </div>
                   </div>
                   <div class="inline_block" style="margin-left:20px;">
@@ -127,9 +128,12 @@
                   <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>
+                    <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">
                     其它：
@@ -148,9 +152,12 @@
 
                   <div class="inline_block" style="margin-left:20px;">
                     透析前使用特殊药物:
-                    <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>
+                    <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">
                     其它：
@@ -163,7 +170,8 @@
                   <div class="inline_block">
                     透析液(mmol/L):
                     &emsp;Ca<sup>2+</sup>:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.prescription&&record.prescription.calcium">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.calcium">
                       {{getFloat(record.prescription.calcium)}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -171,7 +179,8 @@
                     </div>
                     mmol/L
                     &emsp;Na<sup>+</sup>:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.prescription&&record.prescription.sodium">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.sodium">
                       {{getFloat(record.prescription.sodium)}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -179,7 +188,8 @@
                     </div>
                     mmol/L
                     &emsp;K<sup>+</sup>:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.prescription&&record.prescription.kalium">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.kalium">
                       {{getFloat(record.prescription.kalium)}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -191,7 +201,7 @@
                        v-if="record.prescription == null">
                     &emsp;置换液后/前稀释 总量:
 
-                    <div class="under_line" style="width: 60px;"  >
+                    <div class="under_line" style="width: 60px;">
                       {{'/'}}
                     </div>
                     L
@@ -199,17 +209,20 @@
                   <div class="inline_block"
                        v-if="record.prescription != null &&record.prescription.displace_liqui_part == 0">
                     &emsp;置换液后/前稀释 总量:
-                    <div class="under_line" style="width: 60px;text-align: left"  v-if="record.prescription&&record.prescription.displace_liqui_value">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.displace_liqui_value">
                       {{record.prescription.displace_liqui_value}}
                     </div>
-                    <div class="under_line" style="width: 60px;"  v-else>
+                    <div class="under_line" style="width: 60px;" v-else>
                       {{'/'}}
                     </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: 60px;text-align: left" v-if="record.prescription&&record.prescription.displace_liqui_value">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.displace_liqui_value">
                       {{record.prescription.displace_liqui_value}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -217,9 +230,11 @@
                     </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: 60px;text-align: left" v-if="record.prescription&&record.prescription.displace_liqui_value">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.displace_liqui_value">
                       {{record.prescription.displace_liqui_value}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -231,9 +246,12 @@
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <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>
+                    <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;血流量:
@@ -259,7 +277,8 @@
                 <div class="row" style="padding: 2px 0;line-height:24px;">
                   <div class="inline_block">
                     透前体重:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_before_dislysis">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.assessment_before_dislysis">
                       {{record.assessment_before_dislysis.weight_before}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -269,7 +288,8 @@
                   </div>
                   <div class="inline_block">
                     &emsp;设定超滤量:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.prescription&&record.prescription.target_ultrafiltration">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.prescription&&record.prescription.target_ultrafiltration">
                       {{getFloat(record.prescription.target_ultrafiltration)}}
                     </div>
                     <div class="under_line" style="width: 60px;" v-else>
@@ -279,7 +299,8 @@
                   </div>
                   <div class="inline_block">
                     &emsp;实际超滤量:
-                    <div class="under_line" style="width:60px;text-align: left" v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration">
+                    <div class="under_line" style="width:60px;text-align: left"
+                         v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.actual_ultrafiltration">
                       {{getFloat(record.assessment_after_dislysis.actual_ultrafiltration)}}
                     </div>
                     <div class="under_line" style="width:60px;" v-else>
@@ -289,7 +310,8 @@
                   </div>
                   <div class="inline_block">
                     透后体重:
-                    <div class="under_line" style="width: 60px;text-align: left" v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.weight_after">
+                    <div class="under_line" style="width: 60px;text-align: left"
+                         v-if="record.assessment_after_dislysis&&record.assessment_after_dislysis.weight_after">
                       {{record.assessment_after_dislysis.weight_after}}
                     </div>
                     <div class="under_line" style="width: 60px" v-else>
@@ -302,61 +324,68 @@
             </tr>
             </tbody>
           </table>
-          <div :style="record.advices2&&record.advices2.length > 0 ? 'margin-bottom:350px;border-top:0;text-align:center;position: relative;border-top:0;':'border-top:0;text-align:center;position: relative;border-top:0;'">
+          <div
+            :style="record.advices2&&record.advices2.length > 0 ? 'margin-bottom:350px;border-top:0;text-align:center;position: relative;border-top:0;':'border-top:0;text-align:center;position: relative;border-top:0;'">
             <table class="print-table-no" border="1" style="border-top:0;" count="0">
               <tbody>
-                <tr style="line-height:35px;padding:8px 5px;">
-                  <td colspan="7" style="font-size: 18px">医嘱</td>
-                </tr>
-                <tr style="line-height:35px;padding:8px 5px;">
-                  <td colspan="4" style="font-size: 16px">开医嘱</td>
-                  <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                </tr>
-                <tr style="line-height:35px;padding:8px 5px;">
-                  <td style="font-size: 16px" width="10%">时间</td>
-                  <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
-                  <td style="font-size: 16px" width="10%">医生签名</td>
-                  <td style="font-size: 16px" width="10%">核对人签名</td>
-                  <td style="font-size: 16px" width="10%">执行人签名</td>
-                  <td style="font-size: 16px" width="10%">时间</td>
+              <tr style="line-height:35px;padding:8px 5px;">
+                <td colspan="7" style="font-size: 18px">医嘱</td>
+              </tr>
+              <tr style="line-height:35px;padding:8px 5px;">
+                <td colspan="4" style="font-size: 16px">开医嘱</td>
+                <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
+              </tr>
+              <tr style="line-height:35px;padding:8px 5px;">
+                <td style="font-size: 16px" width="10%">时间</td>
+                <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
+                <td style="font-size: 16px" width="10%">医生签名</td>
+                <td style="font-size: 16px" width="10%">核对人签名</td>
+                <td style="font-size: 16px" width="10%">执行人签名</td>
+                <td style="font-size: 16px" width="10%">时间</td>
+              </tr>
+              <template v-for="(group, group_index) in record.advices">
+                <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
+                  <td height="60px" v-if="advice_index == 0" :rowspan="group.advices.length">
+                    <span v-if="advice.start_time">{{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}</span>
+                    <span v-else>&nbsp;<br/>&nbsp;</span>
+                  </td>
+                  <td height="60px" class="advice-name" style="padding-left:7px;"
+                      :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2"
+                      v-if="advice.isShow == 2">
+                    <span>{{advice.advice_name }}</span>
+                    <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                    <!--<span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                    <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                    <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                    <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
+                    <span v-if="advice.parent_id == 0  &&advice.children&& advice.children.length == 0">{{advice.execution_frequency}}</span>
+                    <span
+                      v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0">({{advice.remark}})</span>
+                  </td>
+                  <td colspan="2" height="60px" style="text-align: center" v-else>
+                    <span>{{advice.delivery_way}}</span>
+                    <span>{{advice.execution_frequency}}</span>
+                    <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
+                  </td>
+                  <td width="10%"
+                      v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2"></td>
+                  <td height="60px">
+                    <span
+                      v-if="setAdminUserES(advice, 'advice_doctor') == ''">{{getAdminUser(advice, 'advice_doctor')}}</span>
+                    <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else>
+                  </td>
+                  <td height="60px">
+                    <span v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
+                    <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else>
+                  </td>
+                  <td height="60px">
+                    <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
+                    <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else>
+                  </td>
+                  <td height="60px"><span v-if="advice.execution_time"> {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}} </span>
+                  </td>
                 </tr>
-                <template v-for="(group, group_index) in record.advices">
-                  <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
-                    <td height="60px" v-if="advice_index == 0" :rowspan="group.advices.length">
-                      <span v-if="advice.start_time">{{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}</span>
-                      <span v-else>&nbsp;<br/>&nbsp;</span>
-                    </td>
-                    <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
-                      <span>{{advice.advice_name }}</span>
-                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                       <!--<span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
-                      <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                      <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
-                      <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
-                      <span v-if="advice.parent_id == 0  &&advice.children&& advice.children.length == 0">{{advice.execution_frequency}}</span>
-                      <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
-                    </td>
-                    <td colspan="2"  height="60px" style="text-align: center" v-else >
-                      <span>{{advice.delivery_way}}</span>
-                      <span>{{advice.execution_frequency}}</span>
-                      <span v-if="advice.remark.length > 0" >({{advice.remark}})</span>
-                    </td>
-                    <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td>
-                    <td height="60px">
-                      <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">{{getAdminUser(advice, 'advice_doctor')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else >
-                    </td>
-                    <td height="60px">
-                      <span v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else >
-                    </td>
-                    <td height="60px">
-                      <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
-                      <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else >
-                    </td>
-                    <td height="60px"><span v-if="advice.execution_time"> {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}} </span> </td>
-                  </tr>
-                </template>
+              </template>
               </tbody>
             </table>
             <div class="print-yema4">1</div>
@@ -407,58 +436,63 @@
               </div>
               <table class="print-table-no" border="1" count="0">
                 <tbody>
-                  <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="7" style="font-size: 18px">医嘱</td>
-                  </tr>
-                  <tr style="line-height:35px;padding:8px 5px;">
-                    <td colspan="4" style="font-size: 16px">开医嘱</td>
-                    <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
-                  </tr>
-                  <tr style="line-height:35px;padding:8px 5px;">
-                    <td style="font-size: 16px" width="10%">时间</td>
-                    <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
-                    <td style="font-size: 16px" width="10%">医生签名</td>
-                    <td style="font-size: 16px" width="10%">核对人签名</td>
-                    <td style="font-size: 16px" width="10%">执行人签名</td>
-                    <td style="font-size: 16px" width="10%">时间</td>
+                <tr style="line-height:35px;padding:8px 5px;">
+                  <td colspan="7" style="font-size: 18px">医嘱</td>
+                </tr>
+                <tr style="line-height:35px;padding:8px 5px;">
+                  <td colspan="4" style="font-size: 16px">开医嘱</td>
+                  <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
+                </tr>
+                <tr style="line-height:35px;padding:8px 5px;">
+                  <td style="font-size: 16px" width="10%">时间</td>
+                  <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
+                  <td style="font-size: 16px" width="10%">医生签名</td>
+                  <td style="font-size: 16px" width="10%">核对人签名</td>
+                  <td style="font-size: 16px" width="10%">执行人签名</td>
+                  <td style="font-size: 16px" width="10%">时间</td>
+                </tr>
+                <template v-for="(group, group_index) in record.advices2">
+                  <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
+                    <td height="60px" v-if="advice_index == 0" :rowspan="group.advices.length">
+                      <span v-if="advice.start_time">{{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}</span>
+                      <span v-else>&nbsp;<br/>&nbsp;</span>
+                    </td>
+                    <td height="60px" class="advice-name" style="padding-left:7px;"
+                        :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2"
+                        v-if="advice.isShow == 2">
+                      <span>{{advice.advice_name }}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
+                      <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
+                      <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
+                      <span v-if="advice.parent_id == 0  &&advice.children&& advice.children.length == 0">{{advice.execution_frequency}}</span>
+                      <span
+                        v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0">({{advice.remark}})</span>
+                    </td>
+                    <td colspan="2" height="60px" style="text-align: center" v-else>
+                      <span>{{advice.delivery_way}}</span>
+                      <span>{{advice.execution_frequency}}</span>
+                      <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
+                    </td>
+                    <td width="10%"
+                        v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2"></td>
+                    <td height="60px">
+                      <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">{{getAdminUser(advice, 'advice_doctor')}}</span>
+                      <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else>
+                    </td>
+                    <td height="60px">
+                      <span v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
+                      <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else>
+                    </td>
+                    <td height="60px">
+                      <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
+                      <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else>
+                    </td>
+                    <td height="60px"><span v-if="advice.execution_time"> {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}} </span>
+                    </td>
                   </tr>
-                  <template v-for="(group, group_index) in record.advices2">
-                    <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
-                      <td height="60px" v-if="advice_index == 0" :rowspan="group.advices.length">
-                        <span v-if="advice.start_time">{{getTime(advice.start_time,'{y}-{m}-{d} {h}:{i}')}}</span>
-                        <span v-else>&nbsp;<br/>&nbsp;</span>
-                      </td>
-                      <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
-                        <span>{{advice.advice_name }}</span>
-                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                        <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
-                        <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                        <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
-                        <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
-                        <span v-if="advice.parent_id == 0  &&advice.children&& advice.children.length == 0">{{advice.execution_frequency}}</span>
-                        <span v-if="advice.parent_id == 0 && advice.children &&  advice.children.length == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
-                      </td>
-                      <td colspan="2"  height="60px" style="text-align: center" v-else >
-                        <span>{{advice.delivery_way}}</span>
-                        <span>{{advice.execution_frequency}}</span>
-                        <span v-if="advice.remark.length > 0" >({{advice.remark}})</span>
-                      </td>
-                      <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td>
-                      <td height="60px">
-                        <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">{{getAdminUser(advice, 'advice_doctor')}}</span>
-                        <img class="es-img" :src="setAdminUserES(advice, 'advice_doctor')" alt="" srcset="" v-else >
-                      </td>
-                      <td height="60px">
-                        <span v-if="setAdminUserES(advice, 'checker') == ''">{{getAdminUser(advice, 'checker')}}</span>
-                        <img class="es-img" :src="setAdminUserES(advice, 'checker')" alt="" srcset="" v-else >
-                      </td>
-                      <td height="60px">
-                        <span v-if="setAdminUserES(advice, 'execution_staff') == ''">{{getAdminUser(advice, 'execution_staff')}}</span>
-                        <img class="es-img" :src="setAdminUserES(advice, 'execution_staff')" alt="" srcset="" v-else >
-                      </td>
-                      <td height="60px"><span v-if="advice.execution_time"> {{getTime(advice.execution_time,'{y}-{m}-{d} {h}:{i}')}} </span> </td>
-                    </tr>
-                  </template>
+                </template>
                 </tbody>
               </table>
               <div class="print-yema5">2</div>
@@ -476,7 +510,7 @@
   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',
     components: {
@@ -532,7 +566,6 @@
       this.intake_arr = getDataConfig('hemodialysis', 'intake')
       this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
 
-
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       //   this.orgname = "遂溪方济医院";
@@ -696,8 +729,8 @@
                   if (advice.parent_id > 0) {
                     if (this.advice_groups.length > 0) {
                       var parent_group = this.advice_groups[
-                        this.advice_groups.length - 1
-                      ]
+                      this.advice_groups.length - 1
+                        ]
                       if (parent_group.advices.length > 0) {
                         if (parent_group.advices[0].id == advice.parent_id) {
                           parent_group.advices.push(advice)
@@ -743,8 +776,8 @@
                     if (advice.parent_id > 0) {
                       if (this.advice_groups_2.length > 0) {
                         var parent_group = this.advice_groups_2[
-                          this.advice_groups_2.length - 1
-                        ]
+                        this.advice_groups_2.length - 1
+                          ]
                         if (parent_group.advices.length > 0) {
                           if (parent_group.advices[0].id == advice.parent_id) {
                             parent_group.advices.push(advice)
@@ -949,13 +982,11 @@
           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}'), '-')
+        val.birth = uParseTime(val.birthday, '{y}-{m}-{d}')
+        if (val.birthday != 0) {
+          return jsGetAge(val.birth, '-')
         } else {
-          return val.age
+          return ''
         }
       }, newAdviceGroupObject: function() {
         return Object.assign(
@@ -1104,34 +1135,49 @@
   .advice-children {
     display: flex;
   }
-   .margin-bottom-300 {
-    margin-bottom:450px;
+
+  .margin-bottom-300 {
+    margin-bottom: 450px;
   }
+
   .margin-bottom-600 {
-    margin-bottom:600px;
+    margin-bottom: 600px;
   }
+
   .margin-bottom-900 {
-    margin-bottom:900px;
+    margin-bottom: 900px;
   }
-  .print-yema{
+
+  .print-yema {
     position: absolute;
     left: 50%;
   }
-  .print-yema2{
+
+  .print-yema2 {
     position: absolute;
     left: 50%;
   }
-  .print-yema3{
+
+  .print-yema3 {
     position: absolute;
     left: 50%;
   }
-  .print-yema4{
+
+  .print-yema4 {
     position: absolute;
     left: 50%;
   }
-  .print-yema5{
+
+  .print-yema5 {
     position: absolute;
     left: 50%;
   }
-  .did_checke::after {content: "\221A";font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}
+
+  .did_checke::after {
+    content: "\221A";
+    font-size: 8px;
+    margin-left: 2px;
+    margin-top: 2px;
+    position: absolute;
+  }
 </style>

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -1614,14 +1614,10 @@
           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
-        }
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/batch_print/batch_print_order_other_one.vue

@@ -1170,14 +1170,10 @@
           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
-        }
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -937,14 +937,11 @@
           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
+        if (val.birthday == 0) {
+          return ''
         }
+        return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
+
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -322,13 +322,13 @@
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span></td>
                   <td>
-           
-           
-           
-           
-             
-             
-             
+
+
+
+
+
+
+
                 <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getName(advice.advice_doctor) }}</span>
                     <img
                       style="height:20px;"

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -103,14 +103,10 @@ export default {
   },
   methods: {
     getAge: function(val) {
-      if (val.age == 0) {
         if (val.birthday == 0) {
           return ''
         }
         return jsGetAge(uParseTime(val.birthday, '{y}-{m}-{d}'), '-')
-      } else {
-        return val.age
-      }
     },
     stepState: function() {
       return parseInt((Math.random() * 1000) + '') % 2 == 1

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -165,7 +165,7 @@
               <el-select v-model="assessmentBeforeDislysis.blood_access_part_opera_id">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
-                <el-option v-for="item in blood_access_part_opera" :label="item.name" :value="item.id"
+                <el-option v-for="item in 8" :label="item.name" :value="item.id"
                            :key="item.id"></el-option>
               </el-select>
             </el-form-item>

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -1538,15 +1538,12 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
+          if(val.birthday != 0){
             return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
+          }else{
+            return ''
           }
-        } else {
-          return jsGetAge(val.birth, '-')
-        }
+
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -1211,7 +1211,6 @@
         return name
       },
       setAdminUserES(id) {
-        console.log(id)
         if (id == 0) {
           return ''
         }
@@ -1484,15 +1483,11 @@
         }
         return ''
       }, getAge: function(val) {
-        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
-            return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
-          }
-        } else {
+        if(val.birthday != 0){
           return jsGetAge(val.birth, '-')
         }
+        return ''
+
       }, newAdviceGroupObject: function() {
         return Object.assign(
           {},

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -1176,17 +1176,20 @@
         return ''
       },
       getAge: function(val) {
-        if (
-          this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-        ) {
-          if (val.age == 0) {
+        if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
+          if(val.birthday != 0){
             return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
+          }else{
+
+            return ''
+
           }
         } else {
-          return jsGetAge(val.birth, '-')
+          if(val.birthday != 0){
+            return jsGetAge(val.birth, '-')
+          }else{
+            return ''
+          }
         }
       },
       newAdviceGroupObject: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -905,14 +905,14 @@
                           monitor.venous_pressure ? monitor.venous_pressure : ""
                         }}
                       </td>
-                      <td v-if="monitor.operate_time > dialysisOrder.end_time">
+                      <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time)">
                         {{
                           monitor.transmembrane_pressure
                             ? monitor.transmembrane_pressure
                             : ""
                         }}
                       </td>
-                      <td v-if="monitor.operate_time <= dialysisOrder.end_time">
+                      <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time)">
                         {{
                           monitor.transmembrane_pressure
                             ? monitor.transmembrane_pressure
@@ -933,14 +933,14 @@
                             : ""
                         }}
                       </td>
-                      <td v-if="monitor.operate_time > dialysisOrder.end_time">
+                      <td v-if="dialysisOrder && (monitor.operate_time > dialysisOrder.end_time)">
                         {{
                           monitor.ultrafiltration_volume
                             ? monitor.ultrafiltration_volume
                             : ""
                         }}
                       </td>
-                      <td v-if="monitor.operate_time <= dialysisOrder.end_time">
+                      <td v-if="dialysisOrder && (monitor.operate_time <= dialysisOrder.end_time)">
                         {{
                           monitor.ultrafiltration_volume
                             ? monitor.ultrafiltration_volume
@@ -949,7 +949,7 @@
                       </td>
                       <td
                         v-if="
-                          (prescription.mode_id == 2 ||
+                          dialysisOrder && (prescription.mode_id == 2 ||
                             prescription.mode_id == 5) &&
                             monitor.operate_time > dialysisOrder.end_time
                         "
@@ -963,7 +963,7 @@
                       </td>
                       <td
                         v-if="
-                          (prescription.mode_id == 2 ||
+                         dialysisOrder && (prescription.mode_id == 2 ||
                             prescription.mode_id == 5) &&
                             monitor.operate_time <= dialysisOrder.end_time
                         "
@@ -983,9 +983,7 @@
                             style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;"
                           >
                             <template
-                              v-if="
-                                monitor.operate_time == dialysisOrder.start_time
-                              "
+                              v-if="monitor.operate_time == dialysisOrder.start_time"
                               >【开始透析】</template
                             >
                             {{ monitor.end }}
@@ -2526,17 +2524,20 @@ export default {
       return "";
     },
     getAge: function(val) {
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
+      if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
+        if(val.birthday != 0){
+          return jsGetAge(val.birth, '-')
+        }else{
+
+          return ''
+
         }
       } else {
-        return jsGetAge(val.birth, "-");
+        if(val.birthday != 0){
+          return jsGetAge(val.birth, '-')
+        }else{
+          return ''
+        }
       }
     },
     newAdviceGroupObject: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -1525,13 +1525,19 @@
         return ''
       }, getAge: function(val) {
         if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
+          if(val.birthday != 0){
             return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
+          }else{
+
+            return ''
+
           }
         } else {
-          return jsGetAge(val.birth, '-')
+          if(val.birthday != 0){
+            return jsGetAge(val.birth, '-')
+          }else{
+            return ''
+          }
         }
       }, newAdviceGroupObject: function() {
         return Object.assign(

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -1582,13 +1582,19 @@
         return ''
       }, getAge: function(val) {
         if (this.org_template_info.template_id == 2 || this.org_template_info.template_id == 0) {
-          if (val.age == 0) {
+          if(val.birthday != 0){
             return jsGetAge(val.birth, '-')
-          } else {
-            return val.age
+          }else{
+
+            return ''
+
           }
         } else {
-          return jsGetAge(val.birth, '-')
+          if(val.birthday != 0){
+            return jsGetAge(val.birth, '-')
+          }else{
+            return ''
+          }
         }
       }, newAdviceGroupObject: function() {
         return Object.assign(

src/xt_pages/upload/fast/One.vue

@@ -475,7 +475,7 @@
 </template>
 <script>
 import { getDataConfig } from "@/utils/data";
-import { uParseTime } from "@/utils/tools";
+import { uParseTime,jsGetAge } from "@/utils/tools";
 import { fetchPatient } from "@/api/patient";
 import { fetchAllAdminUsers } from "@/api/doctor";
 const defaultForm = {
@@ -633,11 +633,7 @@ export default {
             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;