浏览代码

新分支

28169 11 个月前
父节点
当前提交
cd236bce73

+ 33 - 7
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue 查看文件

93
                 {{ record.device_number.number }}
93
                 {{ record.device_number.number }}
94
               </div>
94
               </div>
95
             </div>
95
             </div>
96
-            <div class="inline_block">
96
+            <div class="inline_block" v-if="org_id!=10683">
97
               透析号:
97
               透析号:
98
               <div class="under_line" style="width: 70px; text-align: center">
98
               <div class="under_line" style="width: 70px; text-align: center">
99
                 {{ record.patient.dialysis_no }}
99
                 {{ record.patient.dialysis_no }}
1459
                         </div>
1459
                         </div>
1460
                       </div>
1460
                       </div>
1461
 
1461
 
1462
+                      <div class="inline_block" style="margin-left: 20px">
1463
+                        上机时间:
1464
+                        <div
1465
+                          class="under_line"
1466
+                          style="width: 50px; text-align: center"
1467
+                        >
1468
+                          {{
1469
+                            record.dialysis_order &&
1470
+                            record.dialysis_order.device_number &&
1471
+                            record.dialysis_order.device_number.number.length >
1472
+                              0
1473
+                              ? record.dialysis_order.device_number.number
1474
+                              : record.device_number.number
1475
+                          }}
1476
+                        </div>
1477
+                      </div>
1478
+
1462
                       
1479
                       
1463
                       <div
1480
                       <div
1464
                         class="row"
1481
                         class="row"
1910
                               >
1927
                               >
1911
                                 <template
1928
                                 <template
1912
                                   v-if="
1929
                                   v-if="
1913
-                                    record.dialysis_order &&
1930
+                                    record.dialysis_order && org_id!=10683 &&
1914
                                     monitor_record.operate_time ==
1931
                                     monitor_record.operate_time ==
1915
                                       record.dialysis_order.start_time
1932
                                       record.dialysis_order.start_time
1916
                                   "
1933
                                   "
2597
                   {{ "/" }}
2614
                   {{ "/" }}
2598
                 </div>
2615
                 </div>
2599
               </div>
2616
               </div>
2600
-              <div class="inline_block">
2617
+              <div class="inline_block" v-if="org_id!=10683">
2601
                 透析号:
2618
                 透析号:
2602
                 <div class="under_line" style="width: 70px; text-align: center">
2619
                 <div class="under_line" style="width: 70px; text-align: center">
2603
                   {{ record.patient.dialysis_no }}
2620
                   {{ record.patient.dialysis_no }}
3806
             for(let j=0;j<this.records[i].monitor_records.length;j++){
3823
             for(let j=0;j<this.records[i].monitor_records.length;j++){
3807
               this.records[i].monitor_records[j].end = ""
3824
               this.records[i].monitor_records[j].end = ""
3808
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
3825
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
3809
-              this.records[i].monitor_records[j].end = "【结束透析】";
3810
-              tempmonitorflag = false;
3826
+                if(this.org_id!=10683){
3827
+                  this.records[i].monitor_records[j].end = "【结束透析】";
3828
+                }
3829
+              
3830
+               tempmonitorflag = false;
3811
             }
3831
             }
3812
             if(this.org_id!=10515 && this.org_id!=0){
3832
             if(this.org_id!=10515 && this.org_id!=0){
3813
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
3833
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
3814
-              this.records[i].monitor_records[j].end = "【结束透析】";
3834
+                if(this.org_id!=10683){
3835
+                  this.records[i].monitor_records[j].end = "【结束透析】";
3836
+                }
3837
+              
3815
              }
3838
              }
3816
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
3839
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
3817
-               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
3840
+               if(this.org_id!=10683){
3841
+                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
3842
+               }
3843
+              
3818
              }
3844
              }
3819
             }
3845
             }
3820
             
3846
             

+ 4 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderFiftySeven.vue 查看文件

763
               <span v-if="advice.advice_name!=undefined">{{
763
               <span v-if="advice.advice_name!=undefined">{{
764
                 advice.execution_frequency
764
                 advice.execution_frequency
765
               }}</span>
765
               }}</span>
766
+
767
+              <span v-if="advice.advice_name!=undefined">{{
768
+                advice.remark
769
+              }}</span>
766
             </td>
770
             </td>
767
             <td>
771
             <td>
768
               <span v-if="setAdminUserES(advice.execution_staff) == ''">
772
               <span v-if="setAdminUserES(advice.execution_staff) == ''">

+ 21 - 9
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue 查看文件

103
               <span>{{ "/" }}</span>
103
               <span>{{ "/" }}</span>
104
             </div>
104
             </div>
105
           </div>
105
           </div>
106
-          <div class="inline_block">
106
+          <div class="inline_block" v-if="org_id!=10683">
107
             透析号:
107
             透析号:
108
             <div class="under_line" style="width: 70px; text-align: center">
108
             <div class="under_line" style="width: 70px; text-align: center">
109
               {{ patientInfo.dialysis_no }}
109
               {{ patientInfo.dialysis_no }}
1511
                         }}
1511
                         }}
1512
                       </div>
1512
                       </div>
1513
                     </div>
1513
                     </div>
1514
+
1515
+                    <div class="inline_block" style="margin-left: 20px">
1516
+                      上机时间:
1517
+                      <div
1518
+                        class="under_line"
1519
+                        style="width: 50px; text-align: center"
1520
+                      >
1521
+                        {{getTime(dialysisOrder.start_time, "{h}:{i}")}}
1522
+                      </div>
1523
+                    </div>
1514
                   </div>
1524
                   </div>
1515
 
1525
 
1516
                   <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 3877  || org_id == 9671">
1526
                   <div class="row" style="padding: 2px 0; line-height: 23px" v-if=" org_id == 3877  || org_id == 9671">
1906
                                 v-if="
1916
                                 v-if="
1907
                                   (dialysisOrder &&
1917
                                   (dialysisOrder &&
1908
                                   monitor.operate_time ==
1918
                                   monitor.operate_time ==
1909
-                                    dialysisOrder.start_time)&&(org_id!=10414)
1919
+                                    dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
1910
                                 "
1920
                                 "
1911
                                 >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
1921
                                 >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
1912
                                 </template>
1922
                                 </template>
2521
               <span>{{ "/" }}</span>
2531
               <span>{{ "/" }}</span>
2522
             </div>
2532
             </div>
2523
             </div>
2533
             </div>
2524
-            <div class="inline_block">
2534
+            <div class="inline_block" v-if="org_id!=10683">
2525
               透析号:
2535
               透析号:
2526
               <div class="under_line" style="width: 70px; text-align: center">
2536
               <div class="under_line" style="width: 70px; text-align: center">
2527
                 {{ patientInfo.dialysis_no }}
2537
                 {{ patientInfo.dialysis_no }}
4661
           const monitor = this.monitors[index];
4671
           const monitor = this.monitors[index];
4662
           this.monitors[index].end = "";
4672
           this.monitors[index].end = "";
4663
           if (Object.keys(monitor).length > 0 && index > 1) {
4673
           if (Object.keys(monitor).length > 0 && index > 1) {
4664
-            if (
4665
-              (this.dialysisOrder &&
4666
-              monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)
4667
-            ) {
4668
-              this.monitors[index].end = "【结束透析】";
4674
+            if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
4675
+              if(this.org_id!=10683){
4676
+                this.monitors[index].end = "【结束透析】";
4677
+              }
4678
+              
4669
               tempmonitorflag = false;
4679
               tempmonitorflag = false;
4670
             }
4680
             }
4671
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
4681
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
4672
-              this.monitors[index].end = "【结束透析】";
4682
+              if(this.org_id!=10683){
4683
+                this.monitors[index].end = "【结束透析】";
4684
+              }
4673
             }
4685
             }
4674
           }
4686
           }
4675
         }
4687
         }