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

src/xt_pages/dialysis/batch_print/batch_print_order_eight.vue

@@ -47,7 +47,7 @@
                     年龄:<span
                       style="display:inline-block;margin-left:10px;"
                     >
-                    {{ getAge(record.patient) }}
+                    {{ getAge(record.patient.id_card_no) }}
                     </span>
                   </td>
                   <td style="text-align:center;width:160px">
@@ -1075,7 +1075,7 @@
             年龄:<span
               style="display:inline-block;margin-left:10px;"
             >
-            {{ getAge(record.patient) }}
+            {{ getAge(record.patient.id_card_no) }}
             </span>
           </td>
           <td style="text-align:center;width:160px">
@@ -1723,6 +1723,19 @@ export default {
         return val.age
       }
     },
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
     newAdviceGroupObject: function() {
       return Object.assign(
         {},

src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue

@@ -1000,7 +1000,7 @@
                           <tr>
                             <td width="60">时间</td>
                             <td width="60">血压<br />(mmHg)</td>
-                            <td width="50">体温<br />(℃)</td>
+                            <!-- <td width="50">体温<br />(℃)</td> -->
                             <td width="50">脉搏<br />(次/分)</td>
                             <td width="50">呼吸<br />(次/分)</td>
                             <td width="50">血流量<br />(ml/min)</td>
@@ -1038,13 +1038,13 @@
                                   : ""
                               }}
                             </td>
-                            <td>
+                            <!-- <td>
                               {{
                                 monitor_record.temperature
                                   ? monitor_record.temperature
                                   : ""
                               }}
-                            </td>
+                            </td> -->
                             <td>
                               {{
                                 monitor_record.pulse_frequency
@@ -1158,13 +1158,16 @@
                                       monitor_record.operate_time ==
                                         record.dialysis_order.end_time
                                     "
-                                    >【结束透析】</template
+                                    >【结束透析】
+                                    &nbsp; <span v-if="monitor_record.accumulated_blood_volume>0">累计血容量:{{ monitor_record.accumulated_blood_volume }}L</span>
+                                    </template
                                   >
                                   {{ monitor_record.end }}
                                   {{ monitor_record.symptom }} &nbsp;{{
                                     monitor_record.dispose
                                   }}
                                   &nbsp;{{ monitor_record.result }}
+                                 
                                 </span>
                               </div>
                             </td>

src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue

@@ -28,7 +28,7 @@
               年龄:
               <span style="display:inline-block;margin-left:10px;">
                 {{
-                getAge(patientInfo)
+                getNewAge(patientInfo.id_card_no)
                 }}
               </span>
             </td>
@@ -2112,6 +2112,19 @@ export default {
         return ''
       }
     },
+    getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
     newAdviceGroupObject: function() {
       return Object.assign(
         {},

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -1377,7 +1377,7 @@
                               <tr>
                                 <td width="60">时间</td>
                                 <td width="70">血压<br />(mmHg)</td>
-                                <td width="60">体温<br />(°C)</td>
+                                <!-- <td width="60">体温<br />(°C)</td> -->
                                 <td width="50">脉搏<br />(次/分)</td>
                                 <td width="50">呼吸<br />(次/分)</td>
                                 <td width="50">血流量<br />(ml/min)</td>
@@ -1457,13 +1457,13 @@
                                       : ""
                                   }}
                                 </td>
-                                <td>
+                                <!-- <td>
                                   {{
                                     monitor.temperature
                                       ? monitor.temperature
                                       : ""
                                   }}
-                                </td>
+                                </td> -->
                                 <td>
                                   {{
                                     monitor.pulse_frequency
@@ -1649,6 +1649,7 @@
                                         monitor.dispose
                                       }}
                                       &nbsp;{{ monitor.result }}
+                                      &nbsp;{{monitor.accumulated_blood_volume_name}}
                                     </span>
                                   </div>
                                 </td>
@@ -3351,16 +3352,21 @@ export default {
         for (let index = 0; index < this.monitors.length; index++) {
           const monitor = this.monitors[index];
           this.monitors[index].end = "";
+          this.monitors[index].accumulated_blood_volume_name = ""
           if (Object.keys(monitor).length > 0 && index > 1) {
             if (
               this.dialysisOrder &&
               monitor.operate_time == this.dialysisOrder.end_time
+             
             ) {
               this.monitors[index].end = "【结束透析】";
+              this.monitors[index].accumulated_blood_volume_name ="累计血容量:"+  this.monitors[index].accumulated_blood_volume+"L"
               tempmonitorflag = false;
             }
             if (tempmonitorflag && index == this.monitors.length - 1) {
               this.monitors[index].end = "【结束透析】";
+              this.monitors[index].accumulated_blood_volume_name  = "累计血容量:"+ this.monitors[index].accumulated_blood_volume+"L"
+             
             }
           }
         }

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -615,6 +615,61 @@
                       </div>
                     </td>
                   </tr>
+
+                  <tr class="list_table_1" v-if="org_id == 10346 || org_id == 0">
+                    <td colspan="11" style="padding-left: 10px">
+                      <div style="display: flex; justify-content: flex-start">
+                        <div style="width: 100%">
+                          上次透后体重: 
+                          {{(assessmentafter.weight_after).toFixed(2)}}kg
+                        </div>
+                        <div style="width: 100%">
+                          透前体重: 
+                          {{(predialysis.weight_before).toFixed(2)}}kg
+                        </div>
+                        <div style="width: 100%">
+                          体重增加量:
+                          {{ (predialysis.weight_before -
+                            assessmentafter.weight_after).toFixed(2)}}kg
+                        </div>
+
+                        <div style="width: 100%">
+                          干体重(DW):
+                          {{(predialysis.dry_weight).toFixed(2)}}kg
+                        </div>
+                        <div style="width: 100%">
+                          较干体重增加量:{{(afterdialysis.weight_after - predialysis.dry_weight).toFixed(2) }}
+                          
+                        </div>
+
+                      
+                      </div>
+                    </td>
+                  </tr>
+
+                  <tr class="list_table_1"  v-if="org_id == 10346 || org_id == 0">
+                    <td colspan="11" style="padding-left: 10px">
+                      <div style="display: flex; justify-content: flex-start">
+                        <div style="width: 100%">
+                          机器显示脱水量:{{(afterdialysis.actual_ultrafiltration).toFixed(2) }}
+                        
+                        </div>
+                     
+                        <div style="width: 100%">
+                          透后体重: 
+                          {{(afterdialysis.weight_after).toFixed(2)}}kg
+                        </div>
+                        <div style="width: 100%">
+                          本次透析体重下降量: 
+                          {{(predialysis.weight_before -
+                            afterdialysis.weight_after).toFixed(2)}}kg
+                        </div>
+                       
+
+                     
+                      </div>
+                    </td>
+                  </tr>
                 </tbody>
               </table>
             </td>
@@ -840,6 +895,7 @@
                     }}kg
                   </td>
                 </tr>
+                
               </table>
             </td>
           </tr>
@@ -1213,18 +1269,18 @@
                   <td style="height: 20px" width="90">
                     <p style="height: 20px; line-height: 20px">核对</p>
                   </td>
-                  <td style="height: 20px" width="144">
+                  <!-- <td style="height: 20px" width="144">
                     <p style="height: 20px; line-height: 20px">上次透后体重</p>
-                  </td>
-                  <td style="height: 20px" width="60">
+                  </td> -->
+                  <!-- <td style="height: 20px" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
                       0
-                        ? assessmentafter.weight_after
+                        ? patientInfo.user_sys_before_count
                         : "/"
                     }}kg
-                  </td>
+                  </td> -->
                 </tr>
               </table>
             </td>
@@ -1327,18 +1383,18 @@
                     />
                   </td>
 
-                  <td v-if="advice_index === 0" width="145">透前体重:</td>
-                  <td v-if="advice_index === 0" width="60">
+                  <!-- <td v-if="advice_index === 0" width="145">透前体重:</td> -->
+                  <!-- <td v-if="advice_index === 0" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
                       0
-                        ? predialysis.weight_before
+                        ? patientInfo.user_sys_before_count
                         : "/"
                     }}kg
-                  </td>
-                  <td v-if="advice_index === 1" width="145">体重增加量:</td>
-                  <td v-if="advice_index === 1" width="60">
+                  </td> -->
+                  <!-- <td v-if="advice_index === 1" width="145">体重增加量:</td> -->
+                  <!-- <td v-if="advice_index === 1" width="60">
                     {{
                       assessmentafter.weight_after == 0 ||
                       predialysis.weight_before == 0
@@ -1348,19 +1404,19 @@
                             assessmentafter.weight_after
                           ).toFixed(2)
                     }}kg
-                  </td>
-                  <td v-if="advice_index === 2" width="145">干体重(DW):</td>
-                  <td v-if="advice_index === 2" width="60">
+                  </td> -->
+                  <!-- <td v-if="advice_index === 2" width="145">干体重(DW):</td> -->
+                  <!-- <td v-if="advice_index === 2" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
                       0
-                        ? predialysis.dry_weight
+                        ? predialysis.user_sys_before_count
                         : "/"
                     }}kg
-                  </td>
-                  <td v-if="advice_index === 3" width="145">较干体重增加量:</td>
-                  <td v-if="advice_index === 3" width="60">
+                  </td> -->
+                  <!-- <td v-if="advice_index === 3" width="145">较干体重增加量:</td> -->
+                  <!-- <td v-if="advice_index === 3" width="60">
                     {{
                       patientInfo.total_dialysis +
                         patientInfo.user_sys_before_count >
@@ -1370,8 +1426,8 @@
                           ).toFixed(2)
                         : 0
                     }}kg
-                  </td>
-                  <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
+                  </td> -->
+                  <!-- <td v-if="advice_index === 4" width="145">机器显示脱水量:</td>
                   <td v-if="advice_index === 4" width="60">
                     {{
                       patientInfo.total_dialysis +
@@ -1380,8 +1436,8 @@
                         ? afterdialysis.actual_ultrafiltration
                         : "/"
                     }}ml
-                  </td>
-                  <td v-if="advice_index === 5" width="145">透后体重:</td>
+                  </td> -->
+                  <!-- <td v-if="advice_index === 5" width="145">透后体重:</td>
                   <td v-if="advice_index === 5" width="60">
                     {{
                       patientInfo.total_dialysis +
@@ -1404,9 +1460,9 @@
                             afterdialysis.weight_after
                           ).toFixed(2)
                     }}kg
-                  </td>
-                  <td v-if="advice_index > 6" width="145"></td>
-                  <td v-if="advice_index > 6" width="60"></td>
+                  </td> -->
+                  <!-- <td v-if="advice_index > 6" width="145"></td>
+                  <td v-if="advice_index > 6" width="60"></td> -->
                 </tr>
               </table>
             </td>

src/xt_pages/workforce/components/editTableData.vue

@@ -3822,6 +3822,8 @@ export default {
 
       if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
 
+      // if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
+
         //表格某列全部数据
         var Mon_M = []
         var Mon_A = []
@@ -4435,11 +4437,11 @@ export default {
       }
       sums[22]="总人数:"+ sums[22] +"\n"+result
             return sums;
-      }
+      // }
 
-      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877 && this.$store.getters.xt_user.template_info.org_id != 10340){
-        return sums;
-      }
+      // if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877 && this.$store.getters.xt_user.template_info.org_id != 10340){
+      //   return sums;
+      // }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       var that = this;

src/xt_pages/workforce/components/tableData.vue

@@ -1328,7 +1328,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
-    if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877 || this.$store.getters.xt_user.template_info.org_id == 10340){
+   
 
       //表格某列全部数据
         var Mon_M = []
@@ -1946,11 +1946,11 @@ export default {
       sums[22]="总人数:"+ sums[22] +"\n"+result
 
       return sums;
-      }
+      
 
-      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877&& this.$store.getters.xt_user.template_info.org_id != 10340){
-        return sums;
-      }
+      // if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877&& this.$store.getters.xt_user.template_info.org_id != 10340){
+      //   return sums;
+      // }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {