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

src/store/modules/xt_permission.js

@@ -14,6 +14,7 @@ const xt_permission = {
   actions: {
     xt_GenerateRoutes({ commit }, urls) {
       return new Promise(resolve => {
+
         setupRouters(urls)
         var addRouters = xt_filterAsyncRouter(xt_asyncRouterMap)
         commit('XT_SET_ROUTERS', { concatRouters:xt_constantRouterMap.concat(xt_asyncRouterMap), addRouters:addRouters })

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -487,6 +487,8 @@
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '心衰')"></check-box>
                       <check-box text="腹痛"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '腹痛')"></check-box>
+                      <check-box text="无"
+                                 :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '无')"></check-box>
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0;">

src/xt_pages/dialysis/batch_print/batch_print_order_five_two.vue

@@ -266,8 +266,8 @@
                   </div>
                   <div class="inline_block">
                     &emsp;实际超滤量:
-                    <div class="under_line" style="width:60px;text-align: left" v-if="record.prescription&&record.prescription.ultrafiltration">
-                      {{getFloat(record.prescription.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>
                       {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_four.vue

@@ -519,6 +519,8 @@
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '心衰')"></check-box>
                       <check-box text="腹痛"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '腹痛')"></check-box>
+                      <check-box text="无"
+                                 :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '无')"></check-box>
                     </div>
                   </div>
                   <div class="row" style="padding: 2px 0;">

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -248,8 +248,8 @@
                     </div>
                     <div class="inline_block">
                       &emsp;实际超滤量:
-                      <div class="under_line" style="width:60px;text-align: left" v-if="record.prescription&&record.prescription.ultrafiltration">
-                        {{getFloat(record.prescription.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>
                         {{'/'}}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -280,7 +280,7 @@
                                     <div class="under_line" style="width: 150px;text-align: center">
                                         {{record.prescription&&record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:'/'}}
                                     </div>
-                                    L
+                                      ml
                                     </div>
                                 </div>
 

src/xt_pages/dialysis/batch_print/batch_print_order_three.vue

@@ -510,6 +510,8 @@
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '心衰')"></check-box>
                       <check-box text="腹痛"
                                  :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '腹痛')"></check-box>
+                      <check-box text="无"
+                                 :checked="isValueIndexOfCheck(record.assessment_after_dislysis, 'complication', '无')"></check-box>
                     </div>
                   </div>
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -10,8 +10,7 @@
         <li v-if="isShow('目标超滤量')">
           <label>目标超滤量 : </label>
           <span class="content">{{target_ultrafiltration != '0'?target_ultrafiltration:''}}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 6">{{target_ultrafiltration != '0'?"L":''}}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 6">{{target_ultrafiltration != '0'?"ml":''}}</span>
+          <span class="unit">{{target_ultrafiltration != '0'?"L":''}}</span>
 
         </li>
         <li v-if="isShow('首剂')">

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

@@ -40,10 +40,8 @@
 
 
           <el-col :span="8" v-if="isShows('目标超滤量')">
-            <el-form-item label="目标超滤量(ml)：" v-if="this.$store.getters.xt_user.template_info.template_id == 6">
-              <el-input type="number" v-model="dialysisPrescription.target_ultrafiltration"></el-input>
-            </el-form-item>
-            <el-form-item label="目标超滤量(L)："  v-if="this.$store.getters.xt_user.template_info.template_id != 6">
+
+            <el-form-item label="目标超滤量(L)：">
               <el-input type="number" v-model="dialysisPrescription.target_ultrafiltration"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -750,7 +750,8 @@
                                  showValue='心衰'></label-box>
                       <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
-
+                      <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                                 showValue='无'></label-box>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -691,6 +691,8 @@
                                  showValue='心衰'></label-box>
                       <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
+                      <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                                 showValue='无'></label-box>
 
                     </td>
                     <td></td>
@@ -1048,7 +1050,7 @@
           DeviceNumber: []
         },
         operatorMaps: {},
-        complications: ['低血压', '高血压', '心律失常', '头晕', '头痛', '呕吐', '抽搐', '出血', '心衰', '腹痛'],
+        complications: ['低血压', '高血压', '心律失常', '头晕', '头痛', '呕吐', '抽搐', '出血', '心衰', '腹痛','无'],
         jilurow: 0,
         advice_jilurow: 0,
         loading: false,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -445,7 +445,7 @@
                         <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;" >
                           <span v-if="advice.parent_id > 0">---></span>
                           <span >{{advice.advice_name }}</span>
-                          <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                          <span v-if="advice&&advice.advice_desc">({{advice.advice_desc}}{{advice.drug_spec_unit}})</span>
                           <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{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.delivery_way}}</span>
@@ -553,11 +553,67 @@
       <div class="row" style="margin-top:-11px;position: relative;">
         <table class="proj_table">
           <tbody>
+          <template v-if="doctor_advices_2.length > 0">
+            <tr style="line-height:35px;padding:8px 5px;">
+              <td colspan="7" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">医嘱内容</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 in doctor_advices" > -->
+            <tr v-for="(advice, advice_index) in doctor_advices_2" :key="advice_index" >
+              <td height="32px" >
+                  <span v-if="advice.start_time">
+                    {{getTime(advice.start_time,'{h}:{i}')}}
+                  </span>
+                <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
+              </td>
+              <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;" >
+                <span v-if="advice.parent_id > 0">---></span>
+                <span >{{advice.advice_name }}</span>
+                <span v-if="advice&&advice.advice_desc">({{advice.advice_desc}}{{advice.drug_spec_unit}})</span>
+                <span v-if="advice.prescribing_number"> &nbsp;&nbsp; {{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.delivery_way}}</span>
+                <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 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="32px">
+                <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{getAdminUser(advice.advice_doctor)}}</span>
+                <img style="height:20px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else>
+              </td>
+              <!-- <td height="35px">
+                <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
+                <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
+              </td> -->
+              <td height="32px">
+                <span v-if="setAdminUserES(advice.execution_staff) == ''">{{getAdminUser(advice.execution_staff)}}</span>
+                <img style="height:20px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else>
+              </td>
+              <td height="32px">
+                <span v-if="advice.execution_time">{{getTime(advice.execution_time,'{h}:{i}')}}</span>
+              </td>
+            </tr>
+          </template>
 
-
-          <tr><td colspan="2"  style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">透析后情况</td></tr>
+          <tr><td colspan="7"  style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">透析后情况</td></tr>
           <tr>
-            <td>
+            <td colspan="7">
               <div class="row" style="padding: 2px 0;line-height:23px; display:flex;">
                 <div class="inline_block" style="flex:1;" >
                   T：
@@ -666,7 +722,7 @@
             </td>
           </tr>
           <tr>
-            <td>
+            <td colspan="7">
               <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                 <div class="inline_block" style="flex:1;">
                   穿刺护士：
@@ -818,6 +874,7 @@
         org_template_info: {},
 
         doctor_advices: [],
+        doctor_advices_2: [],
         advice_groups: [],
         advice_groups_2: [],
         print_length : 0,
@@ -1155,7 +1212,6 @@
             this.advices.push(item)
           }
           this.loading = false
-
           this.doctor_advices = response.data.data.advices == null ? [] : response.data.data.advices
 
           for (let index = 0; index < this.doctor_advices.length; index++) {
@@ -1240,7 +1296,6 @@
           //    this.advice_groups.push(group)
           //   }
           // }
-
           if (this.doctor_advices.length <= 6) {
             var nl = 6
             this.print_length = 6
@@ -1253,7 +1308,23 @@
               }
             }
           }
+
           this.totollength = this.doctor_advices.length + this.monitors.length
+          if (this.totollength > 18) {
+            var temp_advice_length = 17 - this.monitors.length;
+            var doctor_advices_1 = []
+            var doctor_advices_2 = []
+            for (let index = 0; index < this.doctor_advices.length; index++) {
+              const element = this.doctor_advices[index];
+              if (temp_advice_length > index) {
+                doctor_advices_1.push(element)
+              } else {
+                doctor_advices_2.push(element)
+              }
+            }
+            this.doctor_advices = doctor_advices_1
+            this.doctor_advices_2 = doctor_advices_2
+          }
           console.log(this.advice_groups)
         } else {
           this.loading = false

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -725,7 +725,8 @@
                                  showValue='心衰'></label-box>
                       <label-box :isChecked="afterdialysis.complications_index.indexOf('腹痛')>-1?true:false"
                                  showValue='腹痛'></label-box>
-
+                      <label-box :isChecked="afterdialysis.complications_index.indexOf('无')>-1?true:false"
+                                 showValue='无'></label-box>
                     </td>
                     <td></td>
                   </tr>

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -820,8 +820,8 @@
               </div>
               <div class="inline_block">
                 &emsp;实际超滤量：
-                <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(prescription.ultrafiltration)">
-                  {{getFloat(prescription.ultrafiltration)}}
+                <div class="under_line" style="width: 70px;text-align: left" v-if="getFloat(afterdialysis.actual_ultrafiltration)">
+                  {{getFloat(afterdialysis.actual_ultrafiltration)}}
                 </div>
                 <div class="under_line" style="width: 70px;" v-else>
                   {{'/'}}

src/xt_pages/user/dialysisSolution.vue

@@ -27,7 +27,7 @@
           label="透析模式"
           min-width="50">
           <template slot-scope="scope">
-            {{scope.row.mode_name}}
+            {{modeOptions[scope.row.mode_id].name}}
           </template>
         </el-table-column>
         <el-table-column
@@ -36,7 +36,7 @@
           label="透析时长"
           min-width="50">
           <template slot-scope="scope">
-            {{scope.row.dialysis_duration}}h
+            {{scope.row.dialysis_duration_hour}} 小时 {{scope.row.dialysis_duration_minute}} 分钟
           </template>
         </el-table-column>
         <!-- <el-table-column
@@ -58,16 +58,16 @@
               <span >{{scope.row.name}}{{scope.row.sub_name}}</span>
           </template>
         </el-table-column> -->
-        <el-table-column
-          prop="doctor"
-          label="医生"
-          align="center"
-          min-width="110">
-          <template slot-scope="scope">
-            <span>{{getAdminUserName(scope.row.doctor)}}</span>
-          </template>
+        <!--<el-table-column-->
+          <!--prop="doctor"-->
+          <!--label="医生"-->
+          <!--align="center"-->
+          <!--min-width="110">-->
+          <!--<template slot-scope="scope">-->
+            <!--<span>{{getAdminUserName(scope.row.doctor)}}</span>-->
+          <!--</template>-->
 
-        </el-table-column>
+        <!--</el-table-column>-->
 
         <el-table-column
           prop="updated_time"
@@ -144,7 +144,6 @@
 
           <el-col :span="8" v-if="isShows('透析时长')">
             <el-form-item label="透析时长（h）:" prop="dialysis_duration">
-              <!-- <el-input v-model="addPlan.dialysis_duration"></el-input> -->
               <el-time-picker
                 v-model="dialysisTimeShow"
                 :picker-options="{
@@ -293,8 +292,8 @@
           </el-col>
 
 
-          <el-col :span="8" v-if="isShows('碳酸氢根')">
-            <el-form-item label="碳酸氢根（mmol/L）: " prop="bicarbonate">
+          <el-col :span="8" v-if="isShows('碳酸氢盐')">
+            <el-form-item label="碳酸氢盐（mmol/L）: " prop="bicarbonate">
               <el-input v-model="addPlan.bicarbonate"></el-input>
             </el-form-item>
           </el-col>
@@ -691,52 +690,27 @@
       }
     },
     watch: {
-      'addPlan.anticoagulant_shouji': function() {
-
-        if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_weichi == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_weichi != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_shouji == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_shouji != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(this.addPlan.anticoagulant_shouji)
-
-        }
-        // if(this.addPlan.anticoagulant_zongliang  === NaN){
-        //   console.log("222222")
-        //
-        //   this.addPlan.anticoagulant_zongliang = ''
-        // }
-        if(isNaN(this.addPlan.anticoagulant_zongliang)){
-          this.addPlan.anticoagulant_zongliang = ''
-
-        }
-
+      "addPlan.dialysis_duration":function(){
+        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        );
       },
-      'addPlan.anticoagulant_weichi': function() {
-        if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_weichi == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_weichi != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(this.addPlan.anticoagulant_weichi)
-        } else if (this.addPlan.anticoagulant_shouji != '' && this.addPlan.anticoagulant_shouji == '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(this.addPlan.anticoagulant_shouji) + parseInt(0)
-        } else if (this.addPlan.anticoagulant_shouji == '' && this.addPlan.anticoagulant_shouji != '') {
-          this.addPlan.anticoagulant_zongliang = parseInt(0) + parseInt(this.addPlan.anticoagulant_shouji)
-        }
-
-        if(isNaN(this.addPlan.anticoagulant_zongliang)){
-          this.addPlan.anticoagulant_zongliang = ''
-
-        }
-
-        // console.log(this.addPlan.anticoagulant_zongliang)
-
-        // if(this.addPlan.anticoagulant_zongliang  === NaN){
-        // }
-
+      "addPlan.anticoagulant_shouji":function(){
+        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        );
       },
-
+      "addPlan.anticoagulant_weichi":function(){
+        this.addPlan.anticoagulant_zongliang=calculateAnticoagulantZL(1,
+          this.addPlan.anticoagulant_shouji,
+          this.addPlan.dialysis_duration,
+          this.addPlan.anticoagulant_weichi
+        );
+      }
     },
     components: {
       tableTitle, PatientSidebar
@@ -754,7 +728,7 @@
 
       selectnDialysisTime(val) {
         var valTime = val.split(':')
-        this.addPlan.dialysis_duration = valTime[0] + '.' + valTime[1]
+        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]
       },

src/xt_pages/workforce/components/tableData.vue

@@ -14,7 +14,7 @@
 
         <el-table-column label="姓名" width="120">
           <template slot-scope="scope">
-            {{ scope.row.patient}}
+            {{scope.row.patient}}
           </template>
         </el-table-column>
         <el-table-column label="透析日期" width="200">
@@ -1078,7 +1078,7 @@
                     zone_device_map[device_number.zone.name].push(device_number)
                   }
                   this.zone_device_map = zone_device_map
-  
+
                   this.zone_names = Object.keys(this.zone_device_map)
                   if (this.zone_names.length > 0) {
                     this.zone_name = this.zone_names[0]