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

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -165,7 +165,7 @@
                   <div class="inline_block" style="margin-left:90px;">
                     体重增加：
                     <div class="under_line" style="width: 50px;text-align: center">
-                      {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}
+                      {{ predialysis.weight_before > 0 && lastafterdialysis.weight_after > 0 ? parseFloat(predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2): "/" }}
                     </div>
                     kg
                   </div>
@@ -574,7 +574,7 @@
                   <tbody>
                     <tr>
                       <td colspan="9" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;">
-                        检测记录
+                        监测记录
                       </td>
                     </tr>
                     <tr>
@@ -611,12 +611,17 @@
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:35px;line-height:35px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
-                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template>
+                            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】引血100ml/min</template>
                             {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
                           </span>
                         </div>
                       </td>
                     </tr>
+                    <tr>
+                      <td colspan="9" style="line-height:25px;text-align:left;">
+                        医师记录：{{ summary.special_record ? summary.special_record : '' }}
+                      </td>
+                    </tr>
                   </tbody>
                 </table>
               </td>
@@ -1191,11 +1196,11 @@ export default {
           this.monitors[index].end = ''
           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].end = '【结束透析】回血100ml/min'
               tempmonitorflag = false
             }
             if (tempmonitorflag && index == this.monitors.length - 1) {
-              this.monitors[index].end = '【结束透析】'
+              this.monitors[index].end = '【结束透析】回血100ml/min'
             }
           }
         }

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -389,8 +389,29 @@
                       }
                     })
                     that.num = num
+                    let newTotal = 0
+                    for (var i = that.info.transBody.outputlist2.length - 1; i >= 0; i--) {
+                      if(that.info.transBody.outputlist2[i].aka111 == '07') {
+                        console.log('0707007')
+                        newTotal += that.info.transBody.outputlist2[i].bka058
+                        that.info.transBody.outputlist2.splice(i, 1);
+                      }
+                      if(that.info.transBody.outputlist2[i].aka111 == '19'){
+                        console.log('191919')
+                        newTotal += that.info.transBody.outputlist2[i].bka058
+                        that.info.transBody.outputlist2.splice(i, 1);
+                      }
+                    }
+                    console.log(1111111111111)
+                    let aka111obj = {
+                      aka111:'99',
+                      bka058:newTotal
+                    }
+                    console.log('aka111obj',aka111obj)
+                    that.info.transBody.outputlist2.push(aka111obj)
+                    console.log('that.info.transBody.outputlist2',that.info.transBody.outputlist2)
                     console.log('this.num222',that.num)
-
+                    
                   }
                 }
               })

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -398,6 +398,9 @@
           case '26':
             return '挂号费'
             break
+          case '99':
+            return '诊疗费'
+            break
 
         }