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

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

@@ -1,132 +1,154 @@
 <template>
   <div class="prescriptionTable">
-<!--    <el-button-->
-<!--        size="small"-->
-<!--        type="primary"-->
-<!--        icon="el-icon-download"-->
-<!--        @click="exportData"-->
-<!--    >导出</el-button>-->
-    <el-table
-      v-if="prescription.type == 1"
-      :data="prescription.advices"
-      border
-      style="width: 99%"
-      :row-style="changColor"
-      :header-cell-style="{
-        backgroundColor: 'rgb(245, 247, 250)',
-        color: '#606266',
-      }"
-      highlight-current-row
-    >
-      <el-table-column
-        align="center"
-        type="index"
-        width="40"
-        label="序号"
-      ></el-table-column>
-      <el-table-column align="center" prop="name" width="400" label="名称">
-        <template slot-scope="scope"
-          ><span :title="scope.row.drug_name">{{
-            scope.row.drug_name
-          }}</span></template
-        >
-      </el-table-column>
-      <el-table-column align="center" prop="name" width="80" label="单次用量">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
-          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="name" width="80" label="用法">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
-          <div>{{ scope.row.delivery_way }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="name" width="80" label="频率">
-        <template slot-scope="scope">
-          <div>{{ scope.row.execution_frequency }}</div>
+    <el-button
+        size="small"
+        type="primary"
+        icon="el-icon-download"
+        @click="exportData"
+    >导出</el-button>
+<!--    <el-table-->
+<!--        v-if="prescription.type == 1"-->
+<!--      :data="prescription.advices"-->
+<!--      border-->
+<!--      style="width: 99%"-->
+<!--      :row-style="changColor"-->
+<!--      :header-cell-style="{-->
+<!--        backgroundColor: 'rgb(245, 247, 250)',-->
+<!--        color: '#606266',-->
+<!--      }"-->
+<!--      highlight-current-row-->
+<!--    >-->
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        type="index"-->
+<!--        width="40"-->
+<!--        label="序号"-->
+<!--      ></el-table-column>-->
 
-          <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          align="center"-->
+<!--          prop="single_dose"-->
+<!--          width="80"-->
+<!--          label="姓名"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{patientName}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column align="center" prop="day" width="80" label="天数">
-        <template slot-scope="scope">{{ scope.row.day }}天</template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--          align="center"-->
+<!--          prop="single_dose"-->
+<!--          width="80"-->
+<!--          label="就诊号"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{number}}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column align="center" prop="name" width="80" label="总量">
-        <template slot-scope="scope"
-          >{{ scope.row.prescribing_number
-          }}{{ scope.row.prescribing_number_unit }}</template
-        >
-      </el-table-column>
-      <el-table-column align="center" prop="name" width="100" label="单价">
-        <template slot-scope="scope">
-          <div>{{ scope.row.retail_price }}元</div>
+<!--      <el-table-column align="center" prop="name" width="400" label="名称">-->
+<!--        <template slot-scope="scope"-->
+<!--          ><span :title="scope.row.drug_name">{{-->
+<!--            scope.row.drug_name-->
+<!--          }}</span></template-->
+<!--        >-->
+<!--      </el-table-column>-->
+<!--      <el-table-column align="center" prop="name" width="80" label="单次用量">-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.delivery_way" readonly></el-input>&ndash;&gt;-->
+<!--          <div>{{ scope.row.single_dose }}{{ scope.row.single_dose_unit }}</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column align="center" prop="name" width="80" label="用法">-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.delivery_way" readonly></el-input>&ndash;&gt;-->
+<!--          <div>{{ scope.row.delivery_way }}</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column align="center" prop="name" width="80" label="频率">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>{{ scope.row.execution_frequency }}</div>-->
 
-          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
-        </template>
-      </el-table-column>
+<!--          &lt;!&ndash;<el-input v-model="scope.row.execution_frequency" readonly></el-input>&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column align="center" prop="name" width="100" label="总价">
-        <template slot-scope="scope">
-          <div>
-            {{
-              (scope.row.prescribing_number * scope.row.retail_price).toFixed(
-                2
-              )
-            }}元
-          </div>
+<!--&lt;!&ndash;      <el-table-column align="center" prop="day" width="80" label="天数">&ndash;&gt;-->
+<!--&lt;!&ndash;        <template slot-scope="scope">{{ scope.row.day }}天</template>&ndash;&gt;-->
+<!--&lt;!&ndash;      </el-table-column>&ndash;&gt;-->
 
-          <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
-        </template>
-      </el-table-column>
+<!--      <el-table-column align="center" prop="name" width="80" label="总量">-->
+<!--        <template slot-scope="scope"-->
+<!--          >{{ scope.row.prescribing_number-->
+<!--          }}{{ scope.row.prescribing_number_unit }}</template-->
+<!--        >-->
+<!--      </el-table-column>-->
+<!--      <el-table-column align="center" prop="name" width="100" label="单价">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>{{ scope.row.retail_price }}元</div>-->
 
-      <el-table-column align="center" prop="name" width="80" label="全自费金额">
-        <template slot-scope="scope">
-          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>
-        </template>
-      </el-table-column>
+<!--          &lt;!&ndash;<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column align="center" prop="name" width="80" label="超限价金额">
-        <template slot-scope="scope">
-          <div>{{ scope.row.overlmt_amt  }}元</div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column align="center" prop="name" width="100" label="总价">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>-->
+<!--            {{-->
+<!--              (scope.row.prescribing_number * scope.row.retail_price).toFixed(-->
+<!--                2-->
+<!--              )-->
+<!--            }}元-->
+<!--          </div>-->
 
-      <el-table-column
-        align="center"
-        prop="name"
-        width="80"
-        label="先行自付金额"
-      >
-        <template slot-scope="scope">
-          <div>{{ scope.row.preselfpay_amt }}元</div>
-        </template>
-      </el-table-column>
+<!--          &lt;!&ndash;<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column
-        align="center"
-        prop="name"
-        width="70"
-        label="符合正常范围金额"
-      >
-        <template slot-scope="scope">
-          <div>{{scope.row.inscp_scp_amt}}元</div>
-        </template>
-      </el-table-column>
+<!--      <el-table-column align="center" prop="name" width="80" label="全自费金额">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>{{ scope.row.fulamt_ownpay_amt }}元</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
-      <el-table-column align="center" prop="name" width="60" label="备注">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>-->
-          <div>{{ scope.row.remark }}</div>
-        </template>
-      </el-table-column>
-    </el-table>
+<!--      <el-table-column align="center" prop="name" width="80" label="超限价金额">-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>{{ scope.row.overlmt_amt  }}元</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="name"-->
+<!--        width="80"-->
+<!--        label="先行自付金额"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>{{ scope.row.preselfpay_amt }}元</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="name"-->
+<!--        width="70"-->
+<!--        label="符合正常范围金额"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          <div>{{scope.row.inscp_scp_amt}}元</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+
+<!--      <el-table-column align="center" prop="name" width="60" label="备注">-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--          <div>{{ scope.row.remark }}</div>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--    </el-table>-->
     <el-table
         id="out-table"
-        v-if="prescription.type == 2"
       :data="prescription.project"
       border
       style="width: 99%"
@@ -137,75 +159,100 @@
       }"
       highlight-current-row
     >
+
       <el-table-column
         align="center"
         type="index"
         width="40"
         label="序号"
       ></el-table-column>
-      <el-table-column
-        align="center"
-        prop="project_name"
-        width="400"
-        label="名称"
-      >
-        <template slot-scope="scope">{{ scope.row.project_name }}</template>
-      </el-table-column>
-      <el-table-column
-        align="center"
-        prop="statistical_classification"
-        width="100"
-        label="组"
-      >
-        <template slot-scope="scope">{{
-          getGroup(scope.row.statistical_classification)
-        }}</template>
-      </el-table-column>
 
       <el-table-column
-        align="center"
-        prop="single_dose"
-        width="80"
-        label="单次用量"
+          align="center"
+          prop="single_dose"
+          width="80"
+          label="姓名"
       >
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-          {{ scope.row.single_dose }}{{ scope.row.unit }}
+          {{patientName}}
         </template>
       </el-table-column>
+
       <el-table-column
-        align="center"
-        prop="delivery_way"
-        width="80"
-        label="用法"
+          align="center"
+          prop="single_dose"
+          width="80"
+          label="就诊号"
       >
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-          {{ scope.row.delivery_way }}
+          {{number}}
         </template>
       </el-table-column>
+
+
       <el-table-column
         align="center"
-        prop="execution_frequency"
-        width="80"
-        label="频率"
+        prop="project_name"
+        width="400"
+        label="名称"
       >
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
-          {{ scope.row.execution_frequency }}
-        </template>
+        <template slot-scope="scope">{{ scope.row.project_name }}</template>
       </el-table-column>
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="statistical_classification"-->
+<!--        width="100"-->
+<!--        label="组"-->
+<!--      >-->
+<!--        <template slot-scope="scope">{{-->
+<!--          getGroup(scope.row.statistical_classification)-->
+<!--        }}</template>-->
+<!--      </el-table-column>-->
+
       <el-table-column
         align="center"
-        prop="number_days"
+        prop="single_dose"
         width="80"
-        label="天数"
+        label="单次用量"
       >
         <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          {{ scope.row.number_days }}天
+          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
+          {{ scope.row.single_dose }}{{ scope.row.unit }}
         </template>
       </el-table-column>
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="delivery_way"-->
+<!--        width="80"-->
+<!--        label="用法"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--          {{ scope.row.delivery_way }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="execution_frequency"-->
+<!--        width="80"-->
+<!--        label="频率"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--          {{ scope.row.execution_frequency }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column-->
+<!--        align="center"-->
+<!--        prop="number_days"-->
+<!--        width="80"-->
+<!--        label="天数"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash;<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>&ndash;&gt;-->
+<!--          {{ scope.row.number_days }}天-->
+<!--        </template>-->
+<!--      </el-table-column>-->
 
       <el-table-column align="center" prop="total" width="80" label="总量">
         <template slot-scope="scope">
@@ -304,7 +351,9 @@ import { getDictionaryDataConfig } from "@/utils/data";
 export default {
   props: {
     prescription: Object,
-  },
+    patientName:String,
+    number:String,
+},
   data() {
     return {
       drugways: [],
@@ -325,7 +374,11 @@ export default {
   },
   methods: {
     exportData(){
-        let excelName = '导出表格名称.xlsx';
+      let excelName =  ""
+
+
+        excelName = this.patientName + "项目耗材"+'.xlsx';
+
         var xlsxParam = { raw: true };//转换成excel时，使用原始的格式
         // 克隆节点
         let tables = document.getElementById("out-table").cloneNode(true);

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -20,7 +20,7 @@
             <!-- 姓名 -->
             <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
             <!-- 个人电脑编号 -->
-            <div style="position: absolute;top:90px;left:240px;"></div>
+            <div style="position: absolute;top:90px;left:240px;">{{psn_no}}</div>
             <!-- 科室 -->
             <div style="position: absolute;top:90px;left:240px;">{{'血透'}}</div>
             <!-- 床号 -->
@@ -29,13 +29,13 @@
 
         <div style="display:flex;justify-content: space-between;">
             <!-- 住院号 -->
-            <div style="position: absolute;top:90px;left:120px;"> {{ list.his_hospital_record.number?list.order.mdtrt_id:'' }}</div>
+            <div style="position: absolute;top:90px;left:120px;"> {{ number?number:'' }}</div>
             <!-- 入院日期 -->
-            <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.in_hosptial_time?list.his_hospital_record.in_hosptial_time.spilt(' ')[0]:''}}</div>
+            <div style="position: absolute;top:90px;left:240px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
             <!-- 出院日期 -->
-            <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.out_hosptial_time?list.his_hospital_record.out_hosptial_time.spilt(' ')[0]:''}}</div>
+            <div style="position: absolute;top:90px;left:240px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
             <!-- 住院天数 -->
-          <div style="position: absolute;top:90px;left:240px;">{{getDay(list.his_hospital_record.in_hosptial_time.split(' ')[0] ,list.his_hospital_record.out_hosptial_time.split(' ')[0])}}</div>
+          <div style="position: absolute;top:90px;left:240px;">{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
         </div>
 
         <!-- <div style="display:flex;justify-content: space-between;">
@@ -137,7 +137,7 @@
                 <span v-else>零</span>
             </span>
             </span>
-            <span style="position: absolute;top:280px;left:540px">{{ totalPrice }}</span>
+            <span style="position: absolute;top:280px;left:540px">{{ list.order.medfee_sumamt }}</span>
         </div>
 
 
@@ -167,7 +167,7 @@
         </div> -->
         <!-- 其他基金支付 -->
         <!-- <div style="position: absolute;top:340px;left:560px">
-            
+
           {{list.order.oth_pay?list.order.oth_pay:''}}
 
         </div> -->
@@ -207,15 +207,19 @@ export default {
     },
     data(){
         return{
-            list:{},
+            list:null,
             printDate:'',
             zhongwen:'',
             totalPrice:0.0,
             org_id:'',
-            org_name:''
+            org_name:'',
+          psn_no:"",
+          in_hosptial_time:'',
+          out_hosptial_time:'',
+          number:'',
         }
     },
-    created(){
+    mounted(){
         console.log('paramsObj',this.paramsObj)
         let params = {
             order_id: this.paramsObj.order_id,
@@ -248,14 +252,33 @@ export default {
             getInvoice(params).then((res) => {
                 console.log('res',res)
                 this.list = res.data.data
-                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+                console.log(this.list)
+              console.log(this.list.his_hospital_record)
+
+              this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
                                     this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
-                this.smalltoBIG(this.totalPrice)
+                this.smalltoBIG( this.list.order.medfee_sumamt)
                 // var data = new Date(res.data.data.date * 1000);
                 var data = new Date(this.paramsObj.setl_time);
                 var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
                 var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
                 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]
+              }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.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.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
+              this.gend= this.list.his_hospital_record.gend
             })
         },
         smalltoBIG(n) {

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -176,6 +176,8 @@
                           :name="item.name">
                       </el-tab-pane>
                       <settle-prescription-table
+                          :patientName="hisPatientInfo.name"
+                          :number="hisPatientInfo.number"
                           :prescription="curSettlePrescriptions"
                       ></settle-prescription-table>
                     </el-tabs>

src/xt_pages/hospitalStation/shouJuTemplate/shouJuPrintOne.vue

@@ -16,7 +16,7 @@
       <!-- 姓名 -->
       <div style="position: absolute;top:90px;left:120px;"> {{ paramsObj.name }}</div>
       <!-- 个人电脑编号 -->
-      <div style="position: absolute;top:90px;left:240px;"></div>
+      <div style="position: absolute;top:90px;left:240px;">{{psn_no}}</div>
       <!-- 科室 -->
       <div style="position: absolute;top:90px;left:240px;">{{'血透'}}</div>
       <!-- 床号 -->
@@ -25,13 +25,13 @@
 
     <div style="display:flex;justify-content: space-between;">
       <!-- 住院号 -->
-      <div style="position: absolute;top:90px;left:120px;"> {{ list.his_hospital_record.number?list.order.mdtrt_id:'' }}</div>
+      <div style="position: absolute;top:90px;left:120px;"> {{ number?number:'' }}</div>
       <!-- 入院日期 -->
-      <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.in_hosptial_time?list.his_hospital_record.in_hosptial_time.spilt(' ')[0]:''}}</div>
+      <div style="position: absolute;top:90px;left:240px;">{{in_hosptial_time?in_hosptial_time.split(' ')[0]:''}}</div>
       <!-- 出院日期 -->
-      <div style="position: absolute;top:90px;left:240px;">{{list.his_hospital_record.out_hosptial_time?list.his_hospital_record.out_hosptial_time.spilt(' ')[0]:''}}</div>
+      <div style="position: absolute;top:90px;left:240px;">{{out_hosptial_time?out_hosptial_time.split(' ')[0]:''}}</div>
       <!-- 住院天数 -->
-      <div style="position: absolute;top:90px;left:240px;">{{getDay(list.his_hospital_record.in_hosptial_time.split(' ')[0] ,list.his_hospital_record.out_hosptial_time.split(' ')[0])}}</div>
+      <div style="position: absolute;top:90px;left:240px;">{{getDay(in_hosptial_time.split(' ')[0] ,out_hosptial_time.split(' ')[0])}}</div>
     </div>
 
     <!-- <div style="display:flex;justify-content: space-between;">
@@ -133,7 +133,7 @@
                 <span v-else>零</span>
             </span>
             </span>
-      <span style="position: absolute;top:280px;left:540px">{{ totalPrice }}</span>
+      <span style="position: absolute;top:280px;left:540px">{{ list.order.medfee_sumamt }}</span>
     </div>
 
 
@@ -209,7 +209,11 @@ export default {
       zhongwen:'',
       totalPrice:0.0,
       org_id:'',
-      org_name:''
+      org_name:'',
+      psn_no:"",
+      in_hosptial_time:'',
+      out_hosptial_time:'',
+      number:'',
     }
   },
   created(){
@@ -247,12 +251,25 @@ export default {
         this.list = res.data.data
         this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
             this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
-        this.smalltoBIG(this.totalPrice)
+        this.smalltoBIG(this.list.order.medfee_sumamt)
         // var data = new Date(res.data.data.date * 1000);
         var data = new Date(this.paramsObj.setl_time);
         var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
         var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
         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]
+        }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.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
+
+
       })
     },
     smalltoBIG(n) {

src/xt_pages/hospitalStation/summary.vue

@@ -31,6 +31,16 @@
                         :value="item.value">
                     </el-option>
                   </el-select>
+
+                  <el-select size="small" v-model="charge_type" placeholder="请选择"
+                             style="width:150px;margin-left:10px;" @change="changeChargeType">
+                    <el-option
+                        v-for="(item,index) in charge_types"
+                        :key="index"
+                        :label="item.label"
+                        :value="item.value">
+                    </el-option>
+                  </el-select>
                     <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date"
                                     @change="handleStartTimeChange" :editable="false" :clearable="false"
                                     style="width: 196px;margin-right:10px;" type="date" placeholder="选择开始日期"
@@ -121,7 +131,7 @@
                           上传结算清单
                         </el-button>
                         <el-button size="mini" type="primary" @click="invoicePrint(scope.row)">打印发票</el-button>
-<!--                      <el-button size="mini" type="primary" @click="shouJuPrint(scope.row)">打印收据</el-button>-->
+                      <el-button size="mini" type="primary" @click="shouJuPrint(scope.row)">打印收据</el-button>
 
 <!--                        <el-button size="mini" type="primary" @click="refundOne(scope.row)">-->
 <!--                            撤销出院-->
@@ -277,6 +287,7 @@
         settlementVisible: false,
         sort_type:1,
         p_type:1,
+        charge_type:0,
         sort_types: [
           { value: 1, label: '处方时间' },
           { value: 2, label: '结算时间' }
@@ -285,6 +296,10 @@
           { value: 0, label: '全部' },
           { value: 1, label: '住院' },
           { value: 2, label: '门诊' }
+        ],charge_types:[
+          { value: 0, label: '全部' },
+          { value: 1, label: '医保' },
+          { value: 2, label: '自费' }
         ],
         shouJuVisible:false,
 
@@ -322,6 +337,11 @@
           }
         }).catch(function(error) {
         })
+      },changeChargeType(){
+        this.page = 1
+        this.keywords = ''
+        this.getHisOrderList()
+
       },
       changePType(){
         this.page = 1
@@ -839,7 +859,8 @@
           end_time: this.end_time,
           type: this.admin_user_id,
           p_type: this.p_type,
-          sort_type: this.sort_type
+          sort_type: this.sort_type,
+          charge_type: this.charge_type
 
         }
         getHisOrderList(params).then(response => {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -203,7 +203,7 @@
 
 
                                 <el-button v-loading="loadingtwo"
-                                           v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3)&& org_id != 10340"
+                                           v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
                                            type="primary">收费