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

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -200,10 +200,7 @@
                   </td>
                 </tr>
                 <tr>
-                  <td style="text-align:left;" colspan="1">
-                    <span style="display:inline-block;margin-left:15px;"
-                      >透前体重:{{record.assessment_before_dislysis.weight_before?record.assessment_before_dislysis.weight_before:"/"}}&nbsp;kg</span>
-                  </td>
+                
                   <td style="text-align:left;" colspan="1">
                     <span style="display:inline-block;margin-left:15px;"
                       >设定脱水量:{{record.prescription.target_ultrafiltration?record.prescription.target_ultrafiltration:"/"}}&nbsp;ml</span
@@ -217,7 +214,7 @@
                          ></label-box>
                      </span>
                    </td>
-                   <td style="text-align: left" colspan="2">
+                   <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 <span v-if="record.prescription.anticoagulant == 2">普通肝素首剂:</span>
                 <span v-if="record.prescription.anticoagulant == 3"
@@ -306,7 +303,55 @@
               <span v-if="record.prescription.anticoagulant == 2">mg</span>
               <span v-if="record.prescription.anticoagulant == 1">mg</span>
             </td>
-                </tr>
+           
+            </tr>
+                 <td style="text-align:left;" colspan="1">
+                    <span style="display:inline-block;margin-left:15px;"
+                      >透前体重:{{record.assessment_before_dislysis.weight_before?record.assessment_before_dislysis.weight_before:"/"}}&nbsp;kg</span>
+                  </td>
+                 <td style="text-align:left;" colspan="1" >
+                    <span style="display:inline-block;margin-left:15px;"
+                      >透析器型号:
+                    <span v-if="record.prescription.dialysis_dialyszers!=''">
+                      {{
+                        record.prescription.dialysis_dialyszers
+                         ?  record.prescription.dialysis_dialyszers
+                           : "/"
+                        }}
+                      </span> 
+                    
+                      </span>
+                  </td>
+
+                  <td style="text-align:left;" colspan="2">
+                    <span style="display:inline-block;margin-left:15px;"
+                      >灌流器型号:
+                   
+                      <span v-if="record.prescription.dialysis_irrigation==''">
+                        &nbsp;&nbsp;{{
+                        record.prescription.dialysis_irrigation
+                        ? record.prescription.dialysis_irrigation
+                        : "/"
+                    }}
+                      </span>
+                      </span>
+                  </td>
+
+                   <td style="text-align:left;" colspan="2">
+                    <span style="display:inline-block;margin-left:15px;"
+                      >滤过器型号:
+                      <span v-if="record.prescription.dialysis_strainer!=''">
+                      &nbsp;&nbsp;{{
+                          record.prescription.dialysis_strainer
+                          ? record.prescription.dialysis_strainer
+                          : "/"
+                      }}
+                      </span> 
+                      </span>
+                  </td>
+             <tr>
+
+             </tr>
                 <tr>
                   <td style="text-align:left;" colspan="1">
                     <span style="display:inline-block;margin-left:15px;"
@@ -340,33 +385,8 @@
                           }}分钟</span>
                       &nbsp;
                   </td>
-                   <td style="text-align:left;" >
-                    <span style="display:inline-block;margin-left:15px;"
-                      >透析/灌流器型号:
-                    <span v-if="record.prescription.dialysis_dialyszers!=''">
-                      {{
-                        record.prescription.dialysis_dialyszers
-                         ?  record.prescription.dialysis_dialyszers
-                           : "/"
-                        }}
-                      </span> 
-                      <span v-if="record.prescription.dialysis_irrigation==''">
-                        &nbsp;&nbsp;{{
-                        record.prescription.dialysis_irrigation
-                        ? record.prescription.dialysis_irrigation
-                        : "/"
-                    }}
-                      </span>
-                      <span v-if="record.prescription.dialysis_strainer!=''">
-                      &nbsp;&nbsp;{{
-                          record.prescription.dialysis_strainer
-                          ? record.prescription.dialysis_strainer
-                          : "/"
-                      }}
-                      </span> 
-                      </span>
-                  </td>
-                   <td style="text-align:left;" colspan="2">
+               
+                   <td style="text-align:left;" colspan="3">
                     <span style="display:inline-block;margin-left:15px;"
                       >置换方式:
                        <label-box
@@ -448,7 +468,7 @@
                           />
                       </span>
                   </td>
-                   <td style="text-align:left;" colspan="3">
+                   <td style="text-align:left;" colspan="2">
                     <span style="display: inline-block; margin-left: 15px">
                     穿刺护士:
                        <span
@@ -476,7 +496,10 @@
                             style="height: 30px;"
                           />
                       </span>
-                      <span style="display: inline-block; margin-left: 15px">
+                      
+                  </td>
+                   <td style="text-align:left;" colspan="1">
+                   <span style="display: inline-block; margin-left: 15px">
                         核对护士:
                        <span
                        style="height: 30px; display: inline-block"
@@ -504,7 +527,7 @@
                             style="height: 30px;"
                           />
                       </span>
-                  </td>
+                   </td>
                   <td style="text-align:left;" colspan="3">
                     <!-- <span style="display:inline-block;margin-left:15px;display:flex;align-items:center;height:36px;"
                       >医生签名:

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

@@ -320,7 +320,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" multiple placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType">
             <el-option
               v-for="item in partitionArr"
               :key="item.id"

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1306,7 +1306,7 @@ export default {
          if(nameOne == '全部'){
           nameOne = ""
         }
-      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne} });
+      this.$router.push({ path: "/dialysis/signPrint",query:{time: new Date(this.time).getTime(),delivery_way:name,execution_frequency:nameOne,patient_id:this.patient_id} });
 
     },
     batchPrintActionOne: function() {
@@ -1530,7 +1530,9 @@ export default {
         return searchArray
       },
      handleSelect(val) {
+       console.log("val323223232323232323",val)
        this.patient_id = val.id
+       this.listQuery.keyword = val.name
        this.requestSchedualDoctors(this.time)
       },
      toSeach(){

src/xt_pages/dialysis/signPrint.vue

@@ -98,6 +98,7 @@ export default {
             advice_type: 2,
             delivery_way:this.delivery_way,
             execution_frequency:this.execution_frequency,
+            patient_id:this.$route.query.patient_id,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -201,13 +201,9 @@
             </td>
           </tr>
           <tr>
-            <td style="text-align: left" colspan="1">
-              <span style="display: inline-block; margin-left: 15px">
-                透前体重:{{
-                  predialysis.weight_before ? predialysis.weight_before : "/"
-                }}kg
-              </span>
-            </td>
+            <!-- <td style="text-align: left" colspan="1">
+             
+            </td> -->
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
                 设定脱水量:{{
@@ -225,7 +221,7 @@
                 ></label-box>
               </span>
             </td>
-            <td style="text-align: left" colspan="2">
+            <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 <span v-if="prescription.anticoagulant == 2">普通肝素首剂:</span>
                 <span v-if="prescription.anticoagulant == 3"
@@ -294,7 +290,7 @@
               <span v-if="prescription.anticoagulant == 2">mg/h</span>
               <span v-if="prescription.anticoagulant == 1">mg/h</span>
             </td>
-            <td style="text-align: left" colspan="2">
+            <td style="text-align: left" colspan="1">
               <span style="display: inline-block; ">
                 总量:
                 {{
@@ -315,6 +311,52 @@
               <span v-if="prescription.anticoagulant == 1">mg</span>
             </td>
           </tr>
+          <tr>
+            <td style="text-align: left" colspan="1">
+               <span style="display: inline-block; margin-left: 15px">
+                透前体重:{{
+                  predialysis.weight_before ? predialysis.weight_before : "/"
+                }}kg
+              </span>
+            </td>
+            <td style="text-align: left" colspan="1">
+              <span style="display: inline-block; margin-left: 15px">
+                透析器型号:
+                <span v-if="prescription.dialysis_dialyszers!=''">{{
+                  prescription.dialysis_dialyszers
+                    ? prescription.dialysis_dialyszers
+                    : "/"
+                }}
+                </span>
+              </span>
+            </td> 
+            <td style="text-align: left" colspan="2">
+              <span style="display: inline-block; margin-left: 15px">
+                灌流器型号:
+                <span v-if="prescription.dialysis_irrigation!=''">
+                 &nbsp;&nbsp;{{
+                  prescription.dialysis_irrigation
+                    ? prescription.dialysis_irrigation
+                    : "/"
+                }}
+               </span>
+              </span>
+            </td> 
+
+            <td style="text-align: left" colspan="2">
+              <span style="display: inline-block; margin-left: 15px">
+                滤过器型号:
+                <span v-if="prescription.dialysis_strainer!=''">
+                &nbsp;&nbsp;{{
+                    prescription.dialysis_strainer
+                      ? prescription.dialysis_strainer
+                      : "/"
+                  }}
+               </span>
+              </span>
+            </td> 
+           
+          </tr>
           <tr>
             <td style="text-align: left" colspan="1">
               <span style="display: inline-block; margin-left: 15px">
@@ -352,33 +394,8 @@
                 }}分钟
               </span>
             </td>
-            <td style="text-align: left" colspan="1">
-              <span style="display: inline-block; margin-left: 15px">
-                透析/灌流器型号:
-                <span v-if="prescription.dialysis_dialyszers!=''">{{
-                  prescription.dialysis_dialyszers
-                    ? prescription.dialysis_dialyszers
-                    : "/"
-                }}
-                </span>
-               <span v-if="prescription.dialysis_irrigation!=''">
-                 &nbsp;&nbsp;{{
-                  prescription.dialysis_irrigation
-                    ? prescription.dialysis_irrigation
-                    : "/"
-                }}
-               </span>
-               <span v-if="prescription.dialysis_strainer!=''">
-                &nbsp;&nbsp;{{
-                    prescription.dialysis_strainer
-                      ? prescription.dialysis_strainer
-                      : "/"
-                  }}
-               </span>
-                
-              </span>
-            </td>
-            <td style="text-align: left" colspan="2">
+         
+            <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 置换方式:
                 <label-box
@@ -444,22 +461,25 @@
                 </span>
               </span>
 
-              <span style="display: inline-block; margin-left: 15px">
-                核对护士：<span
-                  style="height: 30px; display: inline-block"
-                  v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
-                >
-                  {{ getAdminUser(check == null ? 0 : check.creater) }}
-                </span>
-                <img
-                  style="height: 30px"
-                  :src="setAdminUserES(check == null ? 0 : check.creater)"
-                  alt=""
-                  srcset=""
-                  v-else
-                />
-              </span>
+             
             </td>
+            <td style="text-align: left" colspan="1">
+                <span style="display: inline-block; margin-left: 15px">
+                  核对护士：<span
+                    style="height: 30px; display: inline-block"
+                    v-if="setAdminUserES(check == null ? 0 : check.creater) == ''"
+                  >
+                    {{ getAdminUser(check == null ? 0 : check.creater) }}
+                  </span>
+                  <img
+                    style="height: 30px"
+                    :src="setAdminUserES(check == null ? 0 : check.creater)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </span>
+              </td>
             <td style="text-align: left" colspan="3">
               <span style="display: inline-block; margin-left: 15px">
                 <span

src/xt_pages/workforce/schedule_print.vue

@@ -57,15 +57,20 @@
                 </td>
                 <td :width="td_4_width" valign="top">
                   <div class="proj" v-if="Object.keys(main_collection.hdf).length > 0">
-                    <div class="proj_title">血滤:</div>
+                    <div class="proj_title">血滤(HDF):</div>
                     <div class="proj_item" v-html="patient_other_names(main_collection.hdf)">
                     </div>
                   </div>
                   <div class="proj" v-if="Object.keys(main_collection.hd_hp).length > 0">
-                    <div class="proj_title">灌流:</div>
+                    <div class="proj_title">灌流(HD+HP):</div>
                     <div class="proj_item" v-html="patient_other_names(main_collection.hd_hp)">>
                     </div>
                   </div>
+                   <div class="proj" v-if="Object.keys(main_collection.hfhd_hp).length > 0">
+                    <div class="proj_title">灌流(HFHD+HP):</div>
+                    <div class="proj_item" v-html="patient_other_names(main_collection.hfhd_hp)">>
+                    </div>
+                  </div>
                 </td>
               </tr>
               </tbody>
@@ -110,7 +115,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
-
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -120,7 +125,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+            new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
 
           },
           {
@@ -133,6 +143,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -142,7 +153,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+            new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 3,
@@ -154,6 +170,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -163,7 +180,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 4,
@@ -175,6 +197,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -184,7 +207,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 5,
@@ -196,6 +224,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -205,7 +234,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 6,
@@ -217,6 +251,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -226,7 +261,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           },
           {
             day: 7,
@@ -238,6 +278,7 @@
             },
             hdf: [ /* schedule, ... */],
             hd_hp: [ /* schedule, ... */],
+            hfhd_hp:[],
             new_hdf:{
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
@@ -247,7 +288,12 @@
               am: { /* zone_name: [ schedule, ... ] */ },
               pm: { /* zone_name: [ schedule, ... ] */ },
               evening: { /* zone_name: [ schedule, ... ] */ }
-            }
+            },
+             new_hfhd_hp:{
+              am: { /* zone_name: [ schedule, ... ] */ },
+              pm: { /* zone_name: [ schedule, ... ] */ },
+              evening: { /* zone_name: [ schedule, ... ] */ }
+            },
           }
         ],
 
@@ -320,6 +366,8 @@
             } else if (schedule.mode.id == 3) { // HD+HF
 
               main_collection.hd_hp.push(schedule)
+            }else if(schedule.mode.id == 9){ //HFHD+HP
+               main_collection.hfhd_hp.push(schedule)
             }
 
           }