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

src/api/dialysis.js

@@ -537,4 +537,4 @@ export function getDialysisGatherList(params){
     method:"get",
     params:params,
   })
-}
+}

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

@@ -273,13 +273,13 @@
                           }}
                           {{QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                         </div>
-                      </div>                    
+                      </div>
                     </div>
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                     
+
                       <div class="inline_block" style="flex: 1">
                         内瘘：
                         <div
@@ -296,7 +296,7 @@
                         </div>
                       </div>
 
-                      
+
                     </div>
                     <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                       <div
@@ -406,10 +406,16 @@
                       >
                       <span>
                         {{
-                          
+
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.puncture_needle_direction
+                              ? record.assessment_before_dislysis
+                                  .puncture_needle_direction
+                              : "/"
+
                         }}
                       </span>
-                       
+
                       </div>
                       </div>
                     </div>
@@ -678,7 +684,7 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                         
+
 
                           <span v-if="org_id==10206">
                               {{
@@ -750,7 +756,7 @@
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
-                    > 
+                    >
 
                       <div class="inline_block" style="flex:1">
                         透前症状：
@@ -775,17 +781,12 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          {{
-                            record.prescription &&
-                            record.prescription.dialyzer_perfusion_apparatus
-                              ? record.prescription.dialyzer_perfusion_apparatus
-                              : ""
-                          }}
+
                           {{
                             record.prescription &&
                             record.prescription.dialysis_dialyszers
                               ? record.prescription.dialysis_dialyszers
-                              : "/"
+                              : ""
                           }}
                         </div>
                       </div>
@@ -804,20 +805,15 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="flex: 1">
-                        透析机号：
+                      <div class="inline_block" style="flex:1">
+                        滤过器：
                         <div
                           class="under_line"
-                          style="width: 50px; text-align: center"
+                          style="width: 70px; text-align: center"
                         >
-                          {{
-                            record.dialysis_order &&
-                            record.dialysis_order.device_number &&
-                            record.dialysis_order.device_number.number.length >
-                              0
-                              ? record.dialysis_order.device_number.number
-                              : record.device_number.number
-                          }}
+                         {{
+                             record.prescription.dialysis_strainer?record.prescription.dialysis_strainer:"/"
+                           }}
                         </div>
                       </div>
 
@@ -829,15 +825,15 @@
                         >
                         {{
                              record.assessment_before_dislysis.machine_type ?
-                              record.assessment_before_dislysis.machine_type : '' 
+                              record.assessment_before_dislysis.machine_type : ''
                           }}
                         </div>
                       </div> -->
-                     
+
                     </div>
 
                     <div
-                    
+
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
@@ -878,7 +874,7 @@
                           class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          
+
                           <span >{{
                             record.assessment_before_dislysis &&
                             record.assessment_before_dislysis
@@ -904,7 +900,7 @@
                           <span>{{
                             record.lastafterweight.weight_after
                           }}</span>
-                       
+
                         </div>
                         kg
                       </div>
@@ -936,8 +932,25 @@
                           </div>
                           kg
                       </div>
-                      <div class="inline_block" style="flex: 1" >
-                        目标超滤量：
+                      <div class="inline_block" style="flex: 1" v-if="org_id ==10597">
+                        处方超滤量：
+                        <div
+                          class="under_line"
+                          style="width: 60px; text-align: center"
+                        >
+                          {{
+                            record.prescription &&
+                            record.prescription.prescription_water
+                              ? record.prescription.prescription_water
+                              : "/"
+                          }}
+                        </div>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span>
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
+                      </div>
+
+                      <div class="inline_block" style="flex: 1" v-if="org_id ==10599">
+                         目标超滤量：
                         <div
                           class="under_line"
                           style="width: 60px; text-align: center"
@@ -949,10 +962,10 @@
                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span> 
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460">ml</span>
                          <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460">L</span>
                       </div>
-                     
+
                     </div>
 
                     <div class="row" style="padding: 2px 0; line-height: 23px" v-if="org_id!=10449">
@@ -1189,7 +1202,24 @@
                         <span v-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
-                      </div>                      
+                      </div>
+
+                      <div class="inline_block" style="flex: 1">
+                        透析机号：
+                        <div
+                          class="under_line"
+                          style="width: 50px; text-align: center"
+                        >
+                          {{
+                            record.dialysis_order &&
+                            record.dialysis_order.device_number &&
+                            record.dialysis_order.device_number.number.length >
+                              0
+                              ? record.dialysis_order.device_number.number
+                              : record.device_number.number
+                          }}
+                        </div>
+                      </div>
                     </div>
                   </td>
                 </tr>
@@ -1270,7 +1300,7 @@
                                 ? monitor_record.diastolic_blood_pressure
                                 : ""
                             }}
-                          </td>                         
+                          </td>
                           <td>
                             {{
                               monitor_record.blood_flow_volume
@@ -1301,7 +1331,7 @@
                                 : ""
                               }}
                             </span>
-                           
+
                           </td>
                            <td>
                             {{
@@ -1352,14 +1382,6 @@
                                   "
                                   >【开始透析】</template
                                 >
-                                <!-- <template
-                                  v-if="
-                                    record.dialysis_order &&
-                                    monitor_record.operate_time ==
-                                      record.dialysis_order.end_time
-                                  "
-                                  >【结束透析】</template
-                                > -->
                                 {{ monitor_record.end }}
                                 {{ monitor_record.symptom }} &nbsp;{{
                                   monitor_record.dispose
@@ -1382,7 +1404,7 @@
                           <td></td>
                           <td></td>
                           <td></td>
-                          <td></td>   
+                          <td></td>
                           <td></td>
                           <td style="line-height: 16px; padding: 0px">
                             <div
@@ -1431,19 +1453,18 @@
                             医嘱内容
                           </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>
                           <td style="font-size: 16px" width="10%">医生签名</td>
-                          <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
-                          <td style="font-size: 16px" width="10%">时间</td>
+
                           <td style="font-size: 16px" width="10%">
                             执行人签名
                           </td>
-                         
+
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
                         <template v-if="record.advices">
@@ -1452,8 +1473,8 @@
                             :key="advice_index"
                           >
                             <td height="35px">
-                              <span v-if="advice[0].start_time">
-                                {{ getTime(advice[0].start_time, "{h}:{i}") }}
+                              <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
                               </span>
                             </td>
                             <td
@@ -1462,65 +1483,55 @@
                               class="advice-name"
                               style="padding-left: 7px"
                             >
-                              <span v-if="advice[0].parent_id > 0">---></span>
-                              <span>{{ advice[0].advice_name }}</span>
+                              <span v-if="advice.parent_id > 0">---></span>
+                              <span>{{ advice.advice_name }}</span>
+
                               <span
                                 v-if="
-                                  advice[0] &&
-                                  advice[0].advice_desc != undefined
+                                  advice &&
+                                  advice.advice_desc != undefined
                                 "
                               >
                               </span>
 
-                              <span v-if="advice[0].prescribing_number"
-                                >&nbsp;&nbsp; {{ advice[0].prescribing_number
-                                }}{{ advice[0].prescribing_number_unit }}</span
+                              <span v-if="advice.prescribing_number"
+                                >&nbsp;&nbsp; {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}</span
                               >
-                              <span v-if="advice[0].single_dose != 0">
-                                {{ advice[0].single_dose
-                                }}{{ advice[0].single_dose_unit }}</span
+                              <span v-if="advice.single_dose != 0">
+                                {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}</span
                               >
 
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].delivery_way
+                              <span v-if="advice.parent_id == 0">{{
+                                advice.delivery_way
                               }}</span>
-                              <span v-if="advice[0].parent_id == 0">{{
-                                advice[0].execution_frequency
+                              <span v-if="advice.parent_id == 0">{{
+                                advice.execution_frequency
                               }}</span>
                               <span
                                 v-if="
-                                  advice[0].parent_id == 0 &&
-                                  advice[0].remark.length > 0
+                                  advice.parent_id == 0 &&
+                                  advice.remark.length > 0
                                 "
-                                >({{ advice[0].remark }})</span
-                              ><br/>
-                              <template v-if="advice[0].children.length>0">
-                                <span v-if="advice[0].children.length>0">{{ advice[0].children[0].advice_name }}</span>
-                                <span v-if="advice[0].children[0].prescribing_number"
-                                >&nbsp;&nbsp; {{ advice[0].children[0].prescribing_number
-                                }}{{ advice[0].children[0].prescribing_number_unit }}</span
+                                >({{ advice.remark }})</span
                               >
-                              <span v-if="advice[0].children[0].single_dose != 0">
-                                {{ advice[0].children[0].single_dose
-                                }}{{ advice[0].children[0].single_dose_unit }}</span
-                              >
-                              </template>
                             </td>
 
                             <td height="35px">
                               <span
                                 v-if="
-                                  setAdminUserES(advice[0], 'advice_doctor') ==
+                                  setAdminUserES(advice, 'advice_doctor') ==
                                   ''
                                 "
                                 >{{
-                                  getAdminUser(advice[0], "advice_doctor")
+                                  getAdminUser(advice, "advice_doctor")
                                 }}</span
                               >
                               <img
                                 class="es-img"
                                 :src="
-                                  setAdminUserES(advice[0], 'advice_doctor')
+                                  setAdminUserES(advice, 'advice_doctor')
                                 "
                                 alt=""
                                 srcset=""
@@ -1530,27 +1541,48 @@
                             </td>
 
                             <td height="35px">
-                              <span v-if="advice[0].execution_time">{{
-                                getTime(advice[0].execution_time, " {h}:{i}")
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice,'execution_staff'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice, "execution_staff")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice, 'execution_staff')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+                            <td height="35px">
+                              <span v-if="advice.execution_time">{{
+                                getTime(advice.execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-
                             <td height="35px">
                               <span
                                 v-if="
                                   setAdminUserES(
-                                    advice[0],
-                                    'execution_staff'
+                                    advice,
+                                    'checker'
                                   ) == ''
                                 "
                                 >{{
-                                  getAdminUser(advice[0], "execution_staff")
+                                  getAdminUser(advice, "checker")
                                 }}</span
                               >
                               <img
                                 class="es-img"
                                 :src="
-                                  setAdminUserES(advice[0], 'execution_staff')
+                                  setAdminUserES(advice, 'checker')
                                 "
                                 alt=""
                                 srcset=""
@@ -1558,7 +1590,6 @@
                                 style="height: 40px"
                               />
                             </td>
-                           
                           </tr>
                         </template>
                       </tbody>
@@ -1593,7 +1624,7 @@
                 <span>
                   血液净化治疗记录单
                 </span>
-               
+
               </div>
             </div>
             <div class="row">
@@ -1865,7 +1896,6 @@
                           }}
                         </div>
                       </div>
-                      
                       <div class="inline_block" style="flex: 1">
                         KTV(在线)：
                         <div
@@ -1880,9 +1910,6 @@
                           }}
                         </div>
                       </div>
-                    </div>
-
-                    <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                       <div class="inline_block" style="flex: 1">
                         导管：
                         <div
@@ -1976,7 +2003,7 @@
                         style="flex: 1"
                         v-if="org_id != 10223 || org_id!=10375"
                       >
-  
+
                         <span v-if="org_id!=10460">
                           透析中入量：
                         </span>
@@ -2042,7 +2069,7 @@
                         </div>
                       </div>
 
-                  
+
                     </div>
 
                   </td>
@@ -2587,160 +2614,117 @@ export default {
                this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
              }
             }
-            
-            }
-          }
-          for (const recordIndex in this.records) {
-            var dlegh = 0;
-            if (
-              this.records[recordIndex].monitor_records &&
-              this.records[recordIndex].monitor_records.length < 6
-            ) {
-              dlegh = 6 - this.records[recordIndex].monitor_records.length;
-            } else {
-              dlegh = 0;
-            }
-            if (dlegh > 0) {
-              if (
-                typeof this.records[recordIndex].monitor_records ===
-                  "undefined" ||
-                this.records[recordIndex].monitor_records == null
-              ) {
-                this.records[recordIndex].monitor_records = [];
-              }
-              for (let index = 0; index < dlegh; index++) {
-                this.records[recordIndex].monitor_records.push([]);
-              }
-            }
-
-            this.records[recordIndex].isShowZero = false;
-            if (this.records[recordIndex].patient.user_org_id == 9535) {
-              this.records[recordIndex].isShowZero = true;
-            }
 
-            var delghTwo = 0;
-            if (
-              this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 12
-            ) {
-              delghTwo = 12 - this.records[recordIndex].advices.length;
-            } else {
-              delghTwo = 0;
-            }
-
-            if (delghTwo > 0) {
-              if (
-                typeof this.records[recordIndex].advices === "undefined" ||
-                this.records[recordIndex].advices == null
-              ) {
-                this.records[recordIndex].advices = [];
-              }
-              for (let index = 0; index < delghTwo; index++) {
-                this.records[recordIndex].advices.push([]);
-              }
-            }
-
-
-          
-            if(this.org_id == 10206){
-              console.log("this.records[recordIndex].his_project", this.records[recordIndex].his_project)
-              var delghThree = 0 
-             let his_project = []
-              this.records[recordIndex].his_project.map(item => {
-                // if(item.type == 2){
-                //   his_project.push(item)
-                // }
-                his_project.push(item)
-              
-              })
-            this.records[recordIndex].his_project = his_project
-              var delghThree = 0
-              if (
-                this.records[recordIndex].his_advices &&
-                this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length < 6
-              ) {
-                delghThree = 6 - (this.records[recordIndex].his_advices.length + this.records[recordIndex].his_project.length)
-              } else {
-                delghThree = 0
-              }
-
-              if (delghThree > 0) {
-                if (
-                  typeof this.records[recordIndex].his_project === 'undefined' ||
-                  this.records[recordIndex].his_project == null
-                ) {
-                  this.records[recordIndex].his_project = []
-                }
-                for (let index = 0; index < delghThree; index++) {
-                  this.records[recordIndex].his_project.push([])
-                }
-              }
-            }
-
-
-            var childMap = {};
-            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 in childMap
-                )
-              ) {
-                childMap[this.records[recordIndex].advices[index].parent_id] =
-                  [];
-              }
-              childMap[this.records[recordIndex].advices[index].parent_id].push(
-                this.records[recordIndex].advices[index]
-              );
-            }
-
-            var advices = [];
-            for (const index in this.records[recordIndex].advices) {
-              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 leftAdvice = [];
-            var rightAdvice = [];
-            var adlen = advices.length;
-
-            var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
-            for (var i = 0; i < halfLen; i++) {
-              leftAdvice.push(advices[i]);
-              var rightIndex = i + halfLen;
-              rightAdvice.push(
-                rightIndex in advices ? advices[i + halfLen] : []
-              );
-            }
-            if (halfLen < 6) {
-              var nl = 6 - leftAdvice.length;
-              for (let index = 0; index < nl; index++) {
-                leftAdvice.push([]);
-              }
-              var nl = 6 - rightAdvice.length;
-              for (let index = 0; index < nl; index++) {
-                rightAdvice.push([]);
-              }
-            }
-
-            this.records[recordIndex].advices = [];
-            for (var i = 0; i < halfLen; i++) {
-              var item = [];
-              item.push(leftAdvice[i]);
-              item.push(rightAdvice[i]);
-              this.records[recordIndex].advices.push(item);
             }
           }
+          // for (const recordIndex in this.records) {
+          //   var dlegh = 0;
+          //   if (
+          //     this.records[recordIndex].monitor_records &&
+          //     this.records[recordIndex].monitor_records.length < 6
+          //   ) {
+          //     dlegh = 6 - this.records[recordIndex].monitor_records.length;
+          //   } else {
+          //     dlegh = 0;
+          //   }
+          //   if (dlegh > 0) {
+          //     if (
+          //       typeof this.records[recordIndex].monitor_records ===
+          //         "undefined" ||
+          //       this.records[recordIndex].monitor_records == null
+          //     ) {
+          //       this.records[recordIndex].monitor_records = [];
+          //     }
+          //     for (let index = 0; index < dlegh; index++) {
+          //       this.records[recordIndex].monitor_records.push([]);
+          //     }
+          //   }
+
+          //   this.records[recordIndex].isShowZero = false;
+          //   if (this.records[recordIndex].patient.user_org_id == 9535) {
+          //     this.records[recordIndex].isShowZero = true;
+          //   }
+
+
+          //   // if (delghTwo > 0) {
+          //   //   if (
+          //   //     typeof this.records[recordIndex].advices === "undefined" ||
+          //   //     this.records[recordIndex].advices == null
+          //   //   ) {
+          //   //     this.records[recordIndex].advices = [];
+          //   //   }
+          //   //   for (let index = 0; index < delghTwo; index++) {
+          //   //     this.records[recordIndex].advices.push([]);
+          //   //   }
+          //   // }
+
+
+
+
+
+          //   var childMap = {};
+          //   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 in childMap
+          //       )
+          //     ) {
+          //       childMap[this.records[recordIndex].advices[index].parent_id] =
+          //         [];
+          //     }
+          //     childMap[this.records[recordIndex].advices[index].parent_id].push(
+          //       this.records[recordIndex].advices[index]
+          //     );
+          //   }
+
+          //   var advices = [];
+          //   for (const index in this.records[recordIndex].advices) {
+          //     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 leftAdvice = [];
+          //   var rightAdvice = [];
+          //   var adlen = advices.length;
+
+          //   var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
+          //   for (var i = 0; i < halfLen; i++) {
+          //     leftAdvice.push(advices[i]);
+          //     var rightIndex = i + halfLen;
+          //     rightAdvice.push(
+          //       rightIndex in advices ? advices[i + halfLen] : []
+          //     );
+          //   }
+          //   if (halfLen < 6) {
+          //     var nl = 6 - leftAdvice.length;
+          //     for (let index = 0; index < nl; index++) {
+          //       leftAdvice.push([]);
+          //     }
+          //     var nl = 6 - rightAdvice.length;
+          //     for (let index = 0; index < nl; index++) {
+          //       rightAdvice.push([]);
+          //     }
+          //   }
+
+          //   this.records[recordIndex].advices = [];
+          //   for (var i = 0; i < halfLen; i++) {
+          //     var item = [];
+          //     item.push(leftAdvice[i]);
+          //     item.push(rightAdvice[i]);
+          //     this.records[recordIndex].advices.push(item);
+          //   }
+          // }
           console.log("数据我哦我我", this.records);
           // this.records.forEach(o => {
           //   console.log(o,'jj')
@@ -2947,7 +2931,7 @@ export default {
       }
       return "";
     },
-    
+
     // 函数说明：因为一次透析记录有些记录不一定是必须填的，比如 record.receive_assessment 可能为 null，所以要取 record.receive_assessment.way 前需要判断 record.receive_assessment 是否为 null，所以这个方法用来简化模板渲染的代码
     // 参数说明：比如判断 record.receive_assessment.way 是不是为1，参数为 (record.receive_assessment, way, 1)
     isCheckBoxChecked: function (record, key, target_value) {
@@ -2968,7 +2952,7 @@ export default {
     //   }
     // },
     getAge: function(val) {
-     
+
      if (val.id_card_no) {
        var thisLen = val.id_card_no.length
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -170,12 +170,18 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量')">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597">
           <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">
+          <label>处方脱水量 : </label>
+          <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
+          <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>
+        </li>
+
        
         <li v-if="isShow('钾')">
           <label>钾 : </label>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495  ) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  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!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || 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 == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  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!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -66,6 +66,12 @@
           <span class="content">{{ this.record.puncture_needle }}</span>
         </li>
 
+        <li v-if="isShow('穿刺方向')">
+          <label>穿刺方向 : </label>
+          <span class="content">{{ this.record.puncture_needle_direction }}</span>
+        </li>
+
+
         <li v-if="isShow('穿刺点')">
           <label>穿刺点 : </label>
           <span class="content">{{ this.record.point_puncture }}</span>

src/xt_pages/dialysis/details/consumable/dialysisGather.vue

@@ -122,25 +122,37 @@
              
           <el-table-column align="center" label="透析器"  v-if="gatherSetting.dialysis_dialyszers == 1">
              <template slot-scope="scope">
-               <span>{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
+               <span v-if="scope.row.schedule_date == timenow">{{scope.row.dialysis_prescription.dialysis_dialyszers}}</span>
+
+               <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
+
+               <span v-if="scope.row.schedule_date > timenow">{{scope.row.dialysis_solution.dialysis_dialyszers}}</span>
              </template>
           </el-table-column>
   
            <el-table-column align="center" label="灌流器"  v-if="gatherSetting.dialysis_irrigation ==1">
              <template slot-scope="scope">
-               <span>{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
+
+               <span v-if="scope.row.schedule_date == timenow">{{scope.row.dialysis_prescription.dialysis_irrigation}}</span>
+               <span v-if="scope.row.schedule_date < timenow">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
+               <span v-if="scope.row.schedule_date > timenow">{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
+
              </template>
           </el-table-column>
   
           <el-table-column align="center" label="滤过器"  v-if="gatherSetting.dialysis_strainer ==1">
              <template slot-scope="scope">
-               <span>{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
+              
+               <span v-if="scope.row.schedule_date == timenow">{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
+               <span v-if="scope.row.schedule_date<timenow">{{ scope.row.dialysis_solution.dialysis_strainer }}</span>
+               <span v-if="scope.row.schedule_date>timenow">{{ scope.row.dialysis_solution.dialysis_strainer }}</span>
              </template>
           </el-table-column>
 
 
           <el-table-column align="center" label="换药包/穿刺针"  v-if="gatherSetting.change_nurse ==1">
              <template slot-scope="scope">
+              
                <span v-if="(getBloodAccessOption(scope.row.dialysis_prescription.blood_access)).indexOf('导管')!=-1">1</span>
                <span v-if="(getBloodAccessOption(scope.row.dialysis_prescription.blood_access)).indexOf('导管')==-1">0</span>
                 /
@@ -349,6 +361,7 @@
     import { uParseTime } from "@/utils/tools";
     import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
     import { getDataConfig } from '@/utils/data'
+    const moment = require('moment')
     import store from "@/store";
     export default {
       components: {
@@ -480,6 +493,7 @@
           partition_id:0,
           zoneList:[],
           gatherSetting:{},
+          timenow:0,
         }
       },
       open(){
@@ -518,7 +532,16 @@
         this.query.partition_id = 0
         this.query.page = 1
         this.getAllZone()
-       
+        
+        let dateone =  moment().format('YYYY-MM-DD')//获取标准时间 //Tue Aug 16 2022 15:06:24 GMT+0800 (中国标准时间)
+        //方式一
+        let timeStampOne = Date.parse(dateone)
+        
+        var arrDateTwo = (timeStampOne/1000)-28800
+
+        console.log("时间搓2222",arrDateTwo)
+
+        this.timenow = arrDateTwo
        
        
       },

src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue

@@ -92,13 +92,23 @@
                     <span v-if="item.mode_id == 35">HDF1000</span>
                  </td>
                   <td width="100" v-if="gatherSetting.dialysis_dialyszers == 1">
-                    {{item.dialysis_prescription.dialysis_dialyszers}}
+                    <span v-if="item.schedule_date == timenow">{{item.dialysis_prescription.dialysis_dialyszers}}</span> 
+                    <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
+                    <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_dialyszers}}</span> 
                   </td>
                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">
-                    <span>{{item.dialysis_prescription.dialysis_irrigation}}</span>
+                    <span v-if="item.schedule_date == timenow">{{item.dialysis_prescription.dialysis_irrigation}}</span>
+
+                    <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_irrigation}}</span>
+
+                    <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_irrigation}}</span>
                   </td>
-                  <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">
-                    <span>{{item.dialysis_prescription.dialysis_strainer}}</span>
+                  <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">
+                    <span v-if="item.schedule_date == timenow">{{item.dialysis_prescription.dialysis_strainer}}</span>
+
+                    <span v-if="item.schedule_date < timenow">{{item.dialysis_solution.dialysis_strainer}}</span>
+
+                    <span v-if="item.schedule_date > timenow">{{item.dialysis_solution.dialysis_strainer}}</span>
                   </td>
                   <td width="100"  v-if="gatherSetting.change_nurse ==1"> 
                     <span v-if="(getBloodAccessOption(item.dialysis_prescription.blood_access)).indexOf('导管')!=-1">1</span>
@@ -153,6 +163,7 @@
     import BreadCrumb from '@/xt_pages/components/bread-crumb'
     import print from 'print-js'
     import { getDataConfig } from '@/utils/data'
+    const moment = require('moment')
     export default {
       name: 'SchedulePrint',
       data() {
@@ -192,13 +203,23 @@
           total_two:0,
           total_three:0,
           org_id:'',
-          gatherSetting:{}
+          gatherSetting:{},
+          timenow:0,
         }
       },
       components: {
         BreadCrumb
       },
       created() {
+        let dateone =  moment().format('YYYY-MM-DD')//获取标准时间 //Tue Aug 16 2022 15:06:24 GMT+0800 (中国标准时间)
+        //方式一
+        let timeStampOne = Date.parse(dateone)
+        
+        var arrDateTwo = (timeStampOne/1000)-28800
+
+        console.log("时间搓2222",arrDateTwo)
+
+        this.timenow = arrDateTwo
         this.org_id = this.$store.getters.xt_user.org.id
         this.displace_liqui_part_option = this.$store.getters.displace_liqui
         this.blood_access_option  = getDataConfig('hemodialysis', 'vascular_access_desc')

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

@@ -30,7 +30,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || 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 == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || 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 == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">
@@ -351,13 +351,13 @@
         </el-col>
 
         <el-col :span="8" v-if="isShow('透析中入量') && org_id!=10485 && org_id!=10460  && org_id!=10551">
-          <el-form-item label="透析中入量(L): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
+          <el-form-item label="透析中入量: " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8" v-if="isShow('透析中入量') && (org_id==10485 || org_id ==10460)">
-          <el-form-item label="透析中入量(g): " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
+          <el-form-item label="透析中入量: " :prop="isName('透析中入量')" :rules="isCheckmust('透析中入量')">
             <el-input v-model="form.dialysis_intakes"></el-input>
           </el-form-item>
         </el-col>

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

@@ -240,8 +240,8 @@
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link">
-                <!-- {{ getAdviceContent(scope.row, 1)}} -->
-                {{ scope.row.advice_name }}
+                {{ getAdviceContent(scope.row, 1)}}
+              
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -254,8 +254,8 @@
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
                 &emsp;
-                {{ scope.row.advice_name }}
-                <!-- {{ getAdviceContent(scope.row, 2)}} -->
+              
+                {{ getAdviceContent(scope.row, 2)}}
 
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
@@ -2292,35 +2292,7 @@
         }
       },
 
-      getAdviceContentOne(row, isChild) {
-        // alert("来")
-        console.log("row",row)
-        let tempSingleDoseDesc = ''
-        let tempDrugSpecDesc = ''
-        let tempPrescribingNumberDesc = ''
-
-        if (row.prescribing_number) {
-           tempPrescribingNumberDesc = row.prescribing_number + '' + row.prescribing_number_unit
-        }
-
-        if(this.org_id == 10188 ){
-            tempPrescribingNumberDesc = ""
-        }
-
-        if (row.single_dose) {
-          if (this.template_id != 6) {
-            tempSingleDoseDesc =' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
-          } else {
-            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
-          }
-        }
-
-        if (row.advice_desc) {
-          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')' + " " + row.remark
-        }
- 
-        return row.advice_name +tempDrugSpecDesc +' ' +tempPrescribingNumberDesc + tempSingleDoseDesc
-      },
+    
       getPermission() {
         request
           .get('/api/func_per/get', {

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1600,7 +1600,7 @@ export default {
         }
       }
 
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517  || this.$store.getters.xt_user.org.id == 10579){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1
@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -301,6 +301,17 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShow('穿刺方向')">
+            <el-form-item label="穿刺方向： " :prop="isName('穿刺方向')">
+              <el-select v-model="assessmentBeforeDislysis.puncture_needle_direction">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option v-for="item in punctureNeedleDireciton" :label="item.name" :value="item.name"
+                           :key="item.id"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
 
           <el-col :span="8">
             <el-form-item label="针眼: " :prop="isName('针眼')"
@@ -976,6 +987,7 @@
           befor_symptoms:"",
           washing_time:"",
           warsh_count:"",
+          puncture_needle_direction:"",
         },
 
         InnerDialogProps: {
@@ -1000,7 +1012,8 @@
         catheter_evaluation_program_list:[],
         skin_site_catheterization_list:[],
         summary:[],
-        value2:""
+        value2:"",
+        punctureNeedleDireciton:[]
       }
     },
     props: {
@@ -1845,6 +1858,9 @@
 
       this.skin_site_catheterization_list = getDataConfig('hemodialysis','skin_site_catheterization')
 
+      this.punctureNeedleDireciton = getDataConfig('hemodialysis','puncture_needle_direction')
+      console.log("穿刺方向",this.punctureNeedleDireciton)
+
       console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
 
       this.point_punctures = getDataConfig('hemodialysis','point_puncture')

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

@@ -2626,14 +2626,6 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
-           }else if(this.$store.getters.xt_user.org.id == 10579){
-              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 + ' ' + '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'
@@ -2699,6 +2691,28 @@ mu
             var hours = date.getHours()
             var minites = date.getMinutes()
 
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10597){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
             if (month < 10) {
               month = '0' + month
             }

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

@@ -1284,7 +1284,9 @@
                 org_id == 10395 ||
                 org_id == 10375 ||
                 org_id == 10480 ||
-                org_id == 10551)
+                org_id == 10551 ||
+                org_id == 10597||
+                org_id == 10599)
                 && org_id!=10387
             "
           >
@@ -1345,7 +1347,9 @@
               org_id!=10395 &&
               org_id!=10375 &&
               org_id!=10480 &&
-              org_id!=10551
+              org_id!=10551 &&
+              org_id!=10597 &&
+              org_id!=10599
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

@@ -397,7 +397,9 @@
                       >
                       <span>
                         {{
-
+                          predialysis.puncture_needle_direction
+                            ? predialysis.puncture_needle_direction
+                            : "/"
                         }}
                       </span>
 
@@ -801,17 +803,20 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        {{
+                        <!-- {{
                           prescription.dialyzer_perfusion_apparatus
                             ? prescription.dialyzer_perfusion_apparatus
                             : ""
-                        }}
-                        <span v-if="prescription.dialyzer_perfusion_apparatus&&prescription.dialyzer_perfusion_apparatus!=''">/</span>
+                        }} -->
+                        <!-- <span v-if="prescription.dialyzer_perfusion_apparatus&&prescription.dialyzer_perfusion_apparatus!=''">/</span> -->
                         {{
                           prescription.dialysis_dialyszers
                             ? prescription.dialysis_dialyszers
                             : ""
                         }}
+
+                         <span v-if="prescription&&prescription.dialysis_strainer!=''"></span>
+
                       </div>
                     </div>
 
@@ -829,19 +834,17 @@
                       </div>
                     </div>
 
-                    <div
-                      class="inline_block"
-                      style="flex: 1"
-                    >
-                      透析机号：
+                    <div class="inline_block" style="flex: 1" >
+                      滤过器：
                       <div
                         class="under_line"
-                        style="width: 50px; text-align: center"
+                        style="width: 70px; text-align: center"
                       >
-                        {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
-                        ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+                      {{
+                           prescription.dialysis_strainer?
+                           prescription.dialysis_strainer:"/"
+                         }}
                       </div>
-
                     </div>
 
                   </div>
@@ -927,15 +930,30 @@
                         class="under_line"
                         style="width: 50px; text-align: center"
                       >
-                      {{ predialysis.weight_before > 0 && lastafterdialysis.weight_after > 0
-                        ? parseFloat(predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2): "/"
+                      {{ predialysis.weight_before > 0 && predialysis.weight_after > 0
+                        ? parseFloat(predialysis.weight_before - predialysis.weight_after).toFixed(2): "/"
                       }}
-                      <!-- {{ predialysis.weight_before}} -->
-                      <!-- {{  lastafterdialysis.weight_after }} -->
-                      </div>kg
+                      </div>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">kg</span>
                     </div>
-                    <div class="inline_block" style="flex: 1">
-                      目标超滤量：
+                    <div class="inline_block" style="flex: 1" v-if="org_id == 10597">
+                      处方超滤量：
+                      <div
+                        class="under_line"
+                        style="width: 60px; text-align: center"
+                      >
+                        {{
+                          prescription.prescription_water
+                            ? prescription.prescription_water
+                            : "/"
+                        }}
+                      </div>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">ml</span>
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460">L</span>
+                    </div>
+                    <div class="inline_block" style="flex: 1" v-if="org_id == 10599">
+                      目标超滤量:
                       <div
                         class="under_line"
                         style="width: 60px; text-align: center"
@@ -1186,6 +1204,20 @@
                       <span v-if="prescription.anticoagulant == 13">iu</span>
                     </span>
                     </div>
+                    <div
+                      class="inline_block"
+                      style="flex: 1"
+                    >
+                      透析机号：
+                      <div
+                        class="under_line"
+                        style="width: 50px; text-align: center"
+                      >
+                        {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0
+                        ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+                      </div>
+
+                    </div>
                   </div>
 
                 </td>
@@ -2074,7 +2106,6 @@
                         }}
                       </div>
                     </div>
-                    
                     <div class="inline_block" style="flex:1;">
                       KTV(在线)：
                       <div class="under_line" style="min-width: 50px;text-align: center">
@@ -2092,6 +2123,7 @@
                       </div>
                     </div>
                   </div>
+
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
@@ -2177,7 +2209,7 @@
                           透析中入量：
                         </span>
                         <span v-if="org_id==10460">
-                          透析中入量(ml)：
+                          透析中入量：
                         </span>
                       <div
                         class="under_line"

src/xt_permission.js

@@ -24,7 +24,7 @@ router.beforeEach((to, from, next) => {
   } else {
     next()
   }
-   return
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))