Procházet zdrojové kódy

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

28169 před 1 rokem
rodič
revize
a9fce20eeb

+ 2 - 2
src/xt_pages/outpatientDoctorStation/checkPrint.vue Zobrazit soubor

@@ -13,9 +13,9 @@
13 13
       </template> -->
14 14
 <!--  && this.$store.getters.xt_user.org_id != 0  -->
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 && this.$store.getters.xt_user.org_id != 0" :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
16
+        <printOne v-if="this.$store.getters.xt_user.org_id != 10402 && this.$store.getters.xt_user.org_id != 10375 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printOne>
17 17
         <printTwo v-if="this.$store.getters.xt_user.org_id == 10402 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printTwo>
18
-        <printThree v-if="this.$store.getters.xt_user.org_id == 10375 || this.$store.getters.xt_user.org_id == 0 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
18
+        <printThree v-if="this.$store.getters.xt_user.org_id == 10375 " :advicePrint="advicePrint" :ids="ids" :patient="patient" :hisPatient="hisPatient" :patient_id="patient_id" :record_date="record_date" :prescription_id="prescription_id" :newHisPatient="newHisPatient"></printThree>
19 19
         <!--      <print-two></print-two>-->
20 20
       </div>
21 21
 

+ 0 - 1
src/xt_pages/outpatientDoctorStation/checkTemplate/printOne.vue Zobrazit soubor

@@ -112,7 +112,6 @@
112 112
           </div>
113 113
           <div>
114 114
             医生签字:
115
-
116 115
             <img
117 116
               v-if="setAdminUserES(advicePrint[0].creator)"
118 117
               style="height: 30px"

+ 4 - 1
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue Zobrazit soubor

@@ -3632,8 +3632,11 @@ export default {
3632 3632
               }
3633 3633
             }
3634 3634
           }
3635
+          console.log("=========")
3636
+          console.log(this.zuobiao_project)
3637
+          console.log( this.tabProject)
3638
+          console.log("=========")
3635 3639
           this.allProject = this.tabProject
3636
-
3637 3640
           // console.log('cccc',this.allProject);
3638 3641
         }
3639 3642
       })

+ 10 - 0
src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue Zobrazit soubor

@@ -110,6 +110,16 @@
110 110
                     <el-input   v-model="scope.row.drug.medical_insurance_number" placeholder=""></el-input>
111 111
                 </template>
112 112
             </el-table-column>
113
+
114
+          <el-table-column align="center" prop="is_self_drug" width="100" label="医嘱性质" v-if="this.$store.getters.xt_user.org_id == 10206 || this.$store.getters.xt_user.org_id == 0">
115
+            <template slot-scope="scope">
116
+              <el-select :disabled="prescription.is_medicine_status" v-model="scope.row.is_self_drug" placeholder="请选择">
117
+                <el-option label="非自备药" value="0"></el-option>
118
+                <el-option label="自备药" value="1"></el-option>
119
+              </el-select>
120
+            </template>
121
+          </el-table-column>
122
+
113 123
             <el-table-column align="center" prop="remark" width="50" label="备注">
114 124
                 <template slot-scope="scope">
115 125
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>

+ 18 - 0
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Zobrazit soubor

@@ -1533,6 +1533,9 @@ export default {
1533 1533
                       }
1534 1534
 
1535 1535
                     }
1536
+                    console.log(that.drugs)
1537
+                    console.log(that.zuobiao_project)
1538
+
1536 1539
                   }
1537 1540
                 }
1538 1541
               })
@@ -1795,6 +1798,7 @@ export default {
1795 1798
                   hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
1796 1799
                   execution_state: prescription.advices[b].execution_state,
1797 1800
                   is_medicine: prescription.advices[b].is_medicine,
1801
+                  is_self_drug:prescription.advices[b].is_self_drug.toString(),
1798 1802
 
1799 1803
                 }
1800 1804
                 tempAdvice.push(obj)
@@ -1950,6 +1954,7 @@ export default {
1950 1954
                     groupno: prescription.advices[b].groupno,
1951 1955
                     hosp_appr_flag: '1',
1952 1956
                     execution_state: 2,
1957
+                    is_self_drug:"",
1953 1958
 
1954 1959
 
1955 1960
                   }
@@ -2278,6 +2283,8 @@ export default {
2278 2283
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
2279 2284
                         execution_state: prescription.advices[b].execution_state,
2280 2285
                         is_medicine: prescription.advices[b].is_medicine,
2286
+                        is_self_drug:prescription.advices[b].is_self_drug.toString()
2287
+
2281 2288
 
2282 2289
                       }
2283 2290
                       tempAdvice.push(obj)
@@ -2429,6 +2436,7 @@ export default {
2429 2436
                           groupno: prescription.advices[b].groupno,
2430 2437
 
2431 2438
                           hosp_appr_flag: '1',
2439
+                          is_self_drug: "",
2432 2440
                           execution_state: 2,
2433 2441
 
2434 2442
 
@@ -2847,6 +2855,7 @@ export default {
2847 2855
                         groupno: prescription.advices[b].groupno,
2848 2856
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
2849 2857
                         execution_state: prescription.advices[b].execution_state,
2858
+                        is_self_drug:prescription.advices[b].is_self_drug.toString()
2850 2859
 
2851 2860
                       }
2852 2861
                       tempAdvice.push(obj)
@@ -2974,6 +2983,8 @@ export default {
2974 2983
                           groupno: prescription.advices[b].groupno,
2975 2984
 
2976 2985
                           hosp_appr_flag: '1',
2986
+                          is_self_drug:"",
2987
+
2977 2988
                           execution_state: 2,
2978 2989
 
2979 2990
 
@@ -3359,6 +3370,8 @@ export default {
3359 3370
                       drug: prescription.advices[b].drug,
3360 3371
                       groupno: prescription.advices[b].groupno,
3361 3372
                       hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
3373
+                      is_self_drug:prescription.advices[b].is_self_drug.toString(),
3374
+
3362 3375
                       execution_state: prescription.advices[b].execution_state
3363 3376
                     }
3364 3377
                     tempAdvice.push(obj)
@@ -3486,6 +3499,7 @@ export default {
3486 3499
                         groupno: prescription.advices[b].groupno,
3487 3500
 
3488 3501
                         hosp_appr_flag: '1',
3502
+                        is_self_drug:"",
3489 3503
                         execution_state: 2
3490 3504
 
3491 3505
 
@@ -3944,6 +3958,7 @@ export default {
3944 3958
                         drug: prescription.advices[b].drug,
3945 3959
                         groupno: prescription.advices[b].groupno,
3946 3960
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
3961
+                        is_self_drug:prescription.advices[b].is_self_drug.toString(),
3947 3962
                         execution_state: prescription.advices[b].execution_state,
3948 3963
                         is_medicine: prescription.advices[b].is_medicine,
3949 3964
 
@@ -4104,6 +4119,7 @@ export default {
4104 4119
                           groupno: prescription.advices[b].groupno,
4105 4120
 
4106 4121
                           hosp_appr_flag: '1',
4122
+                          is_self_drug:"",
4107 4123
                           execution_state: 2,
4108 4124
 
4109 4125
 
@@ -4597,6 +4613,7 @@ export default {
4597 4613
                         drug: prescription.advices[b].drug,
4598 4614
                         groupno: prescription.advices[b].groupno,
4599 4615
                         hosp_appr_flag: prescription.advices[b].hosp_appr_flag.toString(),
4616
+                        is_self_drug:prescription.advices[b].is_self_drug.toString(),
4600 4617
                         execution_state: prescription.advices[b].execution_state,
4601 4618
                         is_medicine: prescription.advices[b].is_medicine,
4602 4619
 
@@ -4755,6 +4772,7 @@ export default {
4755 4772
                           groupno: prescription.advices[b].groupno,
4756 4773
 
4757 4774
                           hosp_appr_flag: '1',
4775
+                          is_self_drug:"",
4758 4776
                           execution_state: 2
4759 4777
 
4760 4778
 

+ 38 - 3
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue Zobrazit soubor

@@ -79,7 +79,29 @@
79 79
             </div>
80 80
 
81 81
             <div style="display: flex; margin-top: 10px; line-height: 24px;padding: 0 10px;">
82
-                <div style="width: 300px;">开单医生:{{item.doctor?item.doctor:''}}</div>
82
+                <!-- <div style="width: 300px;">开单医生:{{item.doctor?item.doctor:''}}</div> -->
83
+                <div style="width: 300px;" v-if="org_id==10088 ||org_id==0">
84
+                  开单医生:
85
+                  <span
86
+                    style="width: 100px; display: inline-block"
87
+                    v-if="item.creator == ''"
88
+                  >
89
+                    {{ item.doctor ? item.doctor : "" }}
90
+                  </span>
91
+                    <span
92
+                    style="width: 100px; display: inline-block"
93
+                    v-else-if="doc_name != ''"
94
+                  >
95
+                    {{ doc_name }}
96
+                  </span>
97
+                  <img
98
+                    style="height: 30px"
99
+                    :src="setAdminUserES(item.creator,item.doctor)"
100
+                    alt=""
101
+                    srcset=""
102
+                    v-else
103
+                  />
104
+                </div>
83 105
                 <div style="width: 300px;">签章:</div>
84 106
                 <div style="width: 300px;">费用:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
85 107
             </div>
@@ -252,10 +274,23 @@
252 274
 
253 275
           ],
254 276
         hisPatient: {},
255
-        diagnoses: []
277
+        diagnoses: [],
278
+        org_id:''
256 279
       }
257 280
     },
258 281
     methods: {
282
+      // 电子签名
283
+      setAdminUserES(id,name) {
284
+        if (id == 0) {
285
+          return "";
286
+        }
287
+        if (id in this.operatorMaps) {
288
+          return this.operatorMaps[id].url;
289
+        } else {
290
+          this.doc_name = name
291
+          return "";
292
+        }
293
+      },
259 294
       getAge(patient){
260 295
         var thisLen = patient.id_card_no.length
261 296
         var birth = ''
@@ -432,7 +467,7 @@
432 467
       this.getPrescriptionPrint()
433 468
       var xtuser = this.$store.getters.xt_user
434 469
       this.orgname = xtuser.org.org_name
435
-
470
+      this.org_id = this.$store.getters.xt_user.org_id
436 471
     },
437 472
     watch: {
438 473
       patient_id: function(val) {