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

src/api/dialysis_record.js

   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark,catheter_operation,blood_flow_volume) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     nuclein_date: nuclein_date,
     schedule_remark: schedule_remark,
     order_remark: order_remark,
-    catheter_operation:catheter_operation
+    catheter_operation:catheter_operation,
+    blood_flow_volume:blood_flow_volume,
   }
   console.log('params', params)
   return request({

src/xt_pages/dialysis/details/DialysisPrescription.vue

         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  ">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>
           <span class="unit">{{ dialysate_flow != "0" ? "ml/min" : "" }}</span>
         </li>
 
+        <li v-if="isShow('透析液')">
+          <label>透析液 : </label>
+          <span class="content">{{
+            dialyzate != "0" ? dialyzate : ""
+          }}</span>
+          <span class="unit">{{ dialyzate != "0" ? "ml/min" : "" }}</span>
+        </li>
+
         <li v-if="isShow('维持') && getValueStr('anticoagulant', 'anticoagulant') != 5">
           <label>维持 : </label>
           <span class="content" v-if="getValueStr('anticoagulant', 'anticoagulant') != 1">{{ anticoagulant_weichi != "0" ? anticoagulant_weichi : "" }}</span>
       var v = this.getValueStr('blood_flow_volume', 'blood_flow_volume')
       return v.length == 0 ? '0' : v
     },
+    dialyzate:function(){
+      var v = this.getValueStr('dialyzate', 'dialyzate')
+      return v.length == 0 ? '0' : v
+    },
     replacement_way: function() {
       return this.getValueStr('replacement_way', 'replacement_way')
     },

src/xt_pages/dialysis/details/assessmentAfter.vue

           <label>输液量(ml): </label>
           <span class="content" >{{ this.record.transfusion_volume}}</span>
         </li>
+
+        <li v-if="isShow('灌流器凝血')">
+          <label>灌流器凝血: </label>
+          <span class="content" >{{ this.record.condenser}}</span>
+        </li>
       </ul>
     </div>
     <!-- <div class="note">

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

             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('灌流器凝血')">
+            <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')" :rules="isCheckmust('灌流器凝血')">
+              <el-input
+                v-model="form.condenser "
+                readonly
+                @focus="showDialog('11')"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8" v-if="isShow('管路凝血')">
             <el-form-item label="管路凝血: " :prop="isName('管路凝血')" :rules="isCheckmust('管路凝血')">
               <el-input
         after_urea:"",
         accumulated_blood_volume:"",
         transfusion_volume:"",
+        condenser:""
       },
       lapseList:[],
       leaveOfficeMethod:[],
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
           data["transfusion_volume"] = this.form.transfusion_volume
-
+          data["condenser"] = this.form.condenser
           console.log("Paramsquery",data)
 
           postAssessmentAfterDislysis(ParamsQuery, data)
       switch (val) {
         case '1':
           this.InnerDialogProps.values = this.cruorOptions
-          this.InnerDialogProps.titles = '凝血'
+          this.InnerDialogProps.titles = '透析器凝血'
           this.InnerDialogProps.type = 'cruor'
           this.InnerDialogProps.selected = this.form.cruor
           this.InnerDialogProps.isShowTextArea = false
           this.InnerDialogProps.selected = this.form.pip_coagulation
           this.InnerDialogProps.isShowTextArea = false
           break
+          case '11':
+          this.InnerDialogProps.values = this.cruorOptions
+          this.InnerDialogProps.titles = '灌流器凝血'
+          this.InnerDialogProps.type = 'condenser'
+          this.InnerDialogProps.selected = this.form.condenser
+          this.InnerDialogProps.isShowTextArea = false
+          break
       }
     },
     selectActualTreatmentHour(val) {
         case 'sealing_fluid_dispose':
           this.form.sealing_fluid_dispose = val.value.join(',')
           break
+        case 'condenser':
+          this.form.condenser = val.value.join(',')
+          break
         default:
           break
+        
       }
       // console.log(val);
     },

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

           </el-form-item>
 
 
+          <el-form-item
+            :prop="isName('血流量(ml/min)')"
+            :rules="isCheckmust('血流量')"
+            v-if="isShowFiled('血流量')"
+          >
+            <el-input
+              type="textarea"
+              v-model="form.blood_flow_volume"
+              :rows="4"
+            ></el-input>
+          </el-form-item>
+
+
         <el-form-item
           label="核酸检测日期:"
           style="width: 300px"
           ></el-date-picker>
         </el-form-item>
 
+
+
         <el-form-item
           label="上机时间 :"
           style="width: 300px"
       value2:"",
       infoDialogVisible:false,
       selected_date:"",
-      remark:""
+      remark:"",
+      blood_flow_volume:"" ,
     };
   },
   props: {
             this.form.dialysis_irrigation,
             this.form.blood_access_id,
             this.form.nuclein_date,
-            this.form.catheter_operation
+            this.form.catheter_operation,
+            this.form.blood_flow_volume
           ).then((rs) => {
             this.loading = false;
             var resp = rs.data;
       ParamsQuery["nuclein_date"] = this.form.nuclein_date;
       ParamsQuery["mode"] = "2";
       ParamsQuery['catheter_operation'] = this.form.catheter_operation
+      ParamsQuery["blood_flow_volume"] = this.form.blood_flow_volume
       if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
         ParamsQuery["mode"] = "3";
       }

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

                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 ">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
                         </el-form-item>
                     </el-col>
 
+
+                    <el-col :span="8" v-if="isShows('透析液')">
+                        <el-form-item label="透析液:" prop="dialyzate" :rules="isCheckmust('透析液')">
+                           <el-select v-model="dialysisPrescription.dialyzate">
+                                <el-option
+                                        v-for="(item, index) in dialyzateList"
+                                        :label="item.name"
+                                        :value="item.name"
+                                        :key="index + 'q'"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+
                     <el-col :span="8" v-if="isShows('单超时长') && dialysisPrescription.is_water == 1">
                         <el-form-item label="单超时长(h)：" prop="single_time" :rules="isCheckmust('单超时长')">
                             <el-input v-model="dialysisPrescription.single_time"></el-input>
           warsh_count:"",
           washing_time:"",
           blood_access_part_id:"",
-          anticoagulant_weichi_hour:""
+          anticoagulant_weichi_hour:"",
+          dialyzate:""
         },
 
         anticoagulant: {
           {id:1,name:"是"},
           {id:2,name:"否"}
         ],
+        dialyzateList:[
+          {id:0,name:"请选择"},
+          {id:1,name:"碳酸"},
+          {id:2,name:"醋酸"}
+        ],
         machineList:[
           {id:1,name:"是"},
           {id:2,name:"否"}

src/xt_pages/dialysis/details/dialysisComputer.vue

           <span class="content">{{catheter_operation}}</span>
         </li>
       </ul>
+      <ul>
+        <li v-if="isShow('血流量')">
+          <label>血流量 : </label>
+          <span class="content">{{blood_flow_volume}}</span>
+        </li>
+      </ul>
     </div>
     <div class="middleLine"></div>
   </div>
           return this.record.catheter_operation
         }
        
+      },
+      blood_flow_volume:function(){
+        if(this.record.id == 0){
+          return '-'
+        }else{
+          return this.record.blood_flow_volume
+        }
       }
     },
     methods: {

src/xt_pages/stock/stockFlow.vue

         <span>
           <el-button type="primary" size="small" @click="toExprot">导出</el-button>
 
-          <el-button type="primary" size="small" @click="toTongBu">同步</el-button>
+          <!-- <el-button type="primary" size="small" @click="toTongBu">同步</el-button> -->
         </span>
        
       </div>