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

build/cdn.json

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

src/pages/main/dialog/DoubleDialog.vue

             </van-checkbox-group>
           </div>
           <van-field
+           v-if="this.$store.getters.user.template_info.org_id!=10721 && this.$store.getters.user.template_info.org_id!=10164" 
             v-model="first_check_time_str"
             readonly
             @click="selectFirstCheckTimeAction"
             </template>
           </van-cell>
           <van-field
+            v-if="this.$store.getters.user.template_info.org_id!=10721 && this.$store.getters.user.template_info.org_id!=10164" 
             v-model="check_time_str"
             readonly
             @click="selectSecondCheckTimeAction"
             label="第二核对时间"
             input-align="right"
           />
-          <van-cell title="第二核对人员">
+          <van-cell title="第二核对人员"  v-if="this.$store.getters.user.template_info.org_id!=10721 && this.$store.getters.user.template_info.org_id!=10164">
             <template #label>
               <van-radio-group
                 class="doctorList"

src/pages/main/newActionBar/consumables.vue

           var config = res.data.config
           var outConfig = res.data.outConfig
           this.out_open = outConfig.is_open
-         
-
+        
           var settleConfig = res.data.settleConfig
           this.settle_open = settleConfig.is_open
           this.good_type_list  =  res.data.good_type
 
           this.list = []
-          if ((res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user != null) || (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].project != null)) {
-            this.uploadMethod = 1
-          } else {
-            this.uploadMethod = 2
+          
+          if(this.$store.getters.user.template_info.org_id!=10164 && this.$store.getters.user.template_info.org_id!=10721){
+              if ((res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user != null) || (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].project != null)) {
+              this.uploadMethod = 1
+            } else {
+              this.uploadMethod = 2
+            }
+
+            if (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user == null && res.data.dialysis_goods[0].project.length == 0) {
+              this.color = 2
+            }
           }
 
-          if (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user == null && res.data.dialysis_goods[0].project.length == 0) {
-            this.color = 2
+          if(this.$store.getters.user.template_info.org_id==10164 || this.$store.getters.user.template_info.org_id ==10721){
+
+            if ((res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user != null) || (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0)) {
+              this.uploadMethod = 1
+            } else {
+              this.uploadMethod = 2
+            }
+
+            if (res.data.dialysis_goods[0].good_user.length == 0 && res.data.dialysis_goods[0].good_user_detail.length == 0 && res.data.dialysis_goods[0].last_good_user == null) {
+              this.color = 2
+            }
           }
 
+        
+
           for (let i = 0; i < res.data.dialysis_goods.length; i++) {
-            if (res.data.dialysis_goods[i].good_user.length > 0) {
+            console.log("中国=======================",res.data.dialysis_goods[i].good_user)
+            var goodUserList = []
+            if(res.data.dialysis_goods[i].good_user!=null){
+               for(let s=0;s<res.data.dialysis_goods[i].good_user.length;s++){
+                res.data.dialysis_goods[i].good_user[s].out_stock = 0
+                 res.data.dialysis_goods[i].good_user[s].out_stock = this.getOutStock(res.data.dialysis_goods[i].good_user[s].info.good_type_id)
+               }
+            }
+
+            if(res.data.dialysis_goods[i].good_user!=null){
+               for(let s=0;s<res.data.dialysis_goods[i].good_user.length;s++){
+                 if(res.data.dialysis_goods[i].good_user[s].out_stock == 1){
+                    goodUserList.push(res.data.dialysis_goods[i].good_user[s])
+                 }
+               }
+            }
+
+            console.log("hhahahahahhaah",goodUserList)
+            if (goodUserList.length > 0) {
+
               this.isShowButton = 2
             }
             if (res.data.dialysis_goods[i].good_user_detail.length > 0 && res.data.dialysis_goods[i].good_user.length > 0) {
           }
           //good_user 自动出库表    last_good_user (上次透析)  good_user_detail（准备表） last_good_user_detail（上次透析）
           for (let i = 0; i < res.data.dialysis_goods.length; i++) {
-            if (res.data.dialysis_goods[i].good_user.length > 0) {
+
+            if (goodUserList.length > 0) {
               for (let b = 0; b < res.data.dialysis_goods[i].good_user.length; b++) {
                 if (res.data.dialysis_goods[i].good_user[b].info.id > 0) {
                   let obj = {
                   }
                 }
               } else {
-                if (res.data.dialysis_goods[i].project.length > 0) {
+
+                if(this.$store.getters.user.template_info.org_id!=10164 && this.$store.getters.user.template_info.org_id!=10721){
+                  if (res.data.dialysis_goods[i].project.length > 0) {
                   for (let b = 0; b < res.data.dialysis_goods[i].project.length; b++) {
                     if (res.data.dialysis_goods[i].project[b].good_info.type.out_stock == 1) {
                       if (res.data.dialysis_goods[i].project[b].good_info.id > 0) {
                     }
                   }
                 }
+
+                
+                }
+
+                if(this.$store.getters.user.template_info.org_id == 10164 || this.$store.getters.user.template_info.org_id==10721){
+                   
+                  if (res.data.dialysis_goods[i].last_good_user_detail != null) {
+                    if (config != undefined && config.is_open != 1) {
+                      for (let b = 0; b < res.data.dialysis_goods[i].last_good_user_detail.length; b++) {
+                        if (res.data.dialysis_goods[i].last_good_user_detail[b].info.id > 0) {
+                          let obj = {
+                            good_type_id: res.data.dialysis_goods[i].last_good_user_detail[b].type.id,
+                            good_id: res.data.dialysis_goods[i].last_good_user_detail[b].info.id,
+                            type_name: res.data.dialysis_goods[i].last_good_user_detail[b].type.type_name,
+                            specification_name: res.data.dialysis_goods[i].last_good_user_detail[b].info.specification_name,
+                            count: res.data.dialysis_goods[i].last_good_user_detail[b].count.toString(),
+                            project_id: 0,
+                            old_count: 0,
+                            new_count: 0,
+                            good_type_id:res.data.dialysis_goods[i].last_good_user_detail[b].info.good_type_id,
+                          }
+                          console.log("寄44444444444444444444",this.list)
+                          this.list.push(obj)
+                        }
+                      }
+                    }
+                    if (config.is_open == 1) {
+                      this.list = []
+                    }
+                  }
+                }
+              
               }
             }
           }
           // 已经出库数据
           var warehouseOutList = res.data.warehouseOutList
           console.log('warehouseOutList', warehouseOutList)
+          
+        
+       
 
           var newWarehouseOutList = []
          
                   good_id:item.good_id,
                   child: [],
                   count:0,
+                  
                 }
               }
             })
           }
         
 
-          console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",this.list)
-          this.list = newArr
+         console.log("newArr=================",newArr)
+           
+          console.log("out_open--------------",this.out_open)
+          console.log("is_open----------------",this.is_open)
+          console.log("isShowButton++++++++++",this.isShowButton)
+          
+
+          
+          var newArrList = []
+          if(newArr!=null && newArr.length >0){
+            for(let i=0;i<newArr.length;i++){
+              newArr[i].out_stock = 0   
+              newArr[i].out_stock = this.getOutStock(newArr[i].good_type_id)
+            }
+          } 
+          console.log("我的杰哈回复的哈哈都返回啊涣发大号暗黑风",newArr)
+
+          if(newArr!=null && newArr.length>0){
+            for(let i=0;i<newArr.length;i++){
+              if(newArr[i].out_stock == 1){
+                newArrList.push(newArr[i])
+              }
+            }
+          }
+
+          console.log("哈哈哈哈会到的佛啊地方阿道夫",newArrList)
+         
+          this.list = newArrList
+          console.log("list=--------------",this.list)
 
           var prescription = res.data.prescribe
 
           var dialyszerArr = []
           var irrigationArr = []
           var dialysisStrainerArr = []
-          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480 && this.$store.getters.user.template_info.org_id != 10598 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10610 && this.$store.getters.user.template_info.org_id != 10265) {
+          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10402 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10489 && this.$store.getters.user.template_info.org_id != 10215 && this.$store.getters.user.template_info.org_id != 10485 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10278 && this.$store.getters.user.template_info.org_id != 10480 && this.$store.getters.user.template_info.org_id != 10598 && this.$store.getters.user.template_info.org_id != 10515 && this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10610 && this.$store.getters.user.template_info.org_id != 10265 && this.$store.getters.user.template_info.org_id != 10164 && this.$store.getters.user.template_info.org_id != 10726 && this.$store.getters.user.template_info.org_id != 10721) {
             if (prescription != null && res.data.dialysis_goods[0].good_user_detail.length == 0) {
               var dialysisDialyszers = prescription.dialysis_dialyszers
               var arr = dialysisDialyszers.split(',')
         }
       }
       return type_name
+    },
+    getOutStock(good_type_id){
+      var out_stock =0
+      for(let i=0;i<this.good_type_list.length;i++){
+        if(good_type_id == this.good_type_list[i].id){
+          out_stock = this.good_type_list[i].out_stock
+        }
+      }
+      return out_stock
     }
   },
   mounted () {

src/pages/main/newActionBar/dialysisPrescription.vue

               $store.getters.user.template_info.org_id!=10679 &&
               $store.getters.user.template_info.org_id!=10702 &&
               $store.getters.user.template_info.org_id!=10480 &&
-              $store.getters.user.template_info.org_id!=10510
+              $store.getters.user.template_info.org_id!=10510 &&
+              $store.getters.user.template_info.org_id!=10644 
 
             "
           >
               $store.getters.user.template_info.org_id!=10679 &&
               $store.getters.user.template_info.org_id!=10702 &&
               $store.getters.user.template_info.org_id!=10510 &&
-              $store.getters.user.template_info.org_id!=10480 
+              $store.getters.user.template_info.org_id!=10480 &&
+              $store.getters.user.template_info.org_id!=10644 
             "
           >
             <span

src/pages/main/newActionBar/doctorAdvice.vue

       
        params['check_time'] = checkTime
 
-       checkMobileDoctorAdvice(params)
-      .then(response => {
+       checkMobileDoctorAdvice(params).then(response => {
         if (response.data.state == 0) {
           Toast.fail('你没有权限核对医嘱！')
           if(response.data.code == 600000008){

src/pages/main/newActionBar/doubleCheck.vue

                       <van-checkbox name="k">肝素补液口未双保险夹闭</van-checkbox>
                   </van-checkbox-group>
               </div>
-              <van-field v-model="first_check_time_str" readonly @click="selectFirstCheckTimeAction" label="第一核对时间" input-align="right"/>
+              <van-field v-model="first_check_time_str" readonly @click="selectFirstCheckTimeAction" label="第一核对时间" input-align="right"v-if="org_id!=10721" />
               <van-cell title='第一核对人员' v-if="org_id!=10597">
                   <template #label>
                       <van-radio-group class="doctorList" v-model="doubleReview.creater">

src/pages/main/newActionBar/monitoring.vue

                     <span v-if="org_id==10644">{{item.transmembrane_pressure?item.transmembrane_pressure:''}}</span>
                   </td>
                   <td v-if="isShow('跨膜压1')" >{{item.transmembrane_pressure_one?item.transmembrane_pressure_one:'/'}}</td>
-                  <td v-if="isShow('超滤量') && (org_id==10551 || org_id ==10617 || org_id ==10629 || org_id ==10679 || org_id ==10693 || org_id ==10702)" >
+                  <td v-if="isShow('超滤量') && (org_id==10551 || org_id ==10617 || org_id ==10629 || org_id ==10679 || org_id ==10693 || org_id ==10702 || org_id ==10721)" >
                     {{item.ultrafiltration_volume?item.ultrafiltration_volume:'0'}}</td>
                   <td v-if="isShow('超滤量') && org_id!=10551 && org_id != 10617 && org_id!=10629 && org_id!=10679 && org_id!=10693 && org_id!=10702" >
                     <span v-if="org_id ==10612">
                   <td v-if="isShow('置换率')">{{item.replacement_rate?item.replacement_rate:''}}</td>
                   <td v-if="isShow('置换率1')">{{item.replacement_rate_one?item.replacement_rate_one:'/'}}</td>
                   <td v-if="isShow('置换量')" >
-                    <span v-if="org_id!=10702"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
-                    <span v-if="org_id==10702"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
+                    <span v-if="org_id!=10702 && org_id!=10721"> {{item.displacement_quantity?item.displacement_quantity:''}}</span> 
+                    <span v-if="org_id==10702 || org_id == 10721"> {{item.displacement_quantity?item.displacement_quantity:'0'}}</span> 
                   </td>
                  
                   <td v-if="isShow('SpO₂') && template_id != 6 && template_id != 10  && template_id != 11" >
                   <td v-if="isShow('置换液流量1')" >{{item.displacement_flow_quantity_one?item.displacement_flow_quantity_one:'/'}}</td>
                   <td v-if="isShow('透析液流量')" >{{item.dialysate_flow?item.dialysate_flow:''}}</td>
                   <td v-if="isShow('透析液流量1')" >{{item.dialysate_flow_one?item.dialysate_flow_one:'/'}}</td>
-                  <td v-if="isShow('超滤率')" >{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}}</td>
+                  <td v-if="isShow('超滤率')" >
+                    <span v-if="org_id==10702"> {{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}}</span>
+                    <span v-if="org_id!=10702"> {{item.ultrafiltration_rate?item.ultrafiltration_rate:''}}</span>
+                  </td>
                   <th v-if="isShow('超滤率2')" width="60px">{{ item.ultrafiltration_rate_one?item.ultrafiltration_rate_one:"/" }} <br /></th>
                   <th v-if="isShow('剩余肝素')" width="60px">{{item.heparin_one?item.heparin_one:"/"}} <br /> </th>
                   <td v-if="isShow('置换量1')" >{{item.displacement_quantity_one?item.displacement_quantity_one:'/'}}</td>

src/pages/main/template/DialysisPrintOrdereightyone.vue

                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
                         <td>{{monitor.replacement_rate ? monitor.replacement_rate : '/'}}</td>
                         <td>{{monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/' }}</td>
-                        <td>{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</td>
+                        <td>{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</td>
                         <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "/"}}</td>
                         <td>{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : ""}}</td>
                         <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</td>

src/pages/main/today/TodayTab.vue

 
           var all_projcet = []
 
+         
+
           if (this.$store.getters.user.template_info.org_id == 10318) {
             var project = resp.data.project // 项目
             if(project!=null && project.length > 0){
             }
 
           }
+          var new_all_project = []
+
+          var new_all_group = []
+
+          var good_list_group = []
+
+          //针对 10726 江西乐安祥康血液透析中心
+          if(this.$store.getters.user.template_info.org_id == 10726 || this.$store.getters.user.template_info.org_id == 10164){
+            var project = resp.data.project // 项目
+            if(project!=null && project.length > 0){
+              for (let i = 0; i < project.length; i++) {
+
+                if(project[i].type == 3){
+                  good_list_group.push(project[i])
+                }
 
-          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10635) {
+                if (project[i].type == 2 && project[i].team_id ==0) {
+                     new_all_project.push(project[i])
+                }
+
+                if (project[i].type == 2 && project[i].team_id > 0) {
+                     new_all_group.push(project[i])
+                }
+
+              }
+              if(good_list_group!=null && good_list_group.length>0){
+                this.project.push(...good_list_group)
+              }
+              if(new_all_project!=null && new_all_project.length>0){
+                this.project.push(...new_all_project)
+              }
+              console.log("项目组套名称----------------",new_all_group)
+              if(new_all_group!=null && new_all_group.length>0){
+                  let dataInfo = {}
+                  new_all_group.forEach((item, index) => {
+                  let { team_id } = item
+                  if (!dataInfo[team_id]) {
+                    dataInfo[team_id] = {
+                      team_id:item.team_id,
+                      id:item.team_id,
+                      advice_name:item.team.project_team,
+                      project_team:item.team.project_team,
+                      doctor:item.doctor,
+                      start_time:item.start_time,
+                      execution_time:item.execution_time,
+                      execution_state:item.execution_state,
+                      execution_staff:item.execution_staff,
+                      check_time:item.check_time,
+                      check_state:item.check_state,
+                      checker:item.checker,
+                      remark:'',
+                      parent_id:0,
+                      is_check_team:1,
+                      team:item.team,
+                      project:item.project,
+                      good_info:item.good_info,
+                      type:item.type,
+                      count:item.count,
+
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+                if(arr!=null && arr.length>0){
+                  console.log("arr----------------",arr)
+                  this.project.push(...arr)
+                }
+              
+              }
+            
+            }
+
+          }
+
+          if (this.$store.getters.user.template_info.org_id != 10318 && this.$store.getters.user.template_info.org_id != 10635 && this.$store.getters.user.template_info.org_id != 10726) {
             var project = resp.data.project
 
             if(project!=null && project.length>0){
               doctor_advices = []
             }
           }
-
+           console.log("医嘱his_doctor_advices--------------",his_doctor_advices)
           if (his_doctor_advices != null) {
             for (let i = 0; i < his_doctor_advices.length; i++) {
               his_doctor_advices[i]['origin'] = 2
               his_doctor_advices[i]['way'] = 1
               if (doctor_advices != null) {
-                doctor_advices.push(his_doctor_advices[i])
+                 
+                //针对 濉溪杏康血液透析中心
+                if(this.$store.getters.user.template_info.org_id == 10721){
+                  if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1){
+                    doctor_advices.push(his_doctor_advices[i])
+                  }
+                }else{
+                  doctor_advices.push(his_doctor_advices[i])
+                }
+
+               
               } else {
-                doctor_advices = []
-                doctor_advices.push(his_doctor_advices[i])
+                  doctor_advices = []
+                  //针对 濉溪杏康血液透析中心
+                  if(this.$store.getters.user.template_info.org_id == 10721){
+                    if(his_doctor_advices[i].execution_frequency.indexOf("上机前") == -1){
+                      doctor_advices.push(his_doctor_advices[i])
+                    }
+                  }else{
+                       doctor_advices.push(his_doctor_advices[i])
+                  }
               }
             }
           }
           }
 
           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 = {

src/pages/main/today/dialysisMonitoring.vue

           <td v-if="isShow('血流量1')">{{ item.blood_flow_volume_one ? item.blood_flow_volume_one : "/" }}</td>
           <td v-if="isShow('跨膜压')" >{{ item.transmembrane_pressure ? item.transmembrane_pressure : "" }}</td>
           <td v-if="isShow('跨膜压1')" >{{ item.venous_pressure_one ? item.venous_pressure_one : "/" }}</td>
-          <td v-if="isShow('超滤量')&&(org_id ==10551 || org_id ==10629 || org_id ==10679|| org_id ==10693 || org_id ==10702)" >{{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</td>
+          <td v-if="isShow('超滤量')&&(org_id ==10551 || org_id ==10629 || org_id ==10679|| org_id ==10693 || org_id ==10702 || org_id == 10721)" >{{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</td>
           <td v-if="isShow('超滤量')&&org_id !=10551 && org_id!=10629 && org_id != 10679&&org_id!=10693 &&org_id!=10702" >
             <span v-if="org_id == 10612">
               <span v-if="index == 1"> {{ item.ultrafiltration_volume ? item.ultrafiltration_volume : "0" }}</span>
 
           </td>
           <td v-if="isShow('超滤量1')" >{{item.ultrafiltration_volume_one?item.ultrafiltration_volume_one:'/'}}</td>
-          <td v-if="isShow('超滤率')" >{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}}</td>
+          <td v-if="isShow('超滤率')" >
+            <span v-if="org_id==10702">{{item.ultrafiltration_rate?item.ultrafiltration_rate:'0'}} </span> 
+            <span v-if="org_id!=10702">{{item.ultrafiltration_rate?item.ultrafiltration_rate:''}} </span> 
+          </td>
           <td v-if="isShow('超滤率2')" >{{item.ultrafiltration_rate_one?item.ultrafiltration_rate_one:''}}</td>
           <td v-if="isShow('钠浓度')">{{ item.sodium_concentration ? item.sodium_concentration : "" }}</td>
           <td v-if="isShow('钠浓度1')">{{ item.sodium_concentration_one ? item.sodium_concentration_one : "/" }}</td>
           <td v-if="isShow('置换率')">{{ item.replacement_rate ? item.replacement_rate : "" }}</td>
           <td v-if="isShow('置换率1')">{{ item.replacement_rate_one ? item.replacement_rate_one : "/" }}</td>
           <td v-if="isShow('置换量')" >
-            <span v-if="org_d == 10702">
+            <span v-if="org_id == 10702">
               {{ item.displacement_quantity ? item.displacement_quantity : "0" }}
             </span>
-            <span v-if="org_d != 10702">
+            <span v-if="org_id != 10702">
               {{ item.displacement_quantity ? item.displacement_quantity : "" }}
             </span>
           </td>