see999 3 years ago
parent
commit
e7c06742bc

+ 2 - 14
src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue View File

577
                                     医嘱内容
577
                                     医嘱内容
578
                                 </td>
578
                                 </td>
579
                                 </tr>
579
                                 </tr>
580
-                                <!-- <tr style="line-height:35px;padding:8px 5px;">
581
-                            <td colspan="4" style="font-size: 16px">开医嘱</td>
582
-                            <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
583
-                            </tr> -->
584
                                 <tr style="line-height:30px;padding:0 5px;">
580
                                 <tr style="line-height:30px;padding:0 5px;">
585
                                 <td style="font-size: 16px" width="10%">时间</td>
581
                                 <td style="font-size: 16px" width="10%">时间</td>
586
                                 <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
582
                                 <td style="font-size: 16px" colspan="2" width="45%">医嘱内容</td>
589
                                 <td style="font-size: 16px" width="10%">执行人员</td>
585
                                 <td style="font-size: 16px" width="10%">执行人员</td>
590
                                 <td style="font-size: 16px" width="10%">核对人员</td>
586
                                 <td style="font-size: 16px" width="10%">核对人员</td>
591
                                 </tr>
587
                                 </tr>
592
-                                <!-- <template v-for="group in doctor_advices" > -->
593
 
588
 
594
                                 <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
589
                                 <tr v-for="(advice, advice_index) in record.advices" :key="advice_index">
595
                                 <td height="30px" style="padding:4px 5px;">
590
                                 <td height="30px" style="padding:4px 5px;">
596
                                     <span v-if="advice.start_time">
591
                                     <span v-if="advice.start_time">
597
                                     {{ getTime(advice.start_time, "{h}:{i}") }}
592
                                     {{ getTime(advice.start_time, "{h}:{i}") }}
598
                                     </span>
593
                                     </span>
599
-                                    <!-- <span v-else>&nbsp;<br/>&nbsp;</span> -->
600
                                 </td>
594
                                 </td>
601
                                 <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
595
                                 <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
602
                                     <span v-if="advice.parent_id > 0">---></span>
596
                                     <span v-if="advice.parent_id > 0">---></span>
608
                                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
602
                                     <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
609
                                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
603
                                     <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
610
                                 </td>
604
                                 </td>
611
-                                <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
612
-                                <span>{{advice.delivery_way}}</span>
613
-                                <span>{{advice.execution_frequency}}</span>
614
-                                <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
615
-                            </td> -->
616
-                                <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
605
+                                
617
                                 <td height="30px" style="padding:4px 5px;">
606
                                 <td height="30px" style="padding:4px 5px;">
618
                                     <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
607
                                     <span v-if="setAdminUserES(advice, 'advice_doctor') == ''">
619
                                         {{getAdminUser(advice, 'advice_doctor')}}
608
                                         {{getAdminUser(advice, 'advice_doctor')}}
641
                                     </span>
630
                                     </span>
642
                                 </td>
631
                                 </td>
643
                                 </tr>
632
                                 </tr>
644
-                                <!-- </template> -->
645
                             </tbody>
633
                             </tbody>
646
                             </table>
634
                             </table>
647
                         </td>
635
                         </td>
1053
 
1041
 
1054
             var leftAdvice = []
1042
             var leftAdvice = []
1055
             var rightAdvice = []
1043
             var rightAdvice = []
1056
-            var adlen = advices.length
1044
+            var adlen = this.records[recordIndex].advices.length
1057
 
1045
 
1058
             var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
1046
             var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2
1059
             for (var i = 0; i < halfLen; i++) {
1047
             for (var i = 0; i < halfLen; i++) {

+ 7 - 4
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

2667
           }
2667
           }
2668
         }
2668
         }
2669
         if (this.teamList.length > 0) {
2669
         if (this.teamList.length > 0) {
2670
-          if (this.$store.getters.xt_user.org_id == 0) {
2670
+          if (this.$store.getters.xt_user.org_id == 10138) {
2671
             for (let i = 0; i < this.teamList.length; i++) {
2671
             for (let i = 0; i < this.teamList.length; i++) {
2672
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
2672
               if (this.curPrescriptions.med_type == 14 && this.teamList[i].is_special_diseases != 1) {
2673
-                this.$message.error('该处方属于特病类型处方,开特病类型的项目')
2673
+                this.$message.error('该处方属于特病类型处方,开特病类型的项目')
2674
                 // return
2674
                 // return
2675
               }
2675
               }
2676
 
2676
 
2677
             }
2677
             }
2678
           }
2678
           }
2679
           
2679
           
2680
-          if(this.$store.getters.xt_user.org_id == 0){
2680
+          if(this.$store.getters.xt_user.org_id == 10138){
2681
             let arr = this.teamList
2681
             let arr = this.teamList
2682
             let newArr = []
2682
             let newArr = []
2683
             arr.map(item => {
2683
             arr.map(item => {
2684
-              if(item.is_special_diseases == 1){
2684
+              if(this.curPrescriptions.med_type != 14){
2685
+                newArr.push(item)
2686
+              }
2687
+              if(this.curPrescriptions.med_type == 14 && item.is_special_diseases == 1){
2685
                 newArr.push(item)
2688
                 newArr.push(item)
2686
               }
2689
               }
2687
             })
2690
             })