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

src/xt_pages/outpatientCharges/statementTemplate/printSeventheen.vue

@@ -5,10 +5,10 @@
       <div style="width: 100%;border-bottom: 1px dashed black;padding-bottom: 5px;">
         <div style="width: 100%;display: flex;padding: 5px;">
           <div style="flex: 1;">患者姓名:{{info.patient.name}}</div>
-          <div style="flex: 1;text-align: right;">票据号:{{ info.id }}</div>
+          <div style="flex: 1;text-align: right;">票据号:{{ info.new_order.fa_piao_number }}</div>
         </div>
-        <div style="padding: 5px;">门诊日期:{{getTime(info.date)}}</div>
-        <div style="padding: 5px;">个人编码:{{ info.patient.dialysis_no }}</div>
+        <div style="padding: 5px;">门诊日期:{{getTime2(info.new_order.settle_accounts_date)}}</div>
+        <div style="padding: 5px;">个人编码:{{ info.new_order.psn_no }}</div>
       </div>
       <div style="border-bottom: 1px dashed black;margin-bottom: 10px;">
         <div style="display: flex;padding: 5px;text-align: center;">
@@ -29,20 +29,20 @@
         <div style="flex: 1;text-align: right;">收费员:{{info.charge_admin.user_name}}</div>
       </div>
       <div style="width: 100%;display: flex;padding: 5px 0;">
-        <div style="flex: 1;">帐户支付总额:{{ }}</div>
-        <div style="flex: 1;text-align: right;">现金支付:{{info.psn_cash_pay}}</div>
+        <div style="flex: 1;">帐户支付总额:{{info.new_order.medfee_sumamt}}</div>
+        <div style="flex: 1;text-align: right;">现金支付:{{info.new_order.psn_cash_pay}}</div>
       </div>
       <div style="width: 100%;display: flex;">
-        <div style="flex: 1;">其中共济账户支付:{{ }}</div>
-        <div style="flex: 1;text-align: right;">统筹支付:{{info.hifp_pay}}</div>
+        <div style="flex: 1;">其中共济账户支付:{{info.new_order.acct_mulaid_pay}}</div>
+        <div style="flex: 1;text-align: right;">统筹支付:{{info.new_order.hifp_pay}}</div>
       </div>
       <div style="width: 100%;display: flex;padding: 5px 0;">
-        <div style="flex: 1;">公务员补助:{{info.cvlserv_pay }}</div>
-        <div style="flex: 1;text-align: right;">医疗救助支付:{{info.maf_pay }}</div>
+        <div style="flex: 1;">公务员补助:{{info.new_order.cvlserv_pay }}</div>
+        <div style="flex: 1;text-align: right;">医疗救助支付:{{info.new_order.maf_pay }}</div>
       </div>
       <div style="width: 100%;display: flex;">
-        <div style="flex: 1;">大病保险支付:{{info.hifmi_pay}}</div>
-        <div style="flex: 1;text-align: right;">账户余额:{{ }}</div>
+        <div style="flex: 1;">大病保险支付:{{info.new_order.hifmi_pay}}</div>
+        <div style="flex: 1;text-align: right;">账户余额:{{info.new_order.acct_pay}}</div>
       </div>
 
      <!-- <div style="border: 1px solid black;width: 100%;">
@@ -122,7 +122,7 @@
         <span v-if="info.insutype == '510'">生育保险</span>
       </div>
     </div>
-  
+
     <table class="statementTable" border="1" style="text-align: left;">
       <tr>
         <td>患者姓名:{{info.patient.name}}</td>
@@ -256,7 +256,7 @@
         med_typearr:[{id:11,name:'普通门诊'},{id:12,name:'门诊挂号'},{id:13,name:'急诊'},{id:14,name:'门诊特殊病'},
                     {id:15,name:'门诊统筹'},{id:16,name:'门诊慢性病'},{id:17,name:'普通住院'}],
       }
-      
+
     },
     methods:{
       getBirth(idNo){
@@ -302,6 +302,15 @@
         } else {
           return uParseTime(val, '{y}-{m}-{d} {h}:{m}:{s}')
         }
+      },   getTime2(val) {
+        if (val < 0) {
+          return ""
+        }
+        if (val == "") {
+          return ""
+        } else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
       },
       getmoney(value){
         // if(vlaue == ''){
@@ -309,7 +318,7 @@
         // }else{
           return numToCny(value)
         // }
-        
+
       },
       getmed_type(ids){
         const options = this.med_typearr

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -61,7 +61,6 @@
               <template slot-scope="scope">
                 <span>{{ scope.row.name }}</span>
                 <span class="futou" v-if="scope.row.patient_type==4">腹</span>
-                <!--  v-if="scope.row.patient_type==1" -->
               </template>
             </el-table-column>
             <el-table-column prop="name" label="就诊号" width="110">
@@ -944,7 +943,7 @@ export default {
           return false
         } else {
           //挂号
-          console.log('response.data.data',response.data.data);
+          console.log('response.data.data12121212134',response.data.data);
           
           for (let i = 0; i < response.data.data.list.length; i++) {
             for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
@@ -955,6 +954,7 @@ export default {
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  patient_type: response.data.data.list[i].patient_type
                   // patient_type:
                 }
                 this.un_cure_data.push(obj)
@@ -965,7 +965,8 @@ export default {
                   name: response.data.data.list[i].his_patient[b].name,
                   number: response.data.data.list[i].his_patient[b].number,
                   id: response.data.data.list[i].id,
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
+                  patient_type: response.data.data.list[i].patient_type
                 }
                 this.cure_data.push(obj)
               }
@@ -979,7 +980,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.un_cure_data.push(obj)
             }
@@ -990,7 +992,8 @@ export default {
                 name: response.data.data.list_two[i].name,
                 number: response.data.data.list_two[i].his_patient.number,
                 id: response.data.data.list_two[i].id,
-                his_patient_id: response.data.data.list_two[i].his_patient.id
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
+                patient_type: response.data.data.list_two[i].patient_type
               }
               this.cure_data.push(obj)
             }
@@ -5816,7 +5819,6 @@ export default {
       } else if (index == 20) {
         this.getPrescriptionList(this.patientInfo.id, this.record_date, 2, 3)
       }
-
     },
 
     // changePatient(val){
@@ -5834,11 +5836,16 @@ export default {
     },
 
     getPrescriptionList(id, record_date, type, checkType) {
+      
       getPrescriptionList(id, 2, record_date).then(response => {
+        console.log('123456response.data.data',response.data.data,checkType);
         if (response.data.state == 1) {
+          
           if (checkType != 3) {
             this.centerDialogVisible = true
             var list = response.data.data.list
+           
+            
             let arr1 = []
             let arr2 = []
             let arr3 = []