Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

config/index.js

@@ -29,7 +29,7 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
-   // host: 'xt.test.sgjyun.com',
+    // host: 'xt.test.sgjyun.com',
     host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -39,7 +39,13 @@
                 display: inline-block;
               "
             >
-              血液净化治疗记录单
+              <span v-if="org_id != 0 && org_id!=10449 && org_id!=3877">
+                血液净化治疗记录单
+              </span>
+              <span v-if="org_id == 0 || org_id == 3877 || org_id == 10449">
+                <span v-if="record&&record.prescription.mode_id!=13">血液净化治疗记录单</span>
+                <span v-if="record&&record.prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+              </span>
             </div>
           </div>
           <div class="row">
@@ -1021,6 +1027,7 @@
                         ml/min
                       </div>
                     </div>
+
                     <div class="row" style="padding: 2px 0; line-height: 23px">
                       <div class="inline_block">
                         抗凝剂：
@@ -1171,6 +1178,57 @@
                         </div>
                       </div>
                     </div>
+
+                    <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 ||org_id == 3877 || org_id == 10449">
+                      <div class="inline_block">
+                        置换速度：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.displace_speed
+                              ? record.prescription.displace_speed
+                              : "/"
+                          }}
+                        </div>
+                        ml/h
+                      </div>
+                      <span>&nbsp;&nbsp;&nbsp;</span>
+                      <div class="inline_block">
+                        透析液流速：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.dialysis_fluid_flow
+                              ? record.prescription.dialysis_fluid_flow
+                              : "/"
+                          }}
+                        </div>
+                        ml/h
+                      </div>
+                      
+                      <span>&nbsp;&nbsp;&nbsp;</span>
+                      <div class="inline_block">
+                        碳酸氢钠流速：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.sodium_bicarbonate_flow
+                              ? record.prescription.sodium_bicarbonate_flow
+                              : "/"
+                          }}
+                        </div>
+                        ml/h
+                      </div>
+                    </div>
                   </td>
                 </tr>
                 <tr>
@@ -1224,7 +1282,8 @@
                           >
                             SpO₂<br />(%)
                           </td>
-                          <td width="50">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id != 0 && org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
+                          <td width="50" v-if="org_id ==0 || org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
                               record.prescription.mode_id == 2 ||
@@ -1235,7 +1294,7 @@
                           >
                             置换量<br />(ml)
                           </td>
-
+                          <td v-if="org_id == 3877 || org_id == 0 || org_id == 10449" width="50">滤前压(mmHg)</td>
                           <td
                             width="50"
                             v-if="
@@ -1390,6 +1449,13 @@
                                 : ""
                             }}
                           </td>
+                          <td v-if="org_id == 3877 || org_id == 0 || org_id == 10449">
+                            {{
+                              monitor_record.filter_pressure
+                                ? monitor_record.filter_pressure
+                                : ""
+                            }}
+                          </td>
                           <td
                             width="50"
                             v-if="
@@ -1820,7 +1886,13 @@
                   display: inline-block;
                 "
               >
-                血液净化治疗记录单
+                <span v-if="org_id != 0 && org_id!=10449 && org_id!=3877">
+                  血液净化治疗记录单
+                </span>
+                <span v-if="org_id == 0 || org_id == 3877 || org_id == 10449">
+                  <span v-if="record&&record.prescription.mode_id!=13">血液净化治疗记录单</span>
+                  <span v-if="record&&record.prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+                </span>
               </div>
             </div>
             <div class="row">

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -398,7 +398,7 @@
                             :src="
                               setAdminUserES(
                                 record.dialysis_order,
-                                'start_nurse'
+                                'quality_nurse_id'
                               )
                             "
                             alt=""

src/xt_pages/dialysis/batch_print/batch_print_order_twentyFive.vue

@@ -1330,21 +1330,43 @@ export default {
         return age
       }
     },
+    // getAge: function(val) {
+    //   val.birth = uParseTime(val.birthday, "{y}-{m}-{d}");
+    //   if (
+    //     this.org_template_info.template_id == 2 ||
+    //     this.org_template_info.template_id == 0
+    //   ) {
+    //     if (val.age == 0) {
+    //       return jsGetAge(val.birth, "-");
+    //     } else {
+    //       return val.age;
+    //     }
+    //   } else {
+    //     return jsGetAge(val.birth, "-");
+    //   }
+    // },
     getAge: function(val) {
-      val.birth = uParseTime(val.birthday, "{y}-{m}-{d}");
-      if (
-        this.org_template_info.template_id == 2 ||
-        this.org_template_info.template_id == 0
-      ) {
-        if (val.age == 0) {
-          return jsGetAge(val.birth, "-");
-        } else {
-          return val.age;
-        }
-      } else {
-        return jsGetAge(val.birth, "-");
+     
+     if (val.id_card_no) {
+       var thisLen = val.id_card_no.length
+
+       var birth = ''
+       if (thisLen == 15) {
+         birth = '19' + val.id_card_no.substr(6, 6)
+       } else {
+         birth = val.id_card_no.substr(6, 8)
+       }
+       var birthtwo =
+         birth.substr(0, 4) +
+         '-' +
+         birth.substr(4, 2) +
+         '-' +
+         birth.substr(6, 2)
+
+       var age = jsGetAge(birthtwo, '-')
+       return age
       }
-    },
+     },
     printAction: function() {
       const style =
         '@media print { .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 14px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 0 0; page-break-after: always; } .print_page_main_content .order-yy-name { margin: auto; text-align: center; font-size: 20px; letter-spacing: 5px;} .print_page_main_content .order_title { text-align: center; font-size: 23px; line-height: 50px; font-weight: 500; } .row { font-size: 14px; line-height: 20px; padding: 5px 0; } .inline_block { display: inline-block; } .under_line { display: inline-block; border-bottom: 1px solid #999; text-align: center; white-space: nowrap; } .under_line::before { content: "\\00A0"; } .under_line::after { content: "\\00A0"; } .flex { display: -webkit-box; display: -moz-box; display: -ms-flexbox; display: -webkit-flex; display: flex; align-items: center; -webkit-align-items: center; box-align: center; -moz-box-align: center; -webkit-box-align: center; text-align: center; -webkit-justify-content: space-between; justify-content: space-between; -moz-box-pack: space-between; -webkit--moz-box-pack: space-between; box-pack: space-between; } .print_page_main_content .proj_table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } .print_page_main_content .proj_table tbody tr td { border: 1px solid; font-size: 16px; padding: 10px 8px; line-height: 30px; } .print_page_main_content .proj_table .inside_table { width: 100%; border: hidden; border-collapse: collapse; } .print_page_main_content .proj_table .inside_table tr td { border: 1px solid; text-align: center; font-size: 14px; padding: 8px 5px; line-height: 25px; } }.es-img{height: 20px; }.advice-name{text-align: left !important;line-height: 16px !important;}.advice-children{display:flex;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 2px;position: absolute;}';

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -572,6 +572,21 @@
           <span class="content">{{this.prescription.sodium_curve}}</span>
         </li>
 
+        <li v-if="isShow('开始钠')">
+          <label>开始钠: </label>
+          <span class="content">{{this.prescription.start_sodium}}</span>
+        </li>
+
+        <li v-if="isShow('透析液流速')">
+          <label>透析液流速(ml/h): </label>
+          <span class="content">{{this.prescription.dialysis_fluid_flow}}</span>
+        </li>
+
+        <li v-if="isShow('碳酸氢钠流速')">
+          <label>碳酸氢钠流速(ml/h): </label>
+          <span class="content">{{this.prescription.sodium_bicarbonate_flow}}</span>
+        </li>
+
         <li v-if="isShow('病情处理')">
           <label>病情处理: </label>
           <span class="content">{{this.prescription.treatment_remark}}</span>

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

@@ -1011,6 +1011,27 @@
                     </el-col>
                 </el-row>
 
+                <el-row>
+                  <el-col :span="8" v-if="isShows('透析液流速')">
+                        <el-form-item label="透析液流速(ml/h):">
+                            <el-input
+                                  
+                                    v-model="dialysisPrescription.dialysis_fluid_flow"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('碳酸氢钠流速')">
+                        <el-form-item label="碳酸氢钠流速(ml/h):">
+                            <el-input
+                                    v-model="dialysisPrescription.sodium_bicarbonate_flow"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
               <el-row :gutter="20">
                     <el-col :span="24"  v-if="isShows('病情处理')">
                         <el-form-item  label="病情处理： ">
@@ -1559,6 +1580,8 @@
           prescription_sodium:"",
           start_sodium:"",
           sodium_curve:"",
+          dialysis_fluid_flow:"",
+          sodium_bicarbonate_flow:"",
         },
 
         anticoagulant: {
@@ -2318,6 +2341,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10440){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 9829){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '6:30'

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

@@ -832,6 +832,18 @@
             </template>
           </el-table-column>
 
+          <el-table-column
+            prop="heparin"
+            align="center"
+            label="滤前压(mmHg)"
+            width="140"
+            v-if="isShow('滤前压')"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.filter_pressure }}
+            </template>
+          </el-table-column>
+
           <el-table-column
             prop="heparin"
             align="center"
@@ -1523,6 +1535,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('滤前压')">
+            <el-form-item label="滤前压(mmHg):">
+              <el-input v-model="form.filter_pressure"></el-input>
+            </el-form-item>
+          </el-col>
+
           <!-- </el-row>
 
           <el-row :gutter="20"> -->
@@ -1737,6 +1755,7 @@ export default {
         blood_monitor: "",
         heparin_amount: "", //肝素量
         dehydration: "",
+        filter_pressure:"",
       },
 
       table_current_row: null,
@@ -1962,7 +1981,7 @@ export default {
       
         this.form.temperature = ""
 
-        this.form.pulse_frequency = ""; // this.last_monitor_record.pulse_frequency;
+        // this.last_monitor_record.pulse_frequency;
         // this.form.breathing_rated =  resp.monitor.breathing_rated ? resp.monitor.breathing_rated : '';
         this.form.systolic_bp = ""; // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = ""; // this.last_monitor_record.diastolic_blood_pressure;
@@ -1976,6 +1995,12 @@ export default {
           this.form.venous_pressure = ""; // this.last_monitor_record.venous_pressure;
         }
 
+        if(this.org_id == 10440){
+           this.form.pulse_frequency = 80
+        }else{
+           this.form.pulse_frequency = ""
+        }
+
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type? resp.monitor.venous_pressure_type: 1;
         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10387){
            this.form.arterial_pressure = resp.monitor.arterial_pressure? resp.monitor.arterial_pressure: "-100"; // this.last_monitor_record.arterial_pressure;
@@ -2168,6 +2193,7 @@ export default {
         this.form.blood_monitor = "";
         this.form.dehydration = "";
         this.form.heparin_amount = "";
+        this.form.filter_pressure =""
       } else {
         (this.form.id = monitor.id),
           // this.form.operate_date = monitor.operate_date
@@ -2278,6 +2304,9 @@ export default {
         this.form.heparin_amount = monitor.heparin_amount
           ? monitor.heparin_amount
           : "";
+        this.form.filter_pressure = monitor.filter_pressure
+        ? monitor.filter_pressure
+        : "";  
         // 设置三个下拉框的值，直接调用事件偷懒
         this.symptomTextareaBlur();
         this.disposeTextareaBlur();
@@ -2421,6 +2450,7 @@ export default {
         parseFloat(this.form.dehydration) == NaN
           ? 0
           : parseFloat(this.form.dehydration);
+      this.form.filter_pressure = this.form.filter_pressure?this.form.filter_pressure:""
       let mode = "1";
       if (this.form.id > 0) {
         mode = "2";

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -43,6 +43,7 @@
           <th v-if="isShow('血压监测')" width="92px">血压监测</th>
           <th v-if="isShow('肝素量')" width="92px">肝素量(mg)</th>
           <th v-if="isShow('脱水')" width="92px">脱水(L)</th>
+          <th v-if="isShow('滤前压')" width="92px">滤前压(mmHg)</th>
           <th v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)" width="92px">KT/V</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
 
@@ -91,6 +92,7 @@
           <th v-if="isShow('血压监测')" width="92px">{{monitor.blood_monitor ? monitor.blood_monitor : ""}}</th>
           <th v-if="isShow('肝素量')" width="92px">{{monitor.heparin_amount ? monitor.heparin_amount : ""}}</th>
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
+          <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}</td>
           <td v-if="isShow('处理')">{{ monitor.dispose }}</td>

src/xt_pages/dialysis/doctorNewAdviceStaticPrint.vue

@@ -27,9 +27,9 @@
                 <tr>
                   <td width="50">序号</td>
                   <td width="100">区域</td>
-                  <td width="100">责护</td>
+                  <!-- <td width="100">责护</td> -->
                   <td width="100">透析模式</td>
-                  <td  v-for="(item,index) in tabHead"  :key="index" :label="item.advice_name" width="150">
+                  <td  v-for="(item,index) in tabHead"  :key="index" :label="item.advice_name" width="200">
                      {{item.advice_name}}
                   </td>
                 </tr>
@@ -41,17 +41,25 @@
                     <span v-if="item.is_total ==0">总计</span>
                   </td>
                   <td>
-                    <span v-if="item.is_total == 1">{{getZoneName(item.child)}}</span> 
+                    <span v-if="item.is_total == 1">
+                      <!-- {{getZoneName(item.child)}} -->
+                      {{item.zone_name}}
+                    </span> 
                   </td>
-                  <td>
+                  <!-- <td>
                     <span v-if="item.is_total == 1"> {{getAdminUserName(item.execution_staff)}}</span>
-                  </td>
+                  </td> -->
                   <td>
                     <span v-if="item.is_total == 1"> {{getModeId(item.child)}}</span>
                   </td>
                   <td v-for="(it,i) in tabHead"  :key="i">
                     <span v-if="item.is_total == 1">
-                      <span v-if="item.child[i]!=null">{{getDrugCount(item.child,it.advice_name)}}</span>
+                      <span v-if="item.child[i]!=null">
+                        {{getDrugCount(item.child,it.advice_name)}}
+                      </span>
+                      <span v-if="it&&it.advice_name == '肝素钠注射剂'">
+                        {{getDrugAdviceCount(it.advice_name,item.zone_name)}}  
+                      </span>
                     </span>
                     <span v-if="item.is_total == 0">
                       {{getAllSumCount(it.advice_name)}}
@@ -113,6 +121,7 @@
           tabHead:[],
           tableDataList:[],
           adminUserList:[],
+          doctorMap:[],
         }
       },
       components: {
@@ -181,15 +190,18 @@
                 this.tabHead = arr
                 console.log("arr---------------------",this.tabHead)
               }
-
+              
+              this.doctorMap = []
               if(doctorList!=null && doctorList.length > 0){
-                
                 let dataInfo = {}
                   doctorList.forEach((item, index) => {
-                  let { execution_staff } = item
-                  if (!dataInfo[execution_staff])  {
-                    dataInfo[execution_staff] = {
-                      execution_staff:item.execution_staff,
+                  if(item.advice_name == "肝素钠注射剂"){
+                    this.doctorMap.push(item)
+                  } 
+                  let { zone_name } = item
+                  if (!dataInfo[zone_name])  {
+                    dataInfo[zone_name] = {
+                      zone_name:item.zone_name,
                       child: [],
                       count:0,
                       sort:item.sort,
@@ -200,7 +212,7 @@
                 if(newArr!=null && newArr.length >0){
                   for(let i=0;i<newArr.length;i++){
                     for(let j=0;j<doctorList.length;j++){
-                      if(newArr[i].execution_staff == doctorList[j].execution_staff){
+                      if(newArr[i].zone_name == doctorList[j].zone_name){
                          newArr[i].child.push(doctorList[j])
                       }
                     }
@@ -515,30 +527,66 @@
 
       getAllSumCount(advice_name){
        
-       var hisNewArr =[]
-      if(this.tabHead.length!=null && this.tabHead.length >0){
-        for(let i=0;i<this.tabHead.length;i++){
-          if(this.tabHead[i].advice_name == advice_name){
-            hisNewArr.push(this.tabHead[i])
+        var hisNewArr =[]
+        if(this.tabHead.length!=null && this.tabHead.length >0){
+          for(let i=0;i<this.tabHead.length;i++){
+            if(this.tabHead[i].advice_name == advice_name){
+              hisNewArr.push(this.tabHead[i])
+            }
           }
         }
-      }
-      
-      var total = 0
-      if(hisNewArr!=null && hisNewArr.length > 0){
-        for(let i=0;i<hisNewArr.length;i++){
-         for(let j=0;j<hisNewArr[i].child.length;j++){
-            total += parseInt(hisNewArr[i].child[j].prescribing_number)
-         }
+        
+        var total = 0
+        if(hisNewArr!=null && hisNewArr.length > 0){
+          for(let i=0;i<hisNewArr.length;i++){
+          for(let j=0;j<hisNewArr[i].child.length;j++){
+              total += parseInt(hisNewArr[i].child[j].prescribing_number)
+          }
+          }
+        }
+        if (total > 0) {
+          return total
+        }else{
+          return 0
         }
-      }
-      if (total > 0) {
-        return total
-      }else{
-        return 0
-      }
 
-     }
+     },
+     getDrugAdviceCount(advice_name,zone_name){
+        var str = ""
+        var arr =[]
+        var arrOne = []
+        if(this.doctorMap!=null && this.doctorMap.length>0){
+
+           for(let i=0;i<this.doctorMap.length;i++){
+            if(this.doctorMap[i].advice_name!="" || this.doctorMap[i].advice_name!=undefined){
+                this.doctorMap[i].advice_name = this.doctorMap[i].advice_name.replace(/\s/g,"")
+            }
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way =="导管封管"){
+                arr.push(this.doctorMap[i])
+             }
+
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way.indexOf("泵入")!=-1){
+                arrOne.push(this.doctorMap[i])
+             }
+           }
+        }
+
+        if(arr!=null && arr.length >0){
+            var total = 0
+           for(let i=0;i<arr.length;i++){
+              total +=arr[i].prescribing_number
+           }
+          str =  "封管" +"("+total+")"
+        }
+        if(arrOne!=null && arrOne.length >0){
+            var total_one = 0
+           for(let i=0;i<arrOne.length;i++){
+             total_one +=arrOne[i].prescribing_number
+           }
+          str = str + "泵入" +"("+total_one+")"
+        }
+        return str
+      },
      }
     }
   </script>

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -638,11 +638,14 @@
           width="100"
         >
           <template slot-scope="scope" >
-            <span v-if="scope.row.is_total ==1">{{getZoneName(scope.row.child)}}</span>
+            <span v-if="scope.row.is_total ==1">
+              <!-- {{getZoneName(scope.row.child)}} -->
+              {{scope.row.zone_name }}
+           </span>
           </template>
 
         </el-table-column>
-       <el-table-column
+       <!-- <el-table-column
           align="center"
           prop="name"
           label="责护"
@@ -654,7 +657,7 @@
             </span>
           </template>
 
-        </el-table-column>
+        </el-table-column> -->
 
         <el-table-column
           align="center"
@@ -680,6 +683,9 @@
           <template slot-scope="scope">
             <span v-if="scope.row.is_total ==1">
               <span v-if="scope.row.child[index]!=null">{{getDrugCount(scope.row.child,item.advice_name)}}</span>
+              <span v-if="item&&item.advice_name == '肝素钠注射剂'">
+                 {{getDrugAdviceCount(item.advice_name,scope.row.zone_name)}}
+              </span>
             </span>
             <span v-if="scope.row.is_total == 0">
                  {{getAllSumCount(item.advice_name)}}
@@ -794,6 +800,7 @@ export default {
       tabHead:[],
       tableDataList:[],
       adminUserList:[],
+      doctorMap:[],
     };
   },
   created() {
@@ -829,7 +836,7 @@ export default {
       });
     },
     clickCurrent(val) {
-      console.log(val);
+      //console.log(val);
       this.$router.push({
         path: "/dialysis/details",
         query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
@@ -1865,14 +1872,17 @@ export default {
                 console.log("tabHead",this.tabHead)
               }
 
+              this.doctorMap = []
               if(doctorList!=null && doctorList.length > 0){
-
                 let dataInfoOne = {}
                   doctorList.forEach((item, index) => {
-                  let { execution_staff } = item
-                  if (!dataInfoOne[execution_staff])  {
-                    dataInfoOne[execution_staff] = {
-                      execution_staff:item.execution_staff,
+                    if(item.advice_name == "肝素钠注射剂"){
+                      this.doctorMap.push(item)
+                    }
+                  let { zone_name } = item
+                  if (!dataInfoOne[zone_name])  {
+                    dataInfoOne[zone_name] = {
+                      zone_name:item.zone_name,
                       child: [],
                       count:0,
                       sort:item.sort,
@@ -1883,7 +1893,7 @@ export default {
                 if(newArr!=null && newArr.length >0){
                   for(let i=0;i<newArr.length;i++){
                     for(let j=0;j<doctorList.length;j++){
-                      if(newArr[i].execution_staff == doctorList[j].execution_staff){
+                      if(newArr[i].zone_name == doctorList[j].zone_name){
                          newArr[i].child.push(doctorList[j])
                       }
                     }
@@ -1897,7 +1907,7 @@ export default {
                   }
                 }
 
-                var obj = {is_total:0,count:0,execution_staff:0,child:[]}
+                var obj = {is_total:0,count:0,execution_staff:0,child:[],zone_name:""}
                 newList.push(obj)
                 this.tableDataList = newList
                 console.log("999999999999999999-------",this.tableDataList)
@@ -1912,7 +1922,42 @@ export default {
         })
 
       },
+      getDrugAdviceCount(advice_name,zone_name){
+        var str = ""
+        var arr =[]
+        var arrOne = []
+        if(this.doctorMap!=null && this.doctorMap.length>0){
+
+           for(let i=0;i<this.doctorMap.length;i++){
+            if(this.doctorMap[i].advice_name!="" || this.doctorMap[i].advice_name!=undefined){
+                this.doctorMap[i].advice_name = this.doctorMap[i].advice_name.replace(/\s/g,"")
+            }
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way =="导管封管"){
+                arr.push(this.doctorMap[i])
+             }
 
+             if(this.doctorMap[i].advice_name == advice_name && this.doctorMap[i].zone_name == zone_name && this.doctorMap[i].delivery_way.indexOf("泵入")!=-1){
+                arrOne.push(this.doctorMap[i])
+             }
+           }
+        }
+
+        if(arr!=null && arr.length >0){
+            var total = 0
+           for(let i=0;i<arr.length;i++){
+              total +=arr[i].prescribing_number
+           }
+          str =  "封管" +"("+total+")"
+        }
+        if(arrOne!=null && arrOne.length >0){
+            var total_one = 0
+           for(let i=0;i<arrOne.length;i++){
+             total_one +=arrOne[i].prescribing_number
+           }
+          str = str + "泵入" +"("+total_one+")"
+        }
+        return str
+      },
      getSpecification(id){
         var specification_name = ""
         for(let i=0;i<this.druglist.length;i++){
@@ -2289,36 +2334,37 @@ export default {
       GetMobileScheduleList().then(response=>{
         if(response.data.state == 1){
           var schedule = response.data.data.schedule
-          console.log("schedule---------------",schedule)
-          var arr = []
-          for(let i=0;i<schedule.length;i++){
-            if(schedule[i].monitor_record.ultrafiltration_volume!=schedule[i].xt_assesment_after_dislysis.actual_ultrafiltration){
-              arr.push(schedule[i])
-            }
-          }
-
-
-          import('@/vendor/Export2Excel').then(excel => {
-
-         if(arr!=null && arr.length > 0){
-           for(let i=0;i<arr.length;i++){
-             arr[i].patient_name = arr[i].patient.name
-             arr[i].target_ultrafiltration = arr[i].dialysis_prescription.target_ultrafiltration
-             arr[i].ultrafiltration_volume = arr[i].monitor_record.ultrafiltration_volume
-             arr[i].actual_ultrafiltration = arr[i].xt_assesment_after_dislysis.actual_ultrafiltration
-             arr[i].start_time =  this.getTimeSix(arr[i].schedule_date)
-           }
-         }
-         const tHeader = ['序号','日期','患者姓名','目标超滤量','监测超滤量','实际超滤量']
-         const filterVal = ['index','start_time','patient_name','target_ultrafiltration','ultrafiltration_volume','actual_ultrafiltration']
-
-         const data = this.formatJson(filterVal, arr)
-         excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '监测数据统计'
-          })
-         })
+          this.$message.success("保存成功!")
+        //   console.log("schedule---------------",schedule)
+        //   var arr = []
+        //   for(let i=0;i<schedule.length;i++){
+        //     if(schedule[i].monitor_record.ultrafiltration_volume!=schedule[i].xt_assesment_after_dislysis.actual_ultrafiltration){
+        //       arr.push(schedule[i])
+        //     }
+        //   }
+
+
+        //   import('@/vendor/Export2Excel').then(excel => {
+
+        //  if(arr!=null && arr.length > 0){
+        //    for(let i=0;i<arr.length;i++){
+        //      arr[i].patient_name = arr[i].patient.name
+        //      arr[i].target_ultrafiltration = arr[i].dialysis_prescription.target_ultrafiltration
+        //      arr[i].ultrafiltration_volume = arr[i].monitor_record.ultrafiltration_volume
+        //      arr[i].actual_ultrafiltration = arr[i].xt_assesment_after_dislysis.actual_ultrafiltration
+        //      arr[i].start_time =  this.getTimeSix(arr[i].schedule_date)
+        //    }
+        //  }
+        //  const tHeader = ['序号','日期','患者姓名','目标超滤量','监测超滤量','实际超滤量']
+        //  const filterVal = ['index','start_time','patient_name','target_ultrafiltration','ultrafiltration_volume','actual_ultrafiltration']
+
+        //  const data = this.formatJson(filterVal, arr)
+        //  excel.export_json_to_excel({
+        //    header: tHeader,
+        //    data,
+        //    filename: '监测数据统计'
+        //   })
+        //  })
         }
       })
     }

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -19,6 +19,7 @@
             {{ orgname }}
           </div>
           <div
+            v-if="org_id!=0 && org_id!=10449 && org_id!=3877 && org_id!=9671"
             class="order-title"
             style="
               letter-spacing: 0;
@@ -29,6 +30,20 @@
           >
             血液净化治疗记录单
           </div>
+
+          <div
+            v-if="org_id ==0 || org_id ==10449 || org_id ==3877 || org_id ==9671"
+            class="order-title"
+            style="
+              letter-spacing: 0;
+              font-weight: 600;
+              font-size: 22px;
+              display: inline-block;
+            "
+          >
+           <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
+           <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+          </div>
         </div>
         <div class="row">
           <div class="inline_block">
@@ -1207,6 +1222,70 @@
                       </div>
                     </div>
                   </div>
+
+
+                  <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id ==0 || org_id == 3877 || org_id ==10449 || org_id == 9671">
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                      v-if="prescription.anticoagulant != 5"
+                    >
+                      置换速度：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{
+                          prescription.displace_speed
+                            ? prescription.displace_speed
+                            : ""
+                        }}
+                      </div>
+                      <span>ml/h</span>
+                   
+                  
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 20px"
+                      v-if="prescription.anticoagulant != 5"
+                    >
+                    透析液流速：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{
+                          prescription.dialysis_fluid_flow
+                            ? prescription.dialysis_fluid_flow
+                            : ""
+                        }}
+                      </div>
+                      <span>ml/h</span>
+                   
+                  
+                    </div>
+                    <div class="inline_block" style="margin-left: 20px">
+                      碳酸氢钠流速：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{
+                          prescription.sodium_bicarbonate_flow
+                            ? prescription.sodium_bicarbonate_flow
+                            : ""
+                        }}
+                      </div>
+                     
+                     
+                    </div>
+                    <span>ml/h</span>
+                   
+              
+                  
+                  </div>
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -1288,7 +1367,8 @@
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671">透析液温度(°C)</td>
                         <td width="50" v-if="org_id != 10121">电导度<br />(ms/cm)</td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
-                        <td width="50">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
+                        <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td
                           v-if="
                             prescription.mode_id == 2 ||
@@ -1299,6 +1379,7 @@
                         >
                           置换量<br />(ml)
                         </td>
+                        <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">滤前压(mmHg)</td>
                         <td width="50" v-if="org_id == 9538">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>  
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>  
@@ -1409,6 +1490,7 @@
                             }}
                           </span>
                         </td>
+                        <td width="50" v-if="org_id == 3877 || org_id == 0 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
                         <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671">
                           {{ monitor.ktv }}
                         </td>
@@ -1675,7 +1757,12 @@
                 display: inline-block;
               "
             >
-              血液净化治疗记录单
+             <span v-if="org_id!=3877 && org_id!=0 && org_id!=10449">血液净化治疗记录单</span>
+             <span v-if="org_id == 3877 || org_id == 0 || org_id == 10449">
+              <span v-if="prescription.mode_id!=13">血液净化治疗记录单</span>
+              <span v-if="prescription.mode_id==13">连续性肾脏替代治疗（CRRT）记录单</span>
+             </span>
+            
             </div>
           </div>
           <div class="row">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -390,7 +390,7 @@
             </td>
           </tr>
           <tr>
-            <!-- <td style="text-align: left" colspan="1">
+            <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 责任护士:
                 <span
@@ -401,7 +401,7 @@
                   <img style="height:30px;" :src="setAdminUserES(dialysisOrder.quality_nurse_id)" alt srcset />
                 </span>
               </span>
-            </td> -->
+            </td>
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 <span
@@ -957,10 +957,10 @@
               超滤率
               <br />ml/h
             </td>
-            <td style="min-width: 60px">
+            <!-- <td style="min-width: 60px">
               超滤量
               <br />ml
-            </td>
+            </td> -->
             <td style="min-width: 60px">
               电导度
               <br />
@@ -993,7 +993,7 @@
             </td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.ultrafiltration_rate }}</td>
-            <td>{{ monitor.ultrafiltration_volume }}</td>
+            <!-- <td>{{ monitor.ultrafiltration_volume }}</td> -->
             <td>{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>
               <span style="line-height: 18px; display: block">

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

@@ -1806,11 +1806,33 @@ export default {
         }
         return ''
       },
+      // getAge: function(val) {
+      //   if (val.birthday != 0) {
+      //     return jsGetAge(val.birth, '-')
+      //   }
+      //   return ''
+      // },
       getAge: function(val) {
-        if (val.birthday != 0) {
-          return jsGetAge(val.birth, '-')
+     
+      if (val.id_card_no) {
+        var thisLen = val.id_card_no.length
+
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
         }
-        return ''
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
+       }
       },
       newAdviceGroupObject: function() {
         return Object.assign(

src/xt_pages/management/components/QualityForm.vue

@@ -2907,7 +2907,7 @@ export default {
             }
           }
           this.tableFour = devicePh
-          console.log("deviceph",devicePh)
+        
          
 
         }
@@ -2966,6 +2966,7 @@ export default {
       }
     },
     changeTable(val) {
+      
       if (val === 1) {
         this.showOne = false;
         this.showTwo = false;
@@ -3649,10 +3650,11 @@ export default {
               dialyste[index].sampling_locationb = "反渗水末端取样口";
             }
           }
+
           this.table = dialyste;
 
           var ions = response.data.data.ions;
-          console.log("ions",ions)
+         
           this.tableDatas = ions;
           var oxygenates =  response.data.data.oxygenates
           for (let index = 0; index < oxygenates.length; index++) {

src/xt_pages/management/home.vue

@@ -1772,6 +1772,11 @@
 
 
 
+                           
+                            <el-divider></el-divider>
+                         </div>     
+                             
+                        
                             <span style="margin-bottom: 20px;display: block;">有毒化合物检测</span>
                             <el-form ref="qualityFormFour" :model="qualityFormFour" :rules="diaRules">
                               <el-row>
@@ -1895,10 +1900,6 @@
                               </el-row>
                             </el-form>
                             <el-divider></el-divider>
-                         </div>     
-                             
-
-                             
 
 
 
@@ -2031,127 +2032,127 @@
 
 
                                <span style="margin-bottom: 20px;display: block;">水游离氯检测</span>
-                            <el-form ref="qualityFormSix" :model="qualityFormSix" :rules="diaRules">
-                              <el-row>
+                              <el-form ref="qualityFormSix" :model="qualityFormSix" :rules="diaRules">
+                                <el-row>
+                                    <el-col :span="8">
+                                      <el-form-item label="取样日期:">
+                                          <el-date-picker
+                                            v-model="qualityFormSix.sampling_date"
+                                            prefix-icon="none"
+                                            type="date"
+                                            placeholder="请选择"
+                                            format="yyyy-MM-dd"
+                                            value-format="yyyy-MM-dd"
+                                            style="width:150px">
+                                          </el-date-picker>
+                                      </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="取样标本:">
+                                            <el-select style="width:150px"  v-model="qualityFormSix.specimenb" @change="changeSpecimen">
+                                              <el-option v-for="item in samplingSpecimen" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                      <el-form-item label="A浓缩液批号:">
+                                        <el-input style="width:150px" v-model="qualityFormSix.concentrate_noc" :disabled="disable"></el-input>
+                                      </el-form-item>
+                                    </el-col>
+
+                                </el-row>
+                                <el-row>
                                   <el-col :span="8">
-                                     <el-form-item label="取样日期:">
-                                        <el-date-picker
-                                          v-model="qualityFormSix.sampling_date"
-                                          prefix-icon="none"
-                                          type="date"
-                                          placeholder="请选择"
-                                          format="yyyy-MM-dd"
-                                          value-format="yyyy-MM-dd"
-                                          style="width:150px">
-                                        </el-date-picker>
-                                     </el-form-item>
+                                        <el-form-item label="B浓缩液批号:">
+                                            <el-input style="width:150px" v-model ="qualityFormSix.concentrateb_nod" :disabled="diableTwo"></el-input>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                    <el-form-item label="采样部位:">
+                                      <el-select style="width:150px"  v-model="qualityFormSix.sampling_locationb">
+                                        <el-option v-for="item in samplingLocation" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                      </el-select>
+                                    </el-form-item>
                                   </el-col>
                                   <el-col :span="8">
-                                       <el-form-item label="取样标本:">
-                                          <el-select style="width:150px"  v-model="qualityFormSix.specimenb" @change="changeSpecimen">
-                                             <el-option v-for="item in samplingSpecimen" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                          </el-select>
-                                       </el-form-item>
+                                    <el-form-item label="检测单位:" required prop="detection_unit">
+                                        <el-input style="width:150px" v-model ="qualityFormSix.detection_unit"></el-input>
+                                    </el-form-item>
                                   </el-col>
+                                </el-row>
+                                <el-row>
                                   <el-col :span="8">
-                                     <el-form-item label="A浓缩液批号:">
-                                       <el-input style="width:150px" v-model="qualityFormSix.concentrate_noc" :disabled="disable"></el-input>
-                                     </el-form-item>
-                                  </el-col>
-
-                              </el-row>
-                              <el-row>
-                                 <el-col :span="8">
-                                      <el-form-item label="B浓缩液批号:">
-                                          <el-input style="width:150px" v-model ="qualityFormSix.concentrateb_nod" :disabled="diableTwo"></el-input>
-                                      </el-form-item>
+                                    <el-form-item label="取样者:" required prop="samplerb">
+                                        <el-select style="width:150px"  v-model="qualityFormSix.samplerb">
+                                          <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
+                                        </el-select>
+                                    </el-form-item>
                                   </el-col>
-                                   <el-col :span="8">
-                                  <el-form-item label="采样部位:">
-                                    <el-select style="width:150px"  v-model="qualityFormSix.sampling_locationb">
-                                       <el-option v-for="item in samplingLocation" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                    </el-select>
-                                   </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                   <el-form-item label="检测单位:" required prop="detection_unit">
-                                      <el-input style="width:150px" v-model ="qualityFormSix.detection_unit"></el-input>
-                                   </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
-                                <el-col :span="8">
-                                   <el-form-item label="取样者:" required prop="samplerb">
-                                      <el-select style="width:150px"  v-model="qualityFormSix.samplerb">
-                                        <el-option v-for="item in sampling" :key="item.addmin_user_id" :label="item.user_name" :value="item.admin_user_id"></el-option>
-                                      </el-select>
-                                   </el-form-item>
-                                </el-col>
-                                <el-col :span="8">
-                                  <el-form-item label="出报告日期:" required prop="reporting_dateb">
-                                     <el-date-picker
-                                       v-model="qualityFormSix.reporting_dateb"
-                                       prefix-icon="none"
-                                       type="date"
-                                       placeholder="请选择"
-                                       format="yyyy-MM-dd"
-                                       value-format="yyyy-MM-dd"
-                                       style="width:150px">
-                                    </el-date-picker>
-                                  </el-form-item>
-                                </el-col>
-                               
-                                <el-col :span="8">
-                                  <el-form-item label="顺序号:" required prop="sort">
-                                     <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
-                                  </el-form-item>
-                                </el-col>
-                              </el-row>
-                              <el-row>
                                   <el-col :span="8">
-                                      <el-form-item label="检测合格:" required prop="pass_examination">
-                                        <el-radio v-model="qualityFormSix.pass_examination" label="1">是</el-radio>
-                                        <el-radio v-model="qualityFormSix.pass_examination" label="2">否</el-radio>
-                                      </el-form-item>
+                                    <el-form-item label="出报告日期:" required prop="reporting_dateb">
+                                      <el-date-picker
+                                        v-model="qualityFormSix.reporting_dateb"
+                                        prefix-icon="none"
+                                        type="date"
+                                        placeholder="请选择"
+                                        format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd"
+                                        style="width:150px">
+                                      </el-date-picker>
+                                    </el-form-item>
                                   </el-col>
+                                
                                   <el-col :span="8">
-                                      <el-form-item label="修改标志:" required prop="modifications">
-                                        <el-select style="width:150px"  v-model="qualityFormSix.modifications">
-                                          <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                                        </el-select>
-                                      </el-form-item>
+                                    <el-form-item label="顺序号:" required prop="sort">
+                                      <el-input style="width:150px" v-model="qualityFormSix.sort" ></el-input>
+                                    </el-form-item>
                                   </el-col>
-                             </el-row>
-                              <el-row>
-                                <el-col :span="24">
-                                 <el-form-item label="检测结果:(EU/ml)" label-width="100px">
-                                     <el-input
-                                        type="textarea"
-                                        :rows="2"
-                                         placeholder="请输入内容"
-                                         style="width:600px"
-                                         v-model="qualityFormSix.detection_resultb"
-                                         >
-                                      </el-input>
-                                  </el-form-item>
-                                </el-col>
+                                </el-row>
+                                <el-row>
+                                    <el-col :span="8">
+                                        <el-form-item label="检测合格:" required prop="pass_examination">
+                                          <el-radio v-model="qualityFormSix.pass_examination" label="1">是</el-radio>
+                                          <el-radio v-model="qualityFormSix.pass_examination" label="2">否</el-radio>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="8">
+                                        <el-form-item label="修改标志:" required prop="modifications">
+                                          <el-select style="width:150px"  v-model="qualityFormSix.modifications">
+                                            <el-option v-for="item in modifications" :key="item.id" :label="item.name" :value="item.id"></el-option>
+                                          </el-select>
+                                        </el-form-item>
+                                    </el-col>
                               </el-row>
-                              <!-- <el-row>
+                                <el-row>
                                   <el-col :span="24">
-                                    <span style="color:#FF9900">注:水游离氯检测应至少每3个月1次,每台透析机每年至少检测一次</span>
-                                   </el-col>
-                              </el-row> -->
-                              <el-row>
-                                <div class="clearn">
-                                  <el-col :span="4">
-                                    <el-button @click="cleanLincomycin">取消</el-button>
-                                  </el-col>
-                                   <el-col :span="4">
-                                    <el-button type="primary" @click="saveWater('qualityFormSix')">保存</el-button>
+                                  <el-form-item label="检测结果:(EU/ml)" label-width="100px">
+                                      <el-input
+                                          type="textarea"
+                                          :rows="2"
+                                          placeholder="请输入内容"
+                                          style="width:600px"
+                                          v-model="qualityFormSix.detection_resultb"
+                                          >
+                                        </el-input>
+                                    </el-form-item>
                                   </el-col>
-                                </div>
-                              </el-row>
-                            </el-form>
+                                </el-row>
+                                <!-- <el-row>
+                                    <el-col :span="24">
+                                      <span style="color:#FF9900">注:水游离氯检测应至少每3个月1次,每台透析机每年至少检测一次</span>
+                                    </el-col>
+                                </el-row> -->
+                                <el-row>
+                                  <div class="clearn">
+                                    <el-col :span="4">
+                                      <el-button @click="cleanLincomycin">取消</el-button>
+                                    </el-col>
+                                    <el-col :span="4">
+                                      <el-button type="primary" @click="saveWater('qualityFormSix')">保存</el-button>
+                                    </el-col>
+                                  </div>
+                                </el-row>
+                              </el-form>
                             <el-divider></el-divider>
 
                            
@@ -3355,7 +3356,8 @@ export default {
         this.tabIndex = index
       },
       handleCurrentChange(val) {
-        console.log("Val222222222",val)
+        console.log("val-------------------------",val)
+        // 通过设备型号区分质量控制
         this.device_type = val.device_type
         this.unitType = val.unit_type
         this.currentRow = val

src/xt_pages/outpatientCharges/listPrint.vue

@@ -14,10 +14,11 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
+      <printOne v-if="org_id != 0 && org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
-      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
+<!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
+     <list-print-three v-if="org_id == 0 || org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
@@ -35,10 +36,12 @@
   import PrintThree from './listTemplate/printThree'
   import ListPrintTwo from './listTemplate/listPrintTwo'
   import PrintTwo10265 from "./listTemplate/printTwo10265";
+  import ListPrintThree from "./listTemplate/listPrintThree";
 
   export default {
     name: 'listPrint',
     components: {
+      ListPrintThree,
       PrintTwo10265,
       ListPrintTwo,
       PrintThree,

src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue

@@ -190,7 +190,7 @@ export default {
         birth.substr(4, 2) +
         "-" +
         birth.substr(6, 2);
-      var age = jsGetAge(birthTwo, "-");
+      var age = this.jsGetAge(birthTwo, "-");
       return age;
     },
 

src/xt_pages/outpatientTool/detailPrint.vue

@@ -18,6 +18,9 @@
           <tr>
             <td>患者姓名：{{ patient.name }}</td>
             <td>性别：{{ patient.gender == 1 ? "男" : "女" }}</td>
+            <td>性别：{{patient.id_card_no}}</td>
+
+            <TD>年龄：{{ getAge(patient.id_card_no)?getAge(patient.id_card_no)+'岁':''}}</TD>
             <td>结算类别：
             <span v-if="his_patient!=null&&his_patient.balance_accounts_type >0"> {{ getType(his_patient.balance_accounts_type) }} </span>
             <span v-if="his_record_patient!=null&&his_record_patient.balance_accounts_type >0">{{getType(his_record_patient.balance_accounts_type)}}</span></td>
@@ -164,7 +167,7 @@
 
 <script>
 import print from "print-js";
-import { uParseTime } from "@/utils/tools";
+import {jsGetAge, uParseTime } from "@/utils/tools";
 import { getHisSummaryDetailList } from "@/api/his/his_tools";
 export default {
   data() {
@@ -190,6 +193,24 @@ export default {
     };
   },
   methods: {
+    getAge(val){
+      console.log(val)
+      var thisLen = val.length;
+      var birth = "";
+      if (thisLen == 15) {
+        birth = "19" + val.substr(6, 6);
+      } else {
+        birth = val.substr(6, 8);
+      }
+      var birthTwo =
+        birth.substr(0, 4) +
+        "-" +
+        birth.substr(4, 2) +
+        "-" +
+        birth.substr(6, 2);
+      var age = jsGetAge(birthTwo, "-");
+      return age;
+    },
     printtpage() {
       const style =
         '@media print {.list-print{width:960px;margin:0 auto} .listTitle {font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo {display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;}.listTable {width: 100%;text-align: center;border-collapse: collapse;line-height: 25px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}.tableBottom {font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne {margin-right: 40px;}';
@@ -237,6 +258,7 @@ export default {
 
           this.list = list;
           this.patient = response.data.data.patient;
+          console.log(this.patient)
 
           this.his_patient = response.data.data.his_patient;
 

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -51,7 +51,7 @@
                    <span>{{ item.warehousing_count }}</span>
               </td>
               <td style="line-height: 18px">
-                <span>{{item.max_unit}}</span>
+                <span>{{item.limax_unit}}</span>
               </td>
               <td style="line-height:18px">
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>

src/xt_pages/workforce/components/tableData.vue

@@ -196,7 +196,7 @@
       <el-table-column
         prop="area"
         label="分区"
-        width="50"
+        width="100"
         align="center"
         fixed
       ></el-table-column>

src/xt_pages/workforce/remind_print_setting.vue

@@ -20,6 +20,50 @@
           <div class="table_panel">
             <div v-for="(main_collection,index) in scheduleData" :key="index" style="page-break-after: always;">
               <div class="signPrint" v-if="org_id != 10188 && org_id!=10217  && org_id!=10340 && org_id!=9671 && org_id!=9675">
+                <div>
+                  <span v-if="printObj.mode == 1">透析模式:
+                    <span v-if="main_collection.mode_id ==1">HD</span>
+                    <span v-if="main_collection.mode_id ==2">HDF</span>
+                    <span v-if="main_collection.mode_id ==3">HD+HP</span>
+                    <span v-if="main_collection.mode_id ==4">HP</span>
+                    <span v-if="main_collection.mode_id ==5">HF</span>
+                    <span v-if="main_collection.mode_id ==6">SCUF</span>
+                    <span v-if="main_collection.mode_id ==7">IUF</span>
+                    <span v-if="main_collection.mode_id ==8">HFHD</span>
+                    <span v-if="main_collection.mode_id ==9">HFHD+HP</span>
+                    <span v-if="main_collection.mode_id ==10">PHF</span>
+                    <span v-if="main_collection.mode_id ==11">HFR</span>
+                    <span v-if="main_collection.mode_id ==12">HDF+HP</span>
+                    <span v-if="main_collection.mode_id ==13">CRRT</span>
+                    <span v-if="main_collection.mode_id ==14">腹水回输</span>
+                    <span v-if="main_collection.mode_id ==19">IUF+HD</span>
+                    <span v-if="main_collection.mode_id ==20">UF</span>
+                    <span v-if="main_collection.mode_id ==21">HD+</span>
+                    <span v-if="main_collection.mode_id ==22">血浆胆红素吸附+HDF</span>
+                    <span v-if="main_collection.mode_id ==23">血浆胆红素吸附</span>
+                    <span v-if="main_collection.mode_id ==24">I-HDF</span>
+                    <span v-if="main_collection.mode_id ==25">HD高通</span>
+                    <span v-if="main_collection.mode_id ==26">CVVH</span>
+                    <span v-if="main_collection.mode_id ==27">CVVHD</span>
+                    <span v-if="main_collection.mode_id ==28">CVVHDF</span>
+                    <span v-if="main_collection.mode_id ==29">PE</span>
+                    <span v-if="main_collection.mode_id ==30">血浆胆红素吸附+HP</span>
+                    <span v-if="main_collection.mode_id ==31">HPD</span>
+                    <span v-if="main_collection.mode_id ==32">HDP</span>
+                  </span>
+                </div>
+                <div>
+                  <span v-if="printObj.week == 1">
+                     星期:
+                     <span v-if="main_collection.schedule_week ==1">星期一</span>
+                     <span v-if="main_collection.schedule_week ==2">星期二</span>
+                     <span v-if="main_collection.schedule_week ==3">星期三</span>
+                     <span v-if="main_collection.schedule_week ==4">星期四</span>
+                     <span v-if="main_collection.schedule_week ==5">星期五</span>
+                     <span v-if="main_collection.schedule_week ==6">星期六</span>
+                     <span v-if="main_collection.schedule_week ==7">星期日</span>
+                  </span>
+                </div>
                 <div>
                  <span v-if="printObj.zone == 1">分区/</span>
                  <span v-if="printObj.number == 1">床位号:</span>
@@ -78,6 +122,19 @@
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
                 <div>用法:静脉注射</div>
+                <!-- 透析器灌流器 -->
+               
+                 <div>
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器:</span>
+                  <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
+                  <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
+                </div>
+                <div v-if="printObj.doctor_advice == 1">
+                    医嘱：
+                   <span v-if="main_collection.doctoradvice!=''">{{getAdvice(main_collection.doctoradvice)}}</span>
+                </div>
+                
+               
                 <div>打印时间:{{currentDate}}</div>
               </div>
 
@@ -285,12 +342,12 @@
        getScheduleList(params).then(response=>{
          if(response.data.state ==1){
            var list = response.data.data.list
-          
+           
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-           
+           console.log("arr--------",arr)
            this.scheduleData = arr
 
              let a = response.data.data.day