Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

build/cdn.json

 {
-  "version": "2999.999.13738"
+  "version": "2999.999.13744"
 }

src/pages/main/newActionBar/doctorAdvice.vue

 
             <div class="preserveBox">
               <div style="display: flex;justify-content: space-between;width: 100%;">
-                  <span v-if="his_is_open != 1" :class="{ forbid: is_has_create != true }" @click="showNew">新增</span>
+                  <span v-if="his_is_open != 1 || org_id == 10721" :class="{ forbid: is_has_create != true }" @click="showNew">新增</span>
+                 
                   <mu-date-input v-if="isShowExce && (org_id == 10215 || org_id == 4 || org_id == 9671 || org_id == 10340)" type="dateTime" class="dateInput" label="执行" v-model="newExecTime" @focus="onFocusExecTime" @change="execTimeFunc" container="dialog" :clock-type="'24hr'" actions></mu-date-input>
                   <span v-if="isShowExce && (org_id != 10215  && org_id != 4 && org_id!=9671 && org_id !=10340)" :class="{ forbid: is_has_exce != true || allForbidShow != true }" @click="execAdvice">执行</span>
                   <!-- <span v-if="isShowExce && (org_id ==10164 || org_id==10480)" :class="{ forbid: is_has_exce != true || allForbidShow != true }" @click="BatchExecAdvice">全部执行</span> -->
                   <span v-if="org_id!=10445 && org_id!=3877  && org_id !=10344 && org_id!=10597 && org_id!=10599 && org_id!=10624" :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || is_has_check != true || allForbidShow != true }" @click="checkAdvice">核对</span>
                  
                   <span v-if="org_id ==3877  || org_id ==10344" :class="{ forbid: (current_advice&& current_advice.parent_id > 0) || is_has_check != true || allForbidShow != true }" @click="checkAdviceOne">核对</span>
-                  <span v-if="his_is_open != 1" :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || is_has_create != true || allForbidShow != true }" @click="openNewChild">添加子药</span>
-                  <span v-if="his_is_open != 1" :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2 || (is_has_modify != true && is_has_modify_other != true) || allForbidShow != true || modifyOrDelete != true }" @click="modifyAdviceAction">修改</span>
-                  <span v-if="his_is_open != 1 && user_type !=3 " :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 || (is_has_del != true && is_has_del_other != true) || allForbidShow != true || modifyOrDelete != true , deleteColor : true }" @click="deleteAdviceAction">删除</span>
+                  <span v-if="his_is_open != 1 || org_id == 10721" :class="{ forbid: current_advice == null || current_advice.parent_id > 0 ||  currentAdvices.length != 1 || is_has_create != true || allForbidShow != true }" @click="openNewChild">添加子药</span>
+                  <span v-if="his_is_open != 1 || org_id == 10721" :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2 || (is_has_modify != true && is_has_modify_other != true) || allForbidShow != true || modifyOrDelete != true }" @click="modifyAdviceAction">修改</span>
+                  <span v-if="(his_is_open != 1 || org_id == 10721) && user_type !=3 " :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 || (is_has_del != true && is_has_del_other != true) || allForbidShow != true || modifyOrDelete != true , deleteColor : true }" @click="deleteAdviceAction">删除</span>
                   <!-- <span v-if="his_is_open != 1 && user_type ==3" @click="checkAllAdvice">全部核对</span> -->
               </div>
             </div>

src/pages/main/newActionBar/monitoring.vue

           this.form.displacement_quantity = (this.form.displacement_quantity/1000).toFixed(2)
        }
 
+       if(this.org_id == 10721){
+         this.form.venous_pressure = ""
+         this.form.transmembrane_pressure = ""
+       }
+
 
       // this.form.monitor_anticoagulant = resp.monitor.monitor_anticoagulant?resp.monitor.monitor_anticoagulant:''
       // this.form.monitor_anticoagulant_value = resp.monitor.monitor_anticoagulant_value?resp.monitor.monitor_anticoagulant_value:''

src/pages/main/today/TodayTab.vue

                       :dialysis_order="dialysis_order"
                       :is_advice_open="is_advice_open"
                       :prescription_prop="prescription"
-                      
+
                       ref="orders_dialog"></doctorAdvice>
         <!-- 双人核对 -->
         <doubleCheck v-if="barActive == 5" :patient_prop="patient" ref="doubleCheck"
           {{ total }}
         </span>
     </div>
-     
+
     <van-dialog v-model="dry_visibility"  width="90%"  show-cancel-button>
       <div style="margin:10px;height:100px; overflow-y: scroll;">
         <div style="">
         { title: '接诊评估', name: 'accepts_assessment', value: 0, is_show: 1 },
         { title: '透前评估', name: 'assessment_before', value: 0, is_show: 1 },
         { title: '临时医嘱', name: 'stat_order', value: 0, is_show: 0},
-       
+
         { title: '双人核对', name: 'double_check', value: 0, is_show: 2 },
         { title: '透析上机', name: 'dialysis_computer', value: 0, is_show: 2},
         { title: '透析监测', name: 'dialysis_monitoring', value: 0, is_show: 2 },
         { title: '透后评估', name: 'assessment_after', value: 0, is_show: 1},
         { title: '治疗小结', name: 'treatment_of', value: 0, is_show: 1},
         { title: '耗材出库', name: 'dialysis_consumables', value: 0, is_show: 0},
-      
-       
+
+
       ]
       if (!isNaN(this.prescribeOne.id) && this.prescribeOne.id > 0 && this.prescribeOne.creater > 0) {
         steps[1].value = 1
       this.dx = this.moveBtn.offsetLeft
       this.dy = this.moveBtn.offsetTop
       console.log('this.moveBtn.offsetLeft',this.moveBtn.offsetLeft);
-      
+
     },
     move (event) {
       if (this.flags) {
       if (popupIndex >= 0) {
         if (popupIndex == 4) {
           if (this.his_is_open == 1) {
-            if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+            if(this.$store.getters.user.template_info.org_id!=10721){
+              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
               this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
-            } else {
+              } else {
+                this.menuList[popupIndex].showPopup = true
+              }
+            }else {
               this.menuList[popupIndex].showPopup = true
             }
+           
           } else {
             this.menuList[popupIndex].showPopup = true
           }
 
           var all_projcet = []
 
-         
+
 
           if (this.$store.getters.user.template_info.org_id == 10318) {
             var project = resp.data.project // 项目
                   console.log("arr----------------",arr)
                   this.project.push(...arr)
                 }
-              
+
               }
-            
+
             }
 
           }
               his_doctor_advices[i]['origin'] = 2
               his_doctor_advices[i]['way'] = 1
               if (doctor_advices != null) {
-                 
+
                 //针对 濉溪杏康血液透析中心
                 if(this.$store.getters.user.template_info.org_id == 10721){
                   if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1 && his_doctor_advices[i].delivery_way.indexOf("口服")==-1){
                   doctor_advices.push(his_doctor_advices[i])
                 }
 
-               
+
               } else {
                   doctor_advices = []
                   //针对 濉溪杏康血液透析中心
             this.blood_access_part_opera_name = this.getBloodAccessOpera(this.prescription.blood_access)
           }
           }
-         
+
 
           if (this.his_is_open != 1) {
             if (this.doctor_advices.length > 0) {
           this.is_project_open = resp.data.is_project_open_config.is_open
 
           console.log("项目姐夫------------------------",this.project)
-          
+
           if (this.project != null && this.is_project_open == 1) {
             this.project.map(item => {
               let obj = {
               setTimeout(() => {
                 if (index == 4) {
                   if (this.his_is_open == 1) {
-                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                    if(this.$store.getters.user.template_info.org_id!=10721){
+                      if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                       this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                     } else {
                       this.$nextTick(() => {
                         this.barActive = index
                       })
                     }
+                    }else{
+                      this.$nextTick(() => {
+                        this.barActive = index
+                      })
+                    }
+                  
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
             this.requestDialysisRecord()
             if (index == 4) {
               if (this.his_is_open == 1) {
-                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                if(this.$store.getters.user.template_info.org_id!=10721){
+                  if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                   this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                 } else {
                   this.$nextTick(() => {
                     this.barActive = index
                   })
                 }
+                }else{
+                  this.$nextTick(() => {
+                    this.barActive = index
+                  })
+                }
+               
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
         } else {
           if (index == 4) {
             if (this.his_is_open == 1) {
-              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+              if(this.$store.getters.user.template_info.org_id!=10721){
+                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                 this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
                 })
               }
+              }else{
+                this.$nextTick(() => {
+                  this.barActive = index
+                })
+              }
+             
             } else {
               this.$nextTick(() => {
                 this.barActive = index
                 // this.requestDialysisRecord()
                 if (index == 4) {
                   if (this.his_is_open == 1) {
-                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                    if(this.$store.getters.user.template_info.org_id!=10721){
+                      if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                       this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                     } else {
                       this.$nextTick(() => {
                         this.barActive = index
                       })
                     }
+                    }else{
+                      this.$nextTick(() => {
+                        this.barActive = index
+                      })
+                    }
+                   
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
               this.requestDialysisRecord()
               if (index == 4) {
                 if (this.his_is_open == 1) {
-                  if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                  if(this.$store.getters.user.template_info.org_id!=10721){
+                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                     this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
                     })
                   }
+                  }else{
+                    this.$nextTick(() => {
+                      this.barActive = index
+                    })
+                  }
+                
                 } else {
                   this.$nextTick(() => {
                     this.barActive = index
         } else {
           if (index == 4) {
             if (this.his_is_open == 1) {
-              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+              if(this.$store.getters.user.template_info.org_id!=10721){
+                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                 this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
                 })
               }
+              }else{
+                this.$nextTick(() => {
+                  this.barActive = index
+                })
+              }
+           
             } else {
               this.$nextTick(() => {
                 this.barActive = index
               // this.requestDialysisRecord()
                 if (index == 4) {
                   if (this.his_is_open == 1) {
-                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                    if(this.$store.getters.user.template_info.org_id!=10721){
+                      if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                       this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                     } else {
                       this.$nextTick(() => {
                         this.barActive = index
                       })
                     }
+                    }else{
+                      this.$nextTick(() => {
+                        this.barActive = index
+                      })
+                    }
+                   
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
               this.requestDialysisRecord()
               if (index == 4) {
                 if (this.his_is_open == 1) {
-                  if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                  if(this.$store.getters.user.template_info.org_id!=10721){
+                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                     this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
                     })
                   }
+                  }else{
+                    this.$nextTick(() => {
+                      this.barActive = index
+                    })
+                  }
+                 
                 } else {
                   this.$nextTick(() => {
                     this.barActive = index
         } else {
           if (index == 4) {
             if (this.his_is_open == 1) {
-              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+              if(this.$store.getters.user.template_info.org_id!=10721){
+                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                 this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
                 })
               }
+              }else{
+                this.$nextTick(() => {
+                  this.barActive = index
+                })
+              }
+            
             } else {
               this.$nextTick(() => {
                 this.barActive = index
                 // this.requestDialysisRecord()
                 if (index == 4) {
                   if (this.his_is_open == 1) {
-                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                    if(this.$store.getters.user.template_info.org_id!=10721){
+                      if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                       this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                     } else {
                       this.$nextTick(() => {
                         this.barActive = index
                       })
                     }
+                    }else{
+                      this.$nextTick(() => {
+                        this.barActive = index
+                      })
+                    }
+                   
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
               this.requestDialysisRecord()
               if (index == 4) {
                 if (this.his_is_open == 1) {
-                  if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                  if(this.$store.getters.user.template_info.org_id!=10721){
+                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                     this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
                     })
                   }
+                  }else{
+                    this.$nextTick(() => {
+                      this.barActive = index
+                    })
+                  }
+                 
                 } else {
                   this.$nextTick(() => {
                     this.barActive = index
         } else {
           if (index == 4) {
             if (this.his_is_open == 1) {
-              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+              if(this.$store.getters.user.template_info.org_id!=10721){
+                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                 this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
                 })
               }
+              }else{
+                this.$nextTick(() => {
+                  this.barActive = index
+                })
+              }
+            
             } else {
               this.$nextTick(() => {
                 this.barActive = index
                 // this.requestDialysisRecord()
                 if (index == 4) {
                   if (this.his_is_open == 1) {
-                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                    if(this.$store.getters.user.template_info.org_id!=10721){
+                      if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                       this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                     } else {
                       this.$nextTick(() => {
                         this.barActive = index
                       })
                     }
+                    }else{
+                      this.$nextTick(() => {
+                        this.barActive = index
+                      })
+                    }
+                   
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
               this.requestDialysisRecord()
               if (index == 4) {
                 if (this.his_is_open == 1) {
-                  if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                  if(this.$store.getters.user.template_info.org_id!=10721){
+                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                     this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
                     })
                   }
+                  }else{
+                    this.$nextTick(() => {
+                      this.barActive = index
+                    })
+                  }
+                 
                 } else {
                   this.$nextTick(() => {
                     this.barActive = index
         } else {
           if (index == 4) {
             if (this.his_is_open == 1) {
-              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+              if(this.$store.getters.user.template_info.org_id!=10721){
+                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                 this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
                 })
               }
+              }else{
+                this.$nextTick(() => {
+                  this.barActive = index
+                })
+              }
+             
             } else {
               this.$nextTick(() => {
                 this.barActive = index
                 // this.requestDialysisRecord()
                 if (index == 4) {
                   if (this.his_is_open == 1) {
-                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                    if(this.$store.getters.user.template_info.org_id!=10721){
+                      if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                       this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                     } else {
                       this.$nextTick(() => {
                         this.barActive = index
                       })
                     }
+                    }else{
+                      this.$nextTick(() => {
+                        this.barActive = index
+                      })
+                    }
+                   
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
               this.requestDialysisRecord()
               if (index == 4) {
                 if (this.his_is_open == 1) {
-                  if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+                  if(this.$store.getters.user.template_info.org_id!=10721){
+                    if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                     this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
                   } else {
                     this.$nextTick(() => {
                       this.barActive = index
                     })
                   }
+                  }else{
+                    this.$nextTick(() => {
+                      this.barActive = index
+                    })
+                  }
+                 
                 } else {
                   this.$nextTick(() => {
                     this.barActive = index
         } else {
           if (index == 4) {
             if (this.his_is_open == 1) {
-              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+              if(this.$store.getters.user.template_info.org_id!=10721){
+                if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
                 this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
               } else {
                 this.$nextTick(() => {
                   this.barActive = index
                 })
               }
+              }else{
+                this.$nextTick(() => {
+                  this.barActive = index
+                })
+              }
+             
             } else {
               this.$nextTick(() => {
                 this.barActive = index
         // this.requestDialysisRecord()
         if (index == 4) {
           if (this.his_is_open == 1) {
-            if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
+            if(this.$store.getters.user.template_info.org_id!=10721){
+              if (this.$store.getters.user.user.user_type == 1 || this.$store.getters.user.user.user_type == 2) {
               this.$router.push('/dialysis/hisOrder?id=' + this.$route.query.patient_id + '&record_date=' + parseTime(this.$route.query.date, '{y}-{m}-{d}'))
             } else {
               this.$nextTick(() => {
                 this.barActive = index
               })
             }
+            }else{
+              this.$nextTick(() => {
+                this.barActive = index
+              })
+            }
+          
           } else {
             this.$nextTick(() => {
               this.barActive = index