提交代码

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -24,11 +24,11 @@
           :paramsObj="invoiceParams"
         ></printOne>
         <printTwo
-          v-if="org_id == 10215||org_id == 0"
+          v-if="org_id == 10215"
           :paramsObj="invoiceParams"
         ></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 "
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 || org_id == 0"
           :paramsObj="invoiceParams"
         ></printThree>
 <!--        <print-night v-if="org_id == 10210 || org_id == 0"-->

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -230,6 +230,8 @@
 
 <script>
 import { getInvoice } from '@/api/project/project'
+import {jsGetAge, uParseTime} from "@/utils/tools";
+
 export default {
     props:{
         paramsObj:Object
@@ -266,6 +268,12 @@ export default {
         this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
+      getTime(value, temp) {
+        if (value != undefined) {
+          return uParseTime(value, temp);
+        }
+        return "";
+      },
       getDay(dateString1,dateString2){
         var  startDate = Date.parse(dateString1);
         var  endDate = Date.parse(dateString2);
@@ -296,20 +304,20 @@ export default {
                 this.printDate = data.getFullYear() + "-" + month + "-" + date;
 
               if(this.list.his.id > 0){
-                this.in_hosptial_time = this.getTime()
-                this.out_hosptial_time = this.list.order.setl_time.split(' ')[0]
+                this.in_hosptial_time = this.getTime(this.list.his.record_date,'{y}-{m}-{d}')
+                this.out_hosptial_time =  this.getTime(this.list.his.record_date,'{y}-{m}-{d}')
               }else{
                 this.in_hosptial_time = this.list.his_hospital_record.in_hosptial_time.split(' ')[0]
                 this.out_hosptial_time = this.list.his_hospital_record.out_hosptial_time.split(' ')[0]
               }
               this.insutype = this.list.order.insutype
-              this.id_card_no = this.list.his_hospital_record.id_card_no
-              this.number = this.list.his_hospital_record.number
-              this.psn_no = this.list.his_hospital_record.psn_no
+              this.id_card_no = this.list.his.id_card_no
+              this.number = this.list.his.number
+              this.psn_no = this.list.his.psn_no
               this.pre_pay_money = this.list.pre_pay_money
 
-              this.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
-              this.gend= this.list.his_hospital_record.gend
+              this.balance_accounts_type = this.list.his.balance_accounts_type
+              this.gend= this.list.his.gend
             })
         },
         smalltoBIG(n) {

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -506,21 +506,6 @@ export default{
           this.prescriptions = advicePrint;
 
           this.doctorList_1 = response.data.data.eles;
-          for(let i=0;i<this.advicePrint.length;i++){
-            this.advicess=advicePrint[i].advices
-          }
-          for(let j=0;j<this.advicess.length;j++){
-            for(let x=j+1;x<this.advicess.length;x++){
-              if(this.advicess[j].groupno == this.advicess[x].groupno){
-                this.arr.push(this.advicess.splice(x,1))
-                // this.arrs=this.advicess.splice(x,1)
-              }
-            }
-          }
-          // this.merge(this.advicess)
-          // console.log('4444444',this.arrs);
-          console.log('55555555',this.arr);
-          console.log('6666666',this.advicess);
           console.log(this.doctorList_1, "医生列表");
           if (this.doctorList_1.length > 0) {
             var operatorsLen = this.doctorList_1.length;
@@ -532,8 +517,6 @@ export default{
               );
             }
           }
-
-          console.log("处方222222", this.prescriptions);
           var hisPatient = response.data.data.hisPatient;
           console.log("hisPatient", hisPatient);
           this.hisPatient = hisPatient;