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

src/api/drug/drug.js

@@ -809,4 +809,13 @@ export function getSelfDrugWarehouseOutById(id,params){
     method:"get",
     params:params
   })
+}
+
+export function modifySelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, patient_id, warehouse_out_id){
+
+  return request({
+    url:"/api/drug/modifyselfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&patient_id=' + patient_id + '&warehouse_out_id=' + warehouse_out_id,
+    method:"post",
+    data:params,
+   })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_seventeen.vue

@@ -184,6 +184,9 @@
                     
                     <span style="display:inline-block;">
                     <label-box :isChecked="record.prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
+                    <label-box :isChecked="record.prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>:
+                    <label-box :isChecked="record.prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>:
+                    <label-box :isChecked="record.prescription.anticoagulant == 16 ? true : false" showValue="低分子量肝素钙"></label-box>:
                     </span>
                     <span style="display:inline-block;">
                         <div style="display:inline-block;width:30px;text-align:center">

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

@@ -647,17 +647,14 @@
                   </td>
                 </tr>
                 <tr style="line-height: 35px; padding: 8px 5px">
-                  <td style="font-size: 16px" width="10%">时间</td>
-                  <td style="font-size: 16px" colspan="2" width="45%">
+                  <td style="font-size: 16px" width="6%">时间</td>
+                  <td style="font-size: 16px" colspan="2" width="54%">
                     医嘱内容
                   </td>
-
                   <td style="font-size: 16px" width="10%">医生签名</td>
-                  <td style="font-size: 16px" width="10%">时间</td>
+                  <td style="font-size: 16px" width="6%">时间</td>
                   <td style="font-size: 16px" width="10%">执行人签名</td>
-
                   <td style="font-size: 16px" width="10%">核对人签名</td>
-
                 </tr>
                 <template v-if="record.advices">
                   <tr
@@ -669,14 +666,13 @@
                         {{ getTime(advice[0].start_time, "{h}:{i}") }}
                       </span>
                     </td>
-
                     <td
                       height="35px"
                       colspan="2"
                       class="advice-name"
                       style="padding-left: 7px"
                     >
-                      <span v-if="advice[0].parent_id > 0">---></span>
+                      
                       <span>{{ advice[0].advice_name }}</span>
 
                       <span
@@ -787,6 +783,11 @@
                       />
                     </td>
                   </tr>
+                  
+                  
+                </template>
+                <template>
+
                 </template>
               </tbody>
             </table>
@@ -911,7 +912,7 @@
           <div  style="border: 1px solid black;border-bottom:none;width: 99%;">
             <div class="row" style="display: flex;">
               <div class="inline_block" style="flex: 1">
-                穿刺护士：
+                上机护士：
                 <div class="under_line"
                   style="width: 90px; text-align: center"
                 >
@@ -974,9 +975,9 @@
                 </div>
               </div>
               <div class="inline_block" style="flex: 1">
-                核对人员：
+                核对护士：
 
-                <div
+                <!-- <div
                   class="under_line"
                   style="width: 80px; text-align: center"
                   v-if="
@@ -1001,8 +1002,8 @@
                     srcset=""
                     v-else
                   />
-                </div>
-                <div
+                </div> -->
+                <!-- <div
                   class="under_line"
                   style="width: 80px; text-align: center"
                   v-if="
@@ -1029,17 +1030,15 @@
                     srcset=""
                     v-else
                   />
-                </div>
+                </div> -->
                 <div
                   class="under_line"
                   style="width: 80px; text-align: center"
                   v-if="
-                    record.check != null &&
-                    record.dialysis_order != null &&
-                    record.dialysis_order.start_nurse ==
-                      record.check.creater
+                    record.check != null
                   "
                 >
+                  <span style="height: 30px;display: inline-block;"></span>
                   <span
                     style=" display: inline-block"
                     v-if="
@@ -1060,7 +1059,7 @@
                     v-else
                   />
                 </div>
-                <div
+                <!-- <div
                   class="under_line"
                   style="width: 80px; text-align: center"
                   v-if="
@@ -1089,7 +1088,7 @@
                     srcset=""
                     v-else
                   />
-                </div>
+                </div> -->
                 <div
                   class="under_line"
                   style="width: 80px; text-align: left"
@@ -1188,7 +1187,7 @@
             </div>
           </div>
           <!-- 透析小结 -->
-          <div  style="width: 99%;border: 1px solid black;white-space: normal;padding:5px ;">
+          <div  style="width: 99%;border: 1px solid black;white-space: normal;padding:5px;box-sizing: border-box;">
             <div style="width: 100%;margin-bottom: 6px;">
               <div style="margin-bottom: 10px;">
                 宣教知识：
@@ -1395,6 +1394,7 @@ export default {
     //     return false;
     //   }
   },
+ 
   mounted() {
     this.loading = true;
     var ids = this.$store.getters.temp_params.batch_print_dialysis_record_ids;
@@ -1405,6 +1405,8 @@ export default {
     GetBatchPrintDialysisData(ids.join(","))
       .then((rs) => {
         var resp = rs.data;
+        console.log('kkkkkk',rs.data);
+        
         if (resp.state == 1) {
           this.records = this.records.concat(resp.data.schedules);
           var tempmonitorflag = true;
@@ -1464,7 +1466,8 @@ export default {
             } else {
               delghTwo = 0;
             }
-
+            console.log('delghTwo',delghTwo);
+            
             if (delghTwo > 0) {
               if (
                 typeof this.records[recordIndex].advices === "undefined" ||
@@ -1474,9 +1477,11 @@ export default {
               }
               for (let index = 0; index < delghTwo; index++) {
                 this.records[recordIndex].advices.push([]);
+                // console.log('ttttt',this.records[recordIndex].advices);
               }
             }
-
+            // console.log('oooooo',this.records[recordIndex].advices);
+            
             var childMap = {};
             for (const index in this.records[recordIndex].advices) {
               if (this.records[recordIndex].advices[index].parent_id == 0) {
@@ -1496,19 +1501,25 @@ export default {
             }
 
             var advices = [];
+            // console.log('oooooo22',this.records[recordIndex].advices);
             for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id > 0) {
-                continue;
-              }
+              // if (this.records[recordIndex].advices[index].parent_id > 0) {
+              //   continue;
+              // }
               var item = this.records[recordIndex].advices[index];
+              
               if (item.id in childMap) {
                 item.children = childMap[item.id];
+               
               } else {
                 item.children = [];
               }
               advices.push(item);
             }
-
+            // var advices = this.records[recordIndex].advices
+            console.log('111111111',advices);
+            console.log('this.records',this.records);
+            
             var leftAdvice = [];
             var rightAdvice = [];
             var adlen = advices.length;
@@ -1540,12 +1551,6 @@ export default {
               this.records[recordIndex].advices.push(item);
             }
           }
-          console.log(this.records, "this.records");
-          // this.records.forEach(o => {
-          //   console.log(o,'jj')
-          //   this.blood_access_part_opera_name = this.bloodAccessParOperaName(
-          //   o.assessment_before_dislysis.blood_access_part_opera_id)
-          // })
 
           this.operators = resp.data.medical_staffs;
           if (this.operators.length > 0) {
@@ -1598,7 +1603,7 @@ export default {
     },
     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; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; 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 50px;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_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.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: 5px 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: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
+        '@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; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; 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 50px;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;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.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: 5px 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: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
 
       printJS({
         printable: "print_content",

src/xt_pages/dialysis/batch_print/batch_print_order_seventynine.vue

@@ -58,7 +58,7 @@
                   </tr>
 
                    <tr>
-                    <td colspan="3">
+                    <td colspan="2">
                       <div style="line-height:30px;">
                         上机前病情:
                         <label-box :isChecked="record.assessment_before_dislysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
@@ -66,6 +66,15 @@
                         <span>{{record.assessment_before_dislysis.symptom_before_dialysis_other}}</span>
                       </div>
                     </td>
+                    <td>
+                      <div style="line-height:30px;">
+                        BP:
+                        {{ record.assessment_before_dislysis.systolic_blood_pressure ? record.assessment_before_dislysis.systolic_blood_pressure : ""}} /
+                        {{ record.assessment_before_dislysis.diastolic_blood_pressure ? record.assessment_before_dislysis.diastolic_blood_pressure : ""}}
+                        mmHg
+                      </div>
+                      
+                    </td>
                   </tr>
 
                   <tr>
@@ -170,14 +179,8 @@
                   <td colspan="3">
                     <div style="display: inline-block;line-height: 30px;">
                       血管通路:
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='内瘘' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='长期静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='临时静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!=''?true :false" showValue="其它">
-                      </label-box>
+                      {{ record.assessment_before_dislysis.blood_access_part_id ? record.assessment_before_dislysis.blood_access_part_id :'' }}
+                      {{ QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                     </div>&nbsp;&nbsp;
                     <div style="display: inline-block;line-height: 30px;">
                       穿刺者:
@@ -586,8 +589,12 @@
                 for (let index = 0; index < delghTwo; index++) {
                   this.records[recordIndex].advices.push([])
                 }
+                for(let i  in this.records[recordIndex].his_advices){
+                  this.records[recordIndex].advices.unshift(this.records[recordIndex].his_advices[i])
+                }
               }
-
+              console.log('his_advices',this.records[recordIndex].advices);
+              
               var childMap = {}
               for (const index in this.records[recordIndex].advices) {
                 if (this.records[recordIndex].advices[index].parent_id == 0) {
@@ -620,7 +627,9 @@
                 }
                 advices.push(item)
               }
-
+              // advices = advices.concat(this.records[recordIndex].his_advices)
+              console.log('advices',advices);
+              
               var leftAdvice = []
               var rightAdvice = []
               var adlen = advices.length

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -893,7 +893,7 @@
                             record.assessment_after_dislysis.cvc_a ? record.assessment_after_dislysis.cvc_a : "/"
                             }}ml</span
                             >
-                        <span style="padding -left: 15px"
+                        <span style="padding-left: 15px"
                             >V:{{
                             record.assessment_after_dislysis.cvc_v ? record.assessment_after_dislysis.cvc_v : "/"
                             }}ml</span
@@ -1365,65 +1365,61 @@
           <!-- <th>核对者</th> -->
         </tr>
         <tr  v-for="(advice, advice_index) in record.advices" :key="advice_index">
-          <td style="height:30px;line-height:30px">{{ getTime(advice[0].start_time, "{h}:{i}") }}</td>
-          <td> <span
-                    v-if="
-                      setAdminUserES(advice[0], 'advice_doctor') ==
-                                  ''
-                              "
-                              >{{
-                                getAdminUser(advice[0], "advice_doctor")
-                              }}</span
-                            >
-                            <span v-else style="display:flex;align-items:center;height:36px;">
-                            <img
-                              class="es-img"
-                              :src="
-                                setAdminUserES(advice[0], 'advice_doctor')
-                              "
-                              alt=""
-                              srcset=""
-                              style="height: 30px;margin:0 auto"
-                            /></span>
-            </td>
-          <td style="text-align:left;padding-left:20px"> <span v-if="advice[0].parent_id > 0">└</span>
-                       <span>{{ advice[0].advice_name }}</span>
-                        <span
-                           >{{ advice[0].advice_desc
-                         }}{{ advice[0].drug_spec_unit }}</span
-                            >
-                            <span v-if="advice[0].prescribing_number"
-                              >* {{ advice[0].prescribing_number
-                              }}{{ advice[0].prescribing_number_unit }}</span
-                            >
-                            <span v-if="advice[0].single_dose != 0"> 
-                             <span v-if="advice[0].single_dose >0"> 单次用量 </span>{{ advice[0].single_dose
-                              }}{{ advice[0].single_dose_unit }}</span
-                            >
-                            <span>{{ advice[0].delivery_way }}</span>
-                            <span>{{ advice[0].execution_frequency }}</span>
-                            </td>
-                  <td>
-                     <span
-                           v-if="
-                             setAdminUserES(advice[0], 'execution_staff') ==
-                                  ''
-                              "
-                              >{{
-                                getAdminUser(advice[0], "execution_staff")
-                              }}</span
-                            >
-                            <span v-else style="display:flex;align-items:center;height:36px;">
-                            <img
-                              class="es-img"
-                              :src="
-                                setAdminUserES(advice[0], 'execution_staff')
-                              "
-                              alt=""
-                              srcset=""
-                              style="height: 30px;margin:0 auto"
-                            /></span>
-                   </td>
+          <td style="height:30px;line-height:30px">{{ getTime(advice[0].start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td> 
+            <span v-if=" setAdminUserES(advice[0], 'advice_doctor') == ''"
+            >{{
+                getAdminUser(advice[0], "advice_doctor")
+              }}</span>
+              <span v-else style="display:flex;align-items:center;height:36px;">
+              <img
+                class="es-img"
+                :src="
+                  setAdminUserES(advice[0], 'advice_doctor')
+                "
+                alt=""
+                srcset=""
+                style="height: 30px;margin:0 auto"
+              /></span>
+          </td>
+          <td style="text-align:left;padding-left:20px"> 
+            <span v-if="advice[0].parent_id > 0"></span>
+              <span>{{ advice[0].advice_name }}</span>
+              <span >{{ advice[0].advice_desc
+                }}{{ advice[0].drug_spec_unit }}</span
+                  >
+                  <span v-if="advice[0].prescribing_number"
+                    >* {{ advice[0].prescribing_number
+                    }}{{ advice[0].prescribing_number_unit }}</span
+                  >
+                  <span v-if="advice[0].single_dose != 0"> 
+                    <span v-if="advice[0].single_dose >0"> 单次用量 </span>{{ advice[0].single_dose
+                    }}{{ advice[0].single_dose_unit }}</span
+                  >
+                  <span>{{ advice[0].delivery_way }}</span>
+                  <span>{{ advice[0].execution_frequency }}</span>
+          </td>
+          <td>
+            <span
+                  v-if="
+                    setAdminUserES(advice[0], 'execution_staff') ==
+                        ''
+                    "
+                    >{{
+                      getAdminUser(advice[0], "execution_staff")
+                    }}</span
+                  >
+                  <span v-else style="display:flex;align-items:center;height:36px;">
+                  <img
+                    class="es-img"
+                    :src="
+                      setAdminUserES(advice[0], 'execution_staff')
+                    "
+                    alt=""
+                    srcset=""
+                    style="height: 30px;margin:0 auto"
+                  /></span>
+          </td>
           <td>{{getTime(advice[0].execution_time,'{y}-{m}-{d} {h}:{i}')}}</td>
           <!-- <td>
               <span
@@ -1693,9 +1689,9 @@ export default {
 
             var advices = []
             for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id > 0) {
-                continue
-              }
+              // if (this.records[recordIndex].advices[index].parent_id > 0) {
+              //   continue
+              // }
               var item = this.records[recordIndex].advices[index]
               if (item.id in childMap) {
                 item.children = childMap[item.id]

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -170,13 +170,13 @@
         </li> -->
 
 
-        <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 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702">
+        <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 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
           <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 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702">
+        <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  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

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

@@ -149,7 +149,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            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 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702">
+                            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 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -159,7 +159,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            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 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702">
+                            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 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -2604,7 +2604,7 @@ mu
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
             }
-            this.dialysisPrescription.prescription_water = ""
+          
             if(this.dialysisPrescription.prescription_water==0 || this.dialysisPrescription.prescription_water==""){
               if((this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)>0){
                 this.dialysisPrescription.prescription_water = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635) ||
               org_id == 10387
             "
           >
@@ -1681,7 +1681,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635) &&
                 org_id!=10387
             "
           >
@@ -1729,7 +1729,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635)
               || org_id == 10387
             "
           >
@@ -1802,7 +1802,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1873,7 +1873,8 @@
               org_id!=10677 &&
               org_id!=10667 &&
               org_id!=10693 &&
-              org_id!=10697
+              org_id!=10697 &&
+              org_id!=10635
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,11 +20,11 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

@@ -165,8 +165,11 @@
             <td style="text-align:left;padding-left:15px;" colspan="6">
               
               <span style="display:inline-block;">
-              <label-box :isChecked="anticoagulant == 6? true : false" showValue="低分子肝素钙"></label-box>:
+                <label-box :isChecked="anticoagulant == 6? true : false" showValue="低分子肝素钙"></label-box>:
                 <label-box :isChecked="anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
+                <label-box :isChecked="anticoagulant == 8? true : false" showValue="依诺肝素"></label-box>:
+                <label-box :isChecked="anticoagulant == 16? true : false" showValue="低分子量肝素钙"></label-box>:
+               
               </span>
               <span style="display:inline-block;">
                   <div style="display:inline-block;width:30px;text-align:center">

src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue

@@ -32,7 +32,7 @@
             </tr>
 
             <tr>
-              <td colspan="3">
+              <td colspan="2">
                 <div style="line-height:30px;">
                   上机前病情:
                   <!-- <span v-if="predialysis.symptom_before_dialysis_other==''"> -->
@@ -44,6 +44,15 @@
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
                 </div>
               </td>
+              <td>
+                <div style="line-height:30px;">
+                  BP:
+                  {{ predialysis.systolic_blood_pressure ? predialysis.systolic_blood_pressure : ""}} /
+                  {{ predialysis.diastolic_blood_pressure ? predialysis.diastolic_blood_pressure : ""}}
+                  mmHg
+                </div>
+                
+              </td>
             </tr>
 
             <tr>
@@ -151,13 +160,8 @@
             <td colspan="3">
               <div style="display: inline-block;line-height: 30px;">
                 血管通路:
-                <!-- <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name!='内瘘' &&
-                            predialysis.blood_access_part_opera_name!='长期静脉导管' &&
-                            predialysis.blood_access_part_opera_name!='临时静脉导管'?true :false" showValue="其它">
-                </label-box> -->
+          
+                {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id :'/' }}
                 {{ predialysis.blood_access_part_opera_name ? predialysis.blood_access_part_opera_name :'/' }}
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -1275,7 +1275,7 @@
             </td>
             <td
               class="parent"
-              style="text-align: left; padding-left: 20px !important"
+              style="text-align: left; padding-left: 10px !important"
             >
               <span v-if="advice.parent_id > 0">&nbsp;&nbsp;&nbsp;</span>
               <span>{{ advice.advice_name }}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -629,7 +629,7 @@
         <div  style="border: 1px solid black;border-bottom:none;border-top:none;width: 99%;">
           <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 1">
-              穿刺护士：
+              上机护士：
               <div class="under_line"
                 style="width: 90px; text-align: center"
               >

src/xt_pages/stock/selfPreparedMedicine/editWarehouseInfo.vue

@@ -340,13 +340,12 @@
   import { uParseTime } from "@/utils/tools";
   import {
     GetAllDrugInfoByID,
-    postDrugWarehouse,
     toCheckWarehousingInfo,
     toReturnCheckWarehousing,
   } from "@/api/drug/drug_stock";
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
-  import { getAllDrugList, postSearchDrugList } from "@/api/data";
+  import { getAllDrugList } from "@/api/data";
   import { getallPatientList,postSearchSelfDrugList,ModifySelfDrugWarehouse,getSelfDrugWarehouseInfoById,deleteSelfWarehouseInfo} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

@@ -351,7 +351,7 @@
   import BreadCrumb from "../../components/bread-crumb";
   import { getDataConfig, getDictionaryDataConfig } from "@/utils/data";
   import { getAllDrugList, postSearchDrugList } from "@/api/data";
-    import { getallPatientList,postSearchSelfDrugList,postSelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
+    import { getallPatientList,postSearchSelfDrugList,modifySelfDrugWarehouseOut,getSelfDrugBatchNumber,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
   export default {
     components: { BreadCrumb },
     name: "stockIn",
@@ -473,6 +473,7 @@
         showReturnCheck:false,
         patientList:[],
         patient_id:"",
+        numberList:[]
       };
     },
     methods: {
@@ -808,11 +809,7 @@
                 this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id;
               }
             }
-            // for (let s = 0; s < this.doctorList.length; s++) {
-            //   if (this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name) {
-            //      this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id;
-            //   }
-            // }
+          
 
             this.recordInfo.recordData[i].last_price = 0
             this.recordInfo.recordData[i].stock_count = this.recordInfo.recordData[i].stock_count.toString();
@@ -821,14 +818,14 @@
             stockOut: this.recordInfo.recordData,
           };
           console.log("param22222222",params)
-        
+          console.log("haaaaaaaaaaaaaaa",this.warehouse_out_time,)
           const loading = this.$loading({
             lock: true,
             text: "Loading",
             spinner: "el-icon-loading",
             background: "rgba(0, 0, 0, 0.7)",
           });
-          postSelfDrugWarehouseOut(
+          modifySelfDrugWarehouseOut(
             params,
             this.warehouse_out_time,
             this.form.dealer,
@@ -858,6 +855,7 @@
               var dealerList = response.data.data.dealerList
               var manufacturerList = response.data.data.manufacturerList
               var drugTypeList = response.data.data.drugTypeList
+              
               for(let i=0;i<warehousingOutInfo.length;i++){
                 for(let j=0;j<dealerList.length;j++){
                    if(warehousingOutInfo[i].dealer == dealerList[j].id){
@@ -1165,9 +1163,80 @@
 
       getSelfDrugWarehouseOutById(id){
         getSelfDrugWarehouseOutById(id).then(response=>{
-
+          if(response.data.state ==1){
+              var outInfo = response.data.data.outInfo
+              this.manufacturerList = response.data.data.manufacturerList
+              this.dealerList = response.data.data.dealerList
+              this.drugTypeList = response.data.data.drugTypeList
+              console.log("out_info",outInfo)
+              const tempObj = {};
+              this.patient_id = outInfo.patient_id
+              this.warehouse_out_time = this.getTimeOne(outInfo.sys_record_time);
+              this.warehouse_out_id  = outInfo.warehouse_out_id
+              tempObj["id"] = outInfo.id;
+              tempObj["drug_id"] = outInfo.drug_id;
+              tempObj["max_unit"] = outInfo.count_unit;
+              tempObj["min_unit"] = outInfo.min_unit, 
+              tempObj["return_count"] = "";
+              tempObj["price"] = "";
+              tempObj["remark"] = outInfo.remark;
+              tempObj["manufacturer"] = this.getManufacturer(outInfo.manufacturer)
+              tempObj["batch_number"] = outInfo.batch_number;
+              tempObj["drug_type"] = this.GetDrugTypeName(outInfo.drug.drug_type) 
+              tempObj["dose"] = "";
+              tempObj["dose_unit"] = "";
+              tempObj["min_number"] = "";
+              tempObj["dealer"] = this.getDealer(outInfo.dealer) 
+              tempObj["number"] = "";
+              tempObj["warehouse_info_id"] = outInfo.warehouse_info_id;
+              tempObj["count"] = (outInfo.count).toString();
+              tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
+              tempObj["retail_price"] = 0;
+              tempObj["last_price"] = "";
+              tempObj["stock_count"] = "";
+              tempObj["total_count"] = 0;
+              tempObj["max_unit_fisrt"] = 0;
+              tempObj["min_unit_fisrt"] = 0;
+              tempObj["total_price"] = 0;
+              tempObj["patient_id"] = outInfo.patient_id
+              tempObj["product_date"] = this.getTimeOne(outInfo.product_date);
+              tempObj["expiry_date"]=this.getTimeOne(outInfo.expiry_date)
+              tempObj["class_type"] = ""
+              tempObj["drug_name"] = outInfo.drug.drug_name
+              tempObj["name"] = outInfo.drug.dose + outInfo.drug.dose_unit + "*" + outInfo.drug.min_number+outInfo.drug.min_unit +"/"+outInfo.drug.max_unit
+              this.recordInfo.recordData = []
+              this.recordInfo.recordData.push(tempObj);
+          }
         })
-      }
+      },
+
+      getManufacturer(id) {
+        var name = "";
+        for (let i = 0; i < this.manufacturerList.length; i++) {
+            if (id == this.manufacturerList[i].id) {
+            name = this.manufacturerList[i].manufacturer_name;
+            }
+        }
+        return name;
+       },
+        getDealer(id) {
+            var name = "";
+            for (let i = 0; i < this.dealerList.length; i++) {
+                if (id == this.dealerList[i].id) {
+                name = this.dealerList[i].dealer_name;
+                }
+            }
+            return name;
+       },
+       GetDrugTypeName(drug_type){
+            var name = ""
+            for(let i=0;i<this.drugTypeList.length;i++){
+            if(drug_type == this.drugTypeList[i].value){
+                name = this.drugTypeList[i].name
+            }
+            }
+            return name
+      },
     
     
     },

src/xt_pages/workforce/remind_print.vue

@@ -24,24 +24,24 @@
             <table class="table">
               <thead>
                 <tr>
-                  <td width="50">序号</td>
-                  <td width="100" v-if="printObj.week == 1">星期</td>
-                  <td width="100" v-if="printObj.name == 1">姓名</td>
-                  <td width="70" v-if="printObj.zone == 1">分区</td>
-                  <td width="70" v-if="printObj.classes == 1">班次</td>
-                  <td width="70" v-if="printObj.number == 1">机号</td>
-                  <td width="120" v-if="printObj.mode == 1">透析模式</td>
+                  <td width="60">序号</td>
+                  <td width="60" v-if="printObj.week == 1">星期</td>
+                  <td width="70" v-if="printObj.name == 1">姓名</td>
+                  <td width="100" v-if="printObj.zone == 1">分区</td>
+                  <td width="60" v-if="printObj.classes == 1">班次</td>
+                  <td width="100" v-if="printObj.number == 1">机号</td>
+                  <td width="50" v-if="printObj.mode == 1">透析模式</td>
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
                   <td width="100" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>
-                  <td width="100" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
-                  <td width="200">血管通路</td>
+                  <td width="30" v-if="printObj.anticoagulant_zongliang == 1">总量</td>
+                  <td width="">血管通路</td>
                   <td width="300" v-if="printObj.doctor_advice == 1">长期医嘱</td>
                 </tr>
               </thead>
               <tbody>
               <tr v-for="(main_collection, index) in scheduleData" :key="index">
-                <td :width="td_1_width">{{index + 1}}</td>
-                <td :width="td_1_width" v-if="printObj.week == 1">
+                <td >{{index + 1}}</td>
+                <td  v-if="printObj.week == 1">
                   <span v-if="main_collection.schedule_week == 0">周日</span>
                   <span v-if="main_collection.schedule_week == 1">周一</span>
                   <span v-if="main_collection.schedule_week == 2">周二</span>
@@ -50,20 +50,19 @@
                   <span v-if="main_collection.schedule_week == 5">周五</span>
                   <span v-if="main_collection.schedule_week == 6">周六</span>
                 </td>
-                <td :width="td_1_width" v-if="printObj.name == 1">{{ main_collection.patient.name}}</td>
-                <td :width="td_1_width" v-if="printObj.zone == 1">{{ main_collection.zone.name }} （{{ getType(main_collection.partition_id)  }}）</td>
-                <td :width="td_1_width" v-if="printObj.classes == 1">
+                <td  v-if="printObj.name == 1">{{ main_collection.patient.name}}</td>
+                <td  v-if="printObj.zone == 1">{{ main_collection.zone.name }}({{ getType(main_collection.partition_id)  }})</td>
+                <td v-if="printObj.classes == 1">
                   {{getSchedulesType(main_collection.schedule_type)}}
                 </td>
-                <td :width="td_1_width" v-if="printObj.number == 1">
+                <td v-if="printObj.number == 1">
                   {{main_collection.number.number}}
-
                 </td>
-                <td :width="td_1_width" v-if="printObj.mode == 1">
+                <td v-if="printObj.mode == 1">
                   {{modeOptions[main_collection.mode_id].name}}
                 </td>
 
-                <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
+                <td v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                  
                   <span v-if="main_collection.prescription.dialysis_dialyszers == ''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
                   <span v-if="main_collection.prescription.dialysis_dialyszers != ''">{{main_collection.prescription.dialysis_dialyszers}}</span>
@@ -74,14 +73,14 @@
                   <span v-if="main_collection.prescription.dialysis_irrigation == ''">/{{main_collection.dialysissolution.dialysis_irrigation}}</span>
                   <span v-if="main_collection.prescription.dialysis_irrigation != ''">/{{main_collection.prescription.dialysis_irrigation}}</span>
                 </td>
-                <td :width="td_1_width" v-if="printObj.anticoagulant == 1">
+                <td v-if="printObj.anticoagulant == 1">
                   {{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}
                   <span v-if="main_collection.prescription.antioxidant_commodity_name!=''">
                     (<span>{{main_collection.prescription.antioxidant_commodity_name}}</span>)
                   </span>
                 </td>
               
-                <td :width="td_1_width" v-if="printObj.anticoagulant_zongliang == 1">
+                <td v-if="printObj.anticoagulant_zongliang == 1">
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'mg':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 3">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
@@ -94,10 +93,10 @@
                   <span v-if="main_collection.dialysissolution.anticoagulant == 10">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 11">{{main_collection.dialysissolution.anticoagulant_zongliang?main_collection.dialysissolution.anticoagulant_zongliang+'iu':''}}</span>
                 </td>
-                <td :width="td_1_width">
+                <td >
                    <span>{{getBloodName(main_collection.prescription.blood_access)  }}</span>
                 </td>
-                <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
+                <td  style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
                    <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
                 </td>
@@ -499,8 +498,8 @@
           td {
             border: 1px solid;
             text-align: center;
-            font-size: 20px;
-            padding: 15px 5px;
+            font-size: 18px;
+            padding: 10px 5px;
           }
         }
       }