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/printOne.vue

@@ -32,11 +32,20 @@
 
       </tr>
       <tr>
-        <td width="70">就医登记号</td>
-        <td colspan="7" v-if="org_id !=10644">{{info.psn_no}}</td>
-        <td colspan="7" v-if="org_id ==10644">{{info.mdtrt_id}}</td>
-        <td width="50">门诊号</td>
-        <td colspan="3">{{info.number}}</td>
+        <td width="40">就医登记号</td>
+        <td colspan="2" v-if="org_id !=10644 && org_id != 9478 &&  org_id != 0">{{info.psn_no}}</td>
+        <td colspan="2" v-else-if="org_id ==10644">{{info.mdtrt_id}}</td>
+        <td colspan="2" v-else-if="org_id == 9478">{{info.mdtrt_id}}</td>
+        <td colspan="2" v-else-if="org_id == 0">{{info.mdtrt_id}}</td>
+
+
+        <td width="40" v-if="org_id != 9478">门诊号</td>
+        <td colspan="2" v-if="org_id != 9478">{{info.number}}</td>
+
+        <td width="40">参保地</td>
+        <td colspan="1">{{getName(info.his.insuplc_admdvs)}}</td>
+        <td width="40">结算号</td>
+        <td colspan="2">{{info.setl_id}}</td>
       </tr>
       <tr>
 
@@ -137,7 +146,7 @@
         <td colspan="5" style="text-align:left;padding-left:10px;" v-if="info.med_type == '21'">普通住院</td>
 
         <td>结算时间</td>
-        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+        <td colspan="5" style="text-align:left;padding-left:10px;">{{info.setl_time ? info.setl_time : ''}}</td>
       </tr>
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
@@ -263,6 +272,7 @@
           parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
           parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total) + parseFloat(info.zc_cost_self_total) + parseFloat(info.huli_cost_self_total)).toFixed(2)}}
         </td>
+
         <td colspan="2" style="text-align:right;padding-right:10px;">{{(parseFloat(info.bed_cost_part_self_total) +
           parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
           parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
@@ -270,11 +280,6 @@
           parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
           parseFloat(info.treat_cost_part_self_total) + parseFloat(info.zc_cost_part_self_total) + parseFloat(info.huli_cost_part_self_total)).toFixed(2)}}
         </td>
-
-        <td>报销比例</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;">{{info.new_order.pool_prop_selfpay}}</td>
-        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
-        <td colspan="2" style="text-align:right;padding-right:10px;"></td>
       </tr>
 
       <tr>
@@ -304,6 +309,8 @@
       <tr>
         <td colspan="3" style="text-align:left;padding-left:10px;">个人共济支付</td>
         <td colspan="3">{{info.acct_mulaid_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">报销比例</td>
+        <td colspan="3">{{info.pool_prop_selfpay}}</td>
 
       </tr>
       <tr>
@@ -355,10 +362,21 @@
     },
     data(){
       return{
+        options:[
+        ],
         org_id:'',
       }
     },
     methods:{
+      getName(value){
+        for(let i = 0; i < this.options.length; i++){
+          if(value == this.options[i].value){
+            return this.options[i].label
+          }
+        }
+
+
+      },
       getBirth(idNo){
         var year = idNo.substring(6, 10);
         var month = idNo.substring(10, 12);
@@ -397,6 +415,7 @@
     },
     created(){
       this.org_id = this.$store.getters.xt_user.org_id
+      this.options =  this.$store.getters.insuplc_admdvs
     }
   }
 

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -143,7 +143,7 @@
                                           <el-table-column label="名称" v-if="org_id != 10206 && org_id != 0">
                                             <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                                           </el-table-column>
-                                          <el-table-column label="规格" width="60" v-if="org_id != 10206 && org_id != 0">
+                                          <el-table-column label="规格" width="60" v-if="org_id != 10206">
                                             <template slot-scope="scope">
                                                    <span
                                                      v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>
@@ -1849,7 +1849,8 @@
                       frequency_type: prescription.advices[b].frequency_type,
                       day_count: prescription.advices[b].day_count,
                       week_day: prescription.advices[b].week_day,
-                      number:  prescription.advices[b].drug.number
+                      number:  prescription.advices[b].drug.number,
+                        spec:"",
 
                     }
                     tempAdvice.push(obj)
@@ -1905,7 +1906,6 @@
                         frequency_type: prescription.project[b].frequency_type,
                         day_count: prescription.project[b].day_count,
                         week_day: prescription.project[b].week_day,
-                        number_days:prescription.project[b].day
 
                       }
 
@@ -1918,6 +1918,7 @@
                         obj['number'] = ""
 
 
+
                       } else if (prescription.project[b].type == 3) {
                         obj['statistical_classification'] = ''
                         obj['medical_code'] = prescription.project[b].good_info.medical_insurance_number
@@ -2216,6 +2217,7 @@
                 project: project[i],
                 first_letter:project[i].first_letter,
                 number: "",
+                spec:"",
                 bbx01:project[i].bbx01,
                 bby01:project[i].bby01,
                 sum_count:""
@@ -2240,6 +2242,7 @@
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
                 type: 3,
+                spec:"",
                 is_special_diseases: good_info[i].is_special_diseases,
                 good_info: good_info[i],
                 first_letter:good_info[i].first_letter,

src/xt_pages/outpatientDoctorStation/template/printTenOne.vue

@@ -45,7 +45,7 @@
             电话：{{ item.patient.phone }}
           </div>
           <div style="margin-bottom: 10px" v-else>
-            日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+            日期：{{ getTime(item.pre_time) ? getTime(item.pre_time) : "" }}
           </div>
           <div>地址：{{ item.patient.home_address }}</div>
           <div style="display: flex; width: 50%">