新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -1522,7 +1522,7 @@
                                 {{
                               monitor_record.ultrafiltration_volume
                                 ? monitor_record.ultrafiltration_volume
-                                : ""
+                                : "0"
                             }}
                             </span>
                           </td>

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

@@ -4161,7 +4161,7 @@ mu
               // 长期处方不为空
               if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                 && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid'&& key != 'remark') {
                 this.dialysisPrescription[key] =
                   response.data.data.solution[key]
               }
@@ -4181,7 +4181,7 @@ mu
               for (const key in response.data.data.prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] =
                     response.data.data.prescription[key]
                 }
@@ -4191,7 +4191,7 @@ mu
               for (const key in response.data.data.system_prescription) {
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] =
                     response.data.data.system_prescription[key]
                 }
@@ -4202,7 +4202,7 @@ mu
                 // 临时处方为空
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
-                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
+                  && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid' && key != 'remark') {
                   this.dialysisPrescription[key] = ''
                 }
               }

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

@@ -86,10 +86,6 @@
                 scope.row.is_pressure
                   ? scope.row.is_pressure
                   : ""
-              }}/{{
-                scope.row.is_pressure
-                  ? scope.row.is_pressure
-                  : ""
               }}
             </template>
           </el-table-column>
@@ -2522,6 +2518,7 @@ export default {
         : "";
         this.form.replacement_speed = monitor.replacement_speed?monitor.replacement_speed:""
         this.form.dicarbonate = monitor.dicarbonate?monitor.dicarbonate:""
+        this.form.is_pressure = monitor.is_pressure
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();

src/xt_pages/dialysis/signPrint.vue

@@ -13,7 +13,7 @@
                 <div v-for="(item, index) in list" :key="index">
                     <div class="signPrint" v-for="it in item.parent_advice" style="page-break-after: always;">
                        
-                        <div v-if="org_id!=10278">分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
+                        <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
 
                         <div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1367,7 +1367,7 @@
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
                         <td>
-                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
+                          <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                         </td>
                         <!-- <td style="width:50px">

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -303,7 +303,7 @@
                           <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
                           <td width="60" style="height:20px;line-height:20px">透析液温度</td>
                           <td width="60" style="height:20px;line-height:20px">电导度<br />ms/cm</td>
-                          <td width="60" style="height:20px;line-height:20px">体温<br />C°</td>
+                          <td width="60" style="height:20px;line-height:20px">血流量<br />ml/min</td>
                           <td width="">病情变化及处理</td>
                           <td width="60" style="height:20px;line-height:20px">签名</td>
                       </tr>
@@ -323,7 +323,7 @@
                           <td>&nbsp;{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</td>
                           <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                           <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
-                          <td>&nbsp;{{ monitor.temperature ? monitor.temperature : "" }}</td>
+                          <td>&nbsp;{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}</td>
                           <td style="text-align:left;padding-left:10px;">
                               <div style="line-height:20px;text-align: left;display: inline-block;">
                                   &nbsp;{{ monitor.symptom }}{{ monitor.dispose }}{{ monitor.result }}

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1578,12 +1578,10 @@ export default {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
 
-          if( this.allProject[i].first_letter !=undefined){
-            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-              this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1) {
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
-          }
+          
         }
         this.tabProject = arr
       }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1596,15 +1596,11 @@ export default {
       } else {
         let arr = []
         for (let i = 0; i < this.allProject.length; i++) {
-          console.log('wwww',(this.allProject[i].first_letter))
-          if(this.allProject[i].first_letter !=undefined){
-            if (
-            this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1 ||
-            this.allProject[i].first_letter.indexOf(this.search_project_keyword) != -1
-            ) {
+         
+            if (this.allProject[i].project_name.indexOf(this.search_project_keyword) != -1) {
               arr = arr.concat(this.allProject[i])
             }
-          }
+          
         }
         this.tabProject = arr
         console.log('kkkk',this.tabProject);

src/xt_pages/workforce/Patientshift.vue

@@ -591,18 +591,18 @@ export default {
           this.$message.success("替换成功");
           this.tipDialogVisible = false
           this.tipDialogVisibleTwo = false
-          const listl=this.list
-          for(let i=0;i<listl.length;i++){
-            if(this.cur_drag_info.name== listl[i].name){
-              listl[i].bed_id = this.cur_drag_info.bed_id
+          // const listl=this.list
+          // for(let i=0;i<listl.length;i++){
+          //   if(this.cur_drag_info.name== listl[i].name){
+          //     listl[i].bed_id = this.cur_drag_info.bed_id
               
-            }
-            if(this.currentData.currentData_name== listl[i].name){
-              listl[i].bed_id = this.cur_drag_info.bed_id
-              console.log('nnnn',this.ent_index,this.cur_drag_info.bed_id);
-            }
-          }
-          // this.getlist();
+          //   }
+          //   if(this.currentData.currentData_name== listl[i].name){
+          //     listl[i].bed_id = this.cur_drag_info.bed_id
+          //     console.log('nnnn',this.ent_index,this.cur_drag_info.bed_id);
+          //   }
+          // }
+          this.getlist();
         }
       });
     },
@@ -644,18 +644,18 @@ export default {
           this.tipDialogVisible = false
           this.tipDialogVisibleThree = false
           
-          const listl=this.list
-          for(let i=0;i<listl.length;i++){
-            if(this.cur_drag_info.name== listl[i].name){
-              listl[i].bed_id = this.currentData.bed_id 
-              console.log('mmmm',listl,this.currentData);
-            }
-            if(this.currentData.currentData_name== listl[i].name){
-              // this.ent_index=listl[i].bed_id
-              listl[i].bed_id =this.cur_drag_info.bed_id
-            }
-          }
-          // this.getlist();
+          // const listl=this.list
+          // for(let i=0;i<listl.length;i++){
+          //   if(this.cur_drag_info.name== listl[i].name){
+          //     listl[i].bed_id = this.currentData.bed_id 
+          //     console.log('mmmm',listl,this.currentData);
+          //   }
+          //   if(this.currentData.currentData_name== listl[i].name){
+          //     // this.ent_index=listl[i].bed_id
+          //     listl[i].bed_id =this.cur_drag_info.bed_id
+          //   }
+          // }
+           this.getlist();
         }
       });
       
@@ -677,14 +677,14 @@ export default {
         // var schedule = response.data.data.schedule;
         // console.log('ddddd',schedule);
         // this.list
-        const listl=this.list
-        for(let i=0;i<listl.length;i++){
-          if(this.schedule.patient== listl[i].name){
-            listl[i].bed_id = this.schedule.bed_id 
-            console.log('mmmm',listl);
-          }
-        }
-        // this.getlist()
+        // const listl=this.list
+        // for(let i=0;i<listl.length;i++){
+        //   if(this.schedule.patient== listl[i].name){
+        //     listl[i].bed_id = this.schedule.bed_id 
+        //     console.log('mmmm',listl);
+        //   }
+        // }
+         this.getlist()
       }
     },
     // 需要拖动的
@@ -1122,18 +1122,18 @@ export default {
                 this.$message.success("交换成功");
                 this.tipDialogVisible = false
                 this.tipDialogVisibleThree = false
-                // this.getlist();
-                const listl=this.list
-                for(let i=0;i<listl.length;i++){
-                  if(this.huanzhe.name== listl[i].name){
-                    listl[i].bed_id = this.chuangwei 
-                    console.log('mmmm',listl,this.currentData);
-                  }
-                  if(this.genghuan.name== listl[i].name){
-                    // this.ent_index=listl[i].bed_id
-                    listl[i].bed_id =this.huanzhe.bed_id
-                  }
-                }
+                this.getlist();
+                // const listl=this.list
+                // for(let i=0;i<listl.length;i++){
+                //   if(this.huanzhe.name== listl[i].name){
+                //     listl[i].bed_id = this.chuangwei 
+                //     console.log('mmmm',listl,this.currentData);
+                //   }
+                //   if(this.genghuan.name== listl[i].name){
+                //     // this.ent_index=listl[i].bed_id
+                //     listl[i].bed_id =this.huanzhe.bed_id
+                //   }
+                // }
               }
             });
             return this.genghuan