新分支

src/api/dialysis_record.js

   })
 }
 
-export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mode, puncture_point_haematoma, internal_fistula, catheter, cruor, mission) {
+export function finishDialysis(patient_id, schedule_date, end_time, nurse_id, mode, puncture_point_haematoma, internal_fistula, catheter, cruor, mission,condenser) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
     internal_fistula: internal_fistula,
     catheter: catheter,
     cruor: cruor,
-    mission: mission
+    mission: mission,
+    condenser:condenser,
   }
   return request({
     url: '/api/dialysis/finish',

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

             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('灌流器凝血')">
+          <!-- <el-col :span="8" v-if="isShow('灌流器凝血')">
             <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')" :rules="isCheckmust('灌流器凝血')">
               <el-input
                 v-model="form.condenser "
                 @focus="showDialog('11')"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="8" v-if="isShow('管路凝血')">
             <el-form-item label="管路凝血: " :prop="isName('管路凝血')" :rules="isCheckmust('管路凝血')">

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

           ></el-input>
        </el-form-item>
 
+       <el-form-item label="灌流器凝血: " :prop="isName('灌流器凝血')"
+              :rules="isCheckmust('灌流器凝血')" v-if="isShowFiled('灌流器凝血')">
+          <el-input
+            style="width:200px"
+            v-model="form.condenser"
+            readonly
+            @focus="showInnerDialog('2')"
+          ></el-input>
+       </el-form-item>
+
         <el-form-item label="宣教知识：" :prop="isName('宣教知识')"
               :rules="isCheckmust('宣教知识')" v-if="isShowFiled('宣教知识')">
           <el-select @change="dialysisAfterTeachSelectChange" v-model="form.mission_id">
           cruor:"",
           mission:"",
           mission_id:"",
+          condenser:"",
         },
         internal_fistula: [],
         InnerDialogProps: {
             ParamsQuery["cruor"] = this.form.cruor
             ParamsQuery["mission"] = this.form.mission
             ParamsQuery["mission_id"] = this.form.mission_id
+            ParamsQuery["condenser"] = this.form.condenser
             if(this.dialysis_order.finish_creator  != this.$store.getters.xt_user.user.id){
               ParamsQuery["mode"] = "3"
             }
              let mode = "1"
              console.log("fomr",this.form.mission_id)
 
-            finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor,this.form.mission,this.form.mission_id).then(rs => {
+            finishDialysis(this.patient_id,this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.end_time, this.form.nurse_id,mode,parseInt(this.form.puncture_point_haematoma),this.form.internal_fistula,this.form.catheter,this.form.cruor,this.form.mission,this.form.mission_id,this.form.condenser).then(rs => {
               this.loading = false
               var resp = rs.data
               if (resp.state == 1) {
             break
             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
             break
+            case '2':
+            this.InnerDialogProps.values = this.cruorOptions
+            this.InnerDialogProps.titles = '灌流器凝血'
+            this.InnerDialogProps.type = 'condenser'
+            this.InnerDialogProps.selected = this.form.condenser
+            this.InnerDialogProps.isShowTextArea = false
+            break
 
         }
       },
           case 'cruor':
           this.form.cruor = val.value.join(',')
           break
+          case 'condenser':
+          this.form.condenser = val.value.join(',')
+          break
         }
       },
       innerDialogCancle: function() {

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

             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

           <div style="flex:1;">
             首剂
             <span class="under-line" style="display:inline-block;width: 50%;">
-              {{ prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "0" }}
+              {{ prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "0" }}
             </span>
             <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
             <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
           <div style="flex: 1;">
             处方脱水量
             <span class="under-line" style="display: inline-block;width: 50%;">
-              {{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }}
+              {{ prescription.prescription_water ? prescription.prescription_water : "" }}L
             </span>
           </div>
           <div style="flex: 1;">
             透析液流量
             <span class="under-line" style="display: inline-block;width: 50%;">
-              {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }}
+              {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }}ml/min
             </span>
           </div>
           <div style="flex: 1;">
           <div style="flex: 1;">
             透 (滤) 器
             <span class="under-line" style="display: inline-block;width: 50%;" >
-              {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
+              {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }}
+
+              {{ prescription.dialysis_strainer ? prescription.dialysis_strainer : "" }}
             </span>
           </div>
           <div style="flex: 1;">
           </div>
           <div style="flex: 1;">
             透析液：
-            <div style="display: inline-block;margin-right: 10px;">
-              <!-- <input type="checkbox" @click="checked=false" style="-webkit-appearance: checkbox" checked="checked">&nbsp;碳酸 -->
+            <!-- <div style="display: inline-block;margin-right: 10px;">
+            
               <div style="display: inline-block;width: 10px;height: 10px;border: 1px solid black;position: relative;top: 5px;">
-                <span style="position: relative; top: -4px; left: -2px;">√</span>
+                <span style="position: relative; top: -4px; left: -2px;">
+                   <span v-if="prescription.dialyzate.indexOf('碳酸')!=-1">√</span>
+                </span>
               </div>&nbsp;碳酸
-            </div>
-            <div style="display: inline-block;">
-              <!-- <input type="checkbox" style="-webkit-appearance: checkbox">&nbsp;醋酸 -->
+              <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
+                      碳酸
+               </div>
+            </div> -->
+            <!-- <div style="display: inline-block;">
+             
               <div style="display: inline-block;width: 10px;height: 10px;border: 1px solid black;position: relative;top: 5px;">
-                <span style="position: relative; top: -4px; left: -2px;">√</span>
+                <span v-if="prescription.dialyzate.indexOf('醋酸')!=-1">√</span>
               </div>&nbsp;醋酸
+            
+            </div> -->
+            <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('碳酸')>-1">
+                 碳酸
             </div>
+
+            <div class="under_line" style="width: 100px; text-align: center" v-if="prescription.dialyzate.indexOf('醋酸')>-1">
+                醋酸
+               </div>
           </div>
         </div>
         <div style="display: flex;border-left: 1px solid black;border-right: 1px solid black;padding: 5px;">
                 {{
                   monitor.ultrafiltration_volume
                     ? monitor.ultrafiltration_volume
-                    : ""
+                    : "0"
                 }}
               </span>
             </td>
             <!-- T -->
             <td>
               <span v-if="getTime(monitor.operate_time) != ''">
-                {{ monitor.temperature ? monitor.temperature : "" }}
+                {{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}
               </span>
             </td>
             <!-- HR -->