hah阿凡达

src/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo.vue

@@ -334,142 +334,224 @@
                 <td>执行者签名</td>
                 <td>核对者签名</td>
               </tr>
-              <template v-if="record.advices">
-                <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
-                  <td height="35px">
-                    <span v-if="advice[0].start_time">
-                      {{ getTime(advice[0].start_time, "{h}:{i}") }}
-                    </span>
-                  </td>
-
-                  <td height="26px" colspan="2" class="advice-name" style="padding-left: 7px">
-                    <div>
-                      <span v-if="advice[0].parent_id > 0">---></span>
-                      <span>{{ advice[0].advice_name }}</span>
-
-                      <span v-if="advice[0].prescribing_number">&nbsp;&nbsp; {{ advice[0].prescribing_number
-                        }}{{ advice[0].prescribing_number_unit }}</span>
-                      <span v-if="advice[0].single_dose != 0">
-
-                        <span
-                          v-if="advice[0].advice_name != '血液透析滤过' && advice[0].advice_name != '血液透析' && advice[0].advice_name != '电脑血糖监测'">
-                          {{ advice[0].single_dose }}{{ advice[0].single_dose_unit }}</span>
+              <template v-if="record.advices && org_id !=10751">
+               
+                  <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
+                    <td height="35px">
+                      <span v-if="advice[0].start_time">
+                        {{ getTime(advice[0].start_time, "{h}:{i}") }}
                       </span>
+                    </td>
+
+                    <td height="26px" colspan="2" class="advice-name" style="padding-left: 7px">
+                      <div>
+                        <span v-if="advice[0].parent_id > 0">---></span>
+                        <span>{{ advice[0].advice_name }}</span>
+
+                        <span v-if="advice[0].prescribing_number">&nbsp;&nbsp; {{ advice[0].prescribing_number
+                          }}{{ advice[0].prescribing_number_unit }}</span>
+                        <span v-if="advice[0].single_dose != 0">
+
+                          <span
+                            v-if="advice[0].advice_name != '血液透析滤过' && advice[0].advice_name != '血液透析' && advice[0].advice_name != '电脑血糖监测'">
+                            {{ advice[0].single_dose }}{{ advice[0].single_dose_unit }}</span>
+                        </span>
+
+                        <span v-if="advice[0].parent_id == 0">{{
+                          advice[0].delivery_way
+                        }}</span>
+                        <span v-if="advice[0].parent_id == 0">{{
+                          advice[0].execution_frequency
+                        }}</span>
+                        <!-- <span
+                          v-if="
+                            advice[0].parent_id == 0 &&
+                            advice[0].remark.length > 0
+                          "
+                          >({{ advice[0].remark }})</span
+                        > -->
+                      </div>
+                    </td>
+
+                    <td height="35px">
+                      <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: 40px" />
+                    </td>
 
-                      <span v-if="advice[0].parent_id == 0">{{
-                        advice[0].delivery_way
+                    <td height="35px">
+                      <span v-if="advice[0].execution_time">{{
+                        getTime(advice[0].execution_time, " {h}:{i}")
                       }}</span>
-                      <span v-if="advice[0].parent_id == 0">{{
-                        advice[0].execution_frequency
+                    </td>
+
+                    <td height="35px">
+                      <span v-if="
+                        setAdminUserES(
+                          advice[0],
+                          'execution_staff'
+                        ) == ''
+                      ">{{
+                        getAdminUser(advice[0], "execution_staff")
                       }}</span>
-                      <!-- <span
-                        v-if="
-                          advice[0].parent_id == 0 &&
-                          advice[0].remark.length > 0
-                        "
-                        >({{ advice[0].remark }})</span
-                      > -->
-                    </div>
-                  </td>
-
-                  <td height="35px">
-                    <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: 40px" />
-                  </td>
-
-                  <td height="35px">
-                    <span v-if="advice[0].execution_time">{{
-                      getTime(advice[0].execution_time, " {h}:{i}")
-                    }}</span>
-                  </td>
-
-                  <td height="35px">
-                    <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: 40px" />
-                  </td>
-
-                  <td height="35px">
-                    <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: 40px" />
-                  </td>
-                </tr>
-                <tr v-for="(advice, advice_index) in record.his_advices" :key="advice_index">
-                  <td height="35px">
-                    <span v-if="advice.start_time">
-                      {{ getTime(advice.start_time, "{h}:{i}") }}
-                    </span>
-                  </td>
-
-                  <td height="35px" colspan="2" class="advice-name" style="padding-left: 7px">
-                    <div>
-                      <span v-if="advice.parent_id > 0">---></span>
-                      <span>{{ advice.advice_name }}</span>
-                      <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number
-                        }}{{ advice.prescribing_number_unit }}</span>
-                      <span v-if="advice.single_dose != 0">
-                        <span
-                          v-if="advice.advice_name != '血液透析滤过' && advice.advice_name != '血液透析' && advice.advice_name != '电脑血糖监测'">
-                          {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
-                      </span>
-
-                      <span v-if="advice.parent_id == 0">{{
-                        advice.delivery_way
+                      <img class="es-img" :src="setAdminUserES(advice[0], 'execution_staff')
+                        " alt="" srcset="" v-else style="height: 40px" />
+                    </td>
+
+                    <td height="35px">
+                      <span v-if="
+                        setAdminUserES(
+                          advice[0],
+                          'checker'
+                        ) == ''
+                      ">{{
+                        getAdminUser(advice[0], "checker")
                       }}</span>
-                      <span v-if="advice.parent_id == 0">{{
-                        advice.execution_frequency
+                      <img class="es-img" :src="setAdminUserES(advice[0], 'checker')
+                        " alt="" srcset="" v-else style="height: 40px" />
+                    </td>
+                  </tr>
+                  <tr v-for="(advice, advice_index) in record.his_advices" :key="advice_index">
+                    <td height="35px">
+                      <span v-if="advice.start_time">
+                        {{ getTime(advice.start_time, "{h}:{i}") }}
+                      </span>
+                    </td>
+
+                    <td height="35px" colspan="2" class="advice-name" style="padding-left: 7px">
+                      <div>
+                        <span v-if="advice.parent_id > 0">---></span>
+                        <span>{{ advice.advice_name }}</span>
+                        <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number
+                          }}{{ advice.prescribing_number_unit }}</span>
+                        <span v-if="advice.single_dose != 0">
+                          <span
+                            v-if="advice.advice_name != '血液透析滤过' && advice.advice_name != '血液透析' && advice.advice_name != '电脑血糖监测'">
+                            {{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                        </span>
+
+                        <span v-if="advice.parent_id == 0">{{
+                          advice.delivery_way
+                        }}</span>
+                        <span v-if="advice.parent_id == 0">{{
+                          advice.execution_frequency
+                        }}</span>
+                      </div>
+                    </td>
+
+                    <td height="35px">
+                      <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 style="height: 30px" />
+                    </td>
+                    <td height="35px">
+                      <span v-if="advice.execution_time">{{
+                        getTime(advice.execution_time, " {h}:{i}")
                       }}</span>
-                    </div>
-                  </td>
-
-                  <td height="35px">
-                    <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 style="height: 30px" />
-                  </td>
-                  <td height="35px">
-                    <span v-if="advice.execution_time">{{
-                      getTime(advice.execution_time, " {h}:{i}")
-                    }}</span>
-                  </td>
-                  <td height="35px">
-                    <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 style="height: 30px" />
-                  </td>
-                  <td height="35px">
-                    <span v-if="setAdminUserES(advice,'checker') == ''">
-                      {{getAdminUser(advice, "checker")}}
-                    </span>
-                    <img class="es-img" :src="setAdminUserES(advice, 'checker')
-                      " alt="" srcset="" v-else style="height: 30px" />
-                  </td>
-                </tr>
+                    </td>
+                    <td height="35px">
+                      <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 style="height: 30px" />
+                    </td>
+                    <td height="35px">
+                      <span v-if="setAdminUserES(advice,'checker') == ''">
+                        {{getAdminUser(advice, "checker")}}
+                      </span>
+                      <img class="es-img" :src="setAdminUserES(advice, 'checker')
+                        " alt="" srcset="" v-else style="height: 30px" />
+                    </td>
+                  </tr>
+               
               </template>
+
+              <template v-if="record.new_advice_list && org_id ==10751">
+               
+               <tr v-for="(item, advice_index) in record.new_advice_list" :key="advice_index">
+                 <td height="35px">
+                   <span v-if="item.start_time">
+                     {{ getTime(item.start_time, "{h}:{i}") }}
+                   </span>
+                 </td>
+
+                 <td height="26px" colspan="2" class="advice-name" style="padding-left: 7px">
+                   <div>
+                     <span v-if="item.parent_id > 0">---></span>
+                     <span>{{ item.advice_name }}</span>
+
+                     <span v-if="item.prescribing_number">&nbsp;&nbsp; {{ item.prescribing_number
+                       }}{{ item.prescribing_number_unit }}</span>
+                     <span v-if=item.single_dose != 0">
+
+                       <span
+                         v-if="item.advice_name != '血液透析滤过' && item.advice_name != '血液透析' && item.advice_name != '电脑血糖监测'">
+                         {{ item.single_dose }}{{ item.single_dose_unit }}</span>
+                     </span>
+
+                     <span v-if="item.parent_id == 0">{{
+                       item.delivery_way
+                     }}</span>
+                     <span v-if="item.parent_id == 0">{{
+                      item.execution_frequency
+                     }}</span>
+                   
+                   </div>
+                 </td>
+
+                 <td height="35px">
+                   <span v-if="setAdminUserES(item, 'advice_doctor') == ''">
+                     {{
+                       getAdminUser(item, "advice_doctor")
+                     }}
+                   </span>
+                   <img class="es-img" :src="setAdminUserES(item, 'advice_doctor')
+                     " alt="" srcset="" v-else style="height: 40px" />
+                 </td>
+
+                 <td height="35px">
+                   <span v-if="item.execution_time">{{
+                     getTime(item.execution_time, " {h}:{i}")
+                   }}</span>
+                 </td>
+
+                 <td height="35px">
+                   <span v-if="
+                     setAdminUserES(
+                      item,
+                       'execution_staff'
+                     ) == ''
+                   ">{{
+                     getAdminUser(item, "execution_staff")
+                   }}</span>
+                   <img class="es-img" :src="setAdminUserES(item, 'execution_staff')
+                     " alt="" srcset="" v-else style="height: 40px" />
+                 </td>
+
+                 <td height="35px">
+                   <span v-if="
+                     setAdminUserES(
+                      item,
+                       'checker'
+                     ) == ''
+                   ">{{
+                     getAdminUser(item, "checker")
+                   }}</span>
+                   <img class="es-img" :src="setAdminUserES(item, 'checker')
+                     " alt="" srcset="" v-else style="height: 40px" />
+                 </td>
+               </tr>
+              
+           </template>
+
+             
             </table>
           </div>
           <div>
@@ -851,7 +933,20 @@ export default {
         var resp = rs.data;
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
+          if(this.org_id ==0 || this.org_id == 10751){
+
+            if(this.records!=null && this.records.length>0){
+              
+              for(let i=0;i<this.records.length;i++){
+                this.records[i].new_advice_list = []
+                this.records[i].new_advice_list.push(...this.records[i].advices)
+                this.records[i].new_advice_list.push(...this.records[i].his_advices)
+                this.records[i].new_advice_list.sort((a, b) => a.start_time - b.start_time)
+              }
+            }
 
+          }
+          console.log("reoces=====================",this.records)
           var tempmonitorflag = true;
           for (let i = 0; i < this.records.length; i++) {
 
@@ -1028,6 +1123,9 @@ export default {
               // this.records[x].his_advices =advice
             }
           }
+         
+        
+          console.log("record================",this.records)
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;

src/xt_pages/dialysis/details/index.vue

@@ -2298,6 +2298,13 @@ export default {
         }
 
         this.loading = false
+
+        if(this.org_id == 0 || this.org_id == 10751){
+          if(this.doctor_advices!=null && this.doctor_advices.length>0){
+            this.doctor_advices.sort((a, b) => a.start_time - b.start_time)
+          }
+         
+        }
       })
     },
     printOrder() {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1590,13 +1590,13 @@
                             <span v-if="org_id != 10644 && org_id != 0">{{ monitor.ultrafiltration_rate ?
                               monitor.ultrafiltration_rate : "" }}</span>
                             <span v-if="org_id == 10644">
-                              <!-- <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
+                              <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
                                 monitor.ultrafiltration_volume : "0" }}</span>
                               <span v-if="monindex == monitors.length - 1">{{ monitor.ultrafiltration_volume ?
                                 monitor.ultrafiltration_volume : "" }}</span>
                               <span v-if="(monindex != monitors.length - 1 && monindex != 0)">{{
-                                monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span> -->
-                                {{ monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:"0" }}
+                                monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span>
+                                <!-- {{ monitor.ultrafiltration_volume?monitor.ultrafiltration_volume:"" }} -->
                             </span>
                           </td>
                           <td v-if="

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -1030,11 +1030,18 @@ export default {
       }
     },
     getTime(value, temp) {
+
       if (value == 0) {
         return ''
       }
       if (value != undefined) {
-        return uParseTime(value, temp)
+        // console.log("时间", uParseTime(value, temp))
+        if(uParseTime(value, temp)!= "0:0"){
+          return uParseTime(value, temp)
+        }else{
+          return ""
+        }
+       
       }
       return ''
     },
@@ -1189,12 +1196,12 @@ export default {
        
           
           if (tableAdvice.length === 0) {
-            var obj = { advice_name: '', start_time: '' }
-            var obj1 = { advice_name: '', start_time: '' }
-            var obj2 = { advice_name: '', start_time: '' }
-            var obj3 = { advice_name: '', start_time: '' }
-            var obj4 = { advice_name: '', start_time: '' }
-            var obj5 = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
+            var obj1 = { advice_name: '', start_time: '2556115199000' }
+            var obj2 = { advice_name: '', start_time: '2556115199000' }
+            var obj3 = { advice_name: '', start_time: '2556115199000' }
+            var obj4 = { advice_name: '', start_time: '2556115199000' }
+            var obj5 = { advice_name: '', start_time: '2556115199000' }
             tableAdvice.push(obj)
             tableAdvice.push(obj1)
             tableAdvice.push(obj2)
@@ -1204,11 +1211,11 @@ export default {
             this.tableAdvice = tableAdvice
           }
           if (tableAdvice.length === 1) {
-            var obj = { advice_name: '', start_time: '' }
-            var obj1 = { advice_name: '', start_time: '' }
-            var obj2 = { advice_name: '', start_time: '' }
-            var obj3 = { advice_name: '', start_time: '' }
-            var obj4 = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
+            var obj1 = { advice_name: '', start_time: '2556115199000' }
+            var obj2 = { advice_name: '', start_time: '2556115199000' }
+            var obj3 = { advice_name: '', start_time: '2556115199000' }
+            var obj4 = { advice_name: '', start_time: '2556115199000' }
             tableAdvice.push(obj)
             tableAdvice.push(obj1)
             tableAdvice.push(obj2)
@@ -1217,10 +1224,10 @@ export default {
             this.tableAdvice = tableAdvice
           }
           if (tableAdvice.length === 2) {
-            var obj = { advice_name: '', start_time: '' }
-            var obj1 = { advice_name: '', start_time: '' }
-            var obj2 = { advice_name: '', start_time: '' }
-            var obj3 = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
+            var obj1 = { advice_name: '', start_time: '2556115199000' }
+            var obj2 = { advice_name: '', start_time: '2556115199000' }
+            var obj3 = { advice_name: '', start_time: '2556115199000' }
             tableAdvice.push(obj)
             tableAdvice.push(obj1)
             tableAdvice.push(obj2)
@@ -1229,11 +1236,11 @@ export default {
           }
           if (tableAdvice.length === 3) {
             // eslint-disable-next-line no-redeclare
-            var obj = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
             // eslint-disable-next-line no-redeclare
-            var obj1 = { advice_name: '', start_time: '' }
+            var obj1 = { advice_name: '', start_time: '2556115199000' }
             // eslint-disable-next-line no-redeclare
-            var obj2 = { advice_name: '', start_time: '' }
+            var obj2 = { advice_name: '', start_time: '2556115199000' }
             // eslint-disable-next-line no-redeclare
             tableAdvice.push(obj)
             tableAdvice.push(obj1)
@@ -1243,9 +1250,9 @@ export default {
           }
           if (tableAdvice.length === 4) {
             // eslint-disable-next-line no-redeclare
-            var obj = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
             // eslint-disable-next-line no-redeclare
-            var obj1 = { advice_name: '', start_time: '' }
+            var obj1 = { advice_name: '', start_time: '2556115199000' }
             // eslint-disable-next-line no-redeclare
 
             tableAdvice.push(obj)
@@ -1254,16 +1261,16 @@ export default {
           }
           if (tableAdvice.length === 5) {
             // eslint-disable-next-line no-redeclare
-            var obj = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
             // eslint-disable-next-line no-redeclare
-            var obj1 = { advice_name: '', start_time: '' }
+            var obj1 = { advice_name: '', start_time: '2556115199000' }
             tableAdvice.push(obj)
             this.tableAdvice = tableAdvice
           }
 
           if (tableAdvice.length >= 6 && tableAdvice.length <= 8) {
             const length = 6 - tableAdvice.length
-            var obj = { advice_name: '', start_time: '' }
+            var obj = { advice_name: '', start_time: '2556115199000' }
             for (i = 0; i < length; i++) {
               console.log(1)
               tableAdvice.push(obj)
@@ -1273,6 +1280,9 @@ export default {
           }else{
             this.tableAdvice = tableAdvice
           }
+
+
+          this.tableAdvice.sort((a, b) => a.start_time - b.start_time)
           this.afterdialysis = response.data.data.AssessmentAfterDislysis
           console.log('透后评估', this.afterdialysis)
           this.operators = response.data.data.operators

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
 //  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))