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

src/api/his/his_hospital.js

+import request from "@/utils/request";
+
+
+
+export function upLoadChargeInfo(params) {
+  return request({
+    url: "/api/hospital/upload",
+    method: "get",
+    params:params
+  });
+}
+

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

             <!--平车-->
             <!--</div>-->
           </div>
+          
           <div class="inline_block" style="margin-left: 10px;">
             诊断：
             <div class="under_line" style="width: 640px;text-align: left;word-wrap: break-word;white-space: inherit;">

src/xt_pages/hospitalStation/chargeDetailManagement.vue

     <div class="app-container" style="display:flex;flex: 1;padding: 10px 20px 0px 20px;">
       <div class="mainLeft">
 
-                <el-date-picker
-                    v-model="record_date"
-                    prefix-icon="el-icon-date"
-                    @change="changeTimeTwo"
-                    :editable="false"
-                    style="width: 100%;"
-                    type="date"
-                    :picker-options="pickerOptions"
-                    placeholder="选择开始时间"
-                    align="right"
-                    format="yyyy-MM-dd"
-                    value-format="yyyy-MM-dd">
-                </el-date-picker>
+        <el-date-picker
+            v-model="record_date"
+            prefix-icon="el-icon-date"
+            @change="changeTimeTwo"
+            :editable="false"
+            style="width: 100%;"
+            type="date"
+            :picker-options="pickerOptions"
+            placeholder="选择开始时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd">
+        </el-date-picker>
 
         <div class="mainCell">
           <el-radio-group v-model="schedule_type" @change="changeScheduleType">
                   </div>
                   <div class="costBox">
                     <span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>
-                    <span v-if="this.radio == 2">处方总价：<span style="color:red;">{{all_total+'元' + ' = 全自费总金额:'+fulamt_ownpay_amt + '元+'  + '超限价总金额:' + overlmt_amt  + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' +  inscp_scp_amt + '元'   }}</span></span>
-                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{all_total }}元</span></span>
+                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type != 2">处方总价：<span style="color:red;">{{
+                        all_total + '元' + ' = 全自费总金额:' + fulamt_ownpay_amt + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'
+                      }}</span></span>
+                    <span v-if="this.radio == 2&&this.hisPatientInfo.balance_accounts_type == 2">处方总价：<span style="color:red;">{{
+                        all_total + '元' + ' = 全自费总金额:' + all_total + '元+' + '超限价总金额:' + overlmt_amt + '元+' + '先行自付金额:' + preselfpay_amt + '元+' + '符合正常范围总金额:' + inscp_scp_amt + '元'
+                      }}</span></span>
+                    <span v-if="this.radio == 1">处方总价：<span style="color:red;">{{ all_total }}元</span></span>
 
                     <!--                    <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
-<!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
+                    <!--                    <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>-->
+                    <!--                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>-->
                   </div>
                 </div>
                 <!--                <div class="centerRight">-->
 import medicalInsuranceRefund from './components/medicalInsuranceRefund'
 import additionalCharges from './components/additionalCharges'
 import { getHisHospitalDetailInfo, getHisHospitalDetailList, getMonthHisHospitalDetailInfo } from '@/api/his/his'
+import { upLoadChargeInfo } from '@/api/his/his_hospital'
+
 import { uParseTime } from '@/utils/tools'
 
 import RegisterDialog from './components/registerDialog'
       settle_prescriptions: [],
 
       settle_total: 0,
-      all_total:0,
-      all_month_total:0,
+      all_total: 0,
+      all_month_total: 0,
       record_date: '',
       tableData: [],
       editableTabsValue: '处方1',
       department: [],
       invoiceVisible: false,
       invoiceParams: {},
-      fulamt_ownpay_amt:'',
-      overlmt_amt:'',
-      preselfpay_amt:'',
-      inscp_scp_amt:'',
+      fulamt_ownpay_amt: '',
+      overlmt_amt: '',
+      preselfpay_amt: '',
+      inscp_scp_amt: ''
     }
   },
   created() {
           case 2:
             let arr2 = []
             for (let i = 0; i < this.all_table_data.length; i++) {
-              if (this.all_table_data[i].name.indexOf(this.search_input) != -1 ){
+              if (this.all_table_data[i].name.indexOf(this.search_input) != -1) {
                 arr2 = arr2.concat(this.all_table_data[i])
               }
             }
           params['settle_accounts_type'] = 2
 
         }
-        if (this.hisPatientInfo.balance_accounts_type != 2){
+        if (this.hisPatientInfo.balance_accounts_type != 2) {
           axios.get('http://127.0.0.1:9532/zh/api/uploadinfo/get', {
             params: params
           })
               })
               .catch(function(error) {
               })
-        }else  if (this.hisPatientInfo.balance_accounts_type == 2){
+        } else if (this.hisPatientInfo.balance_accounts_type == 2) {
+          var that = this
+          let params = {
+            'in_hospital_id': that.hisPatientInfo.id,
+            'id': that.hisPatientInfo.patient_id,
+            'admin_user_id': that.$store.getters.xt_user.user.id,
+            'record_time': that.record_date
+
+          }
+          if (this.activeName == 'first') {
+            params['settle_accounts_type'] = 1
+
+          } else {
+            params['start_time'] = that.other_start_time
+            params['end_time'] = that.other_end_time
+            params['settle_accounts_type'] = 2
+
+          }
+          upLoadChargeInfo(params).then(response => {
+            if (response.data.state == 0) {
+              this.loading = false
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              that.$message.success('上传明细成功')
+              that.radio = 2
+              that.changePatientInfo()
+            }
+          })
 
 
         }
       }
-    },changePatientInfo(){
+    }, changePatientInfo() {
       let params = {
         'record_date': this.record_date,
         'sch_type': this.schedule_type
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              if (this.hisPatientInfo.id > 0){
+              if (this.hisPatientInfo.id > 0) {
                 for (let i = 0; i < this.patientTableData.length; i++) {
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
                     this.current_index = i
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
 
-
-              if (this.hisPatientInfo.id > 0){
+              if (this.hisPatientInfo.id > 0) {
                 for (let i = 0; i < this.patientTableData.length; i++) {
                   if (this.hisPatientInfo.patient_id == this.patientTableData[i].patient_id) {
                     this.current_index = i
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
 
                   }
                 }
-              }else{
+              } else {
                 this.$refs.tab.setCurrentRow(this.patientTableData[0])
                 this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].patient_id)
               }
                 overlmt_amt: prescription.advices[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.advices[b].order_info.preselfpay_amt,
                 inscp_scp_amt: prescription.advices[b].order_info.inscp_scp_amt,
-                execution_state: prescription.advices[b].execution_state,
+                execution_state: prescription.advices[b].execution_state
 
               }
               tempAdvice.push(obj)
                 overlmt_amt: prescription.project[b].order_info.overlmt_amt,
                 preselfpay_amt: prescription.project[b].order_info.preselfpay_amt,
                 inscp_scp_amt: prescription.project[b].order_info.inscp_scp_amt,
-                execution_state: prescription.project[b].execution_state,
-
+                execution_state: prescription.project[b].execution_state
 
               }
 
           this.preselfpay_amt = this.getPreselfpayAmtTotal()
           this.inscp_scp_amt = this.getInscpScpAmtTotal()
 
-
         }
       })
-    },getFulamtOwnpayAmtTotal(){
+    }, getFulamtOwnpayAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
       }
       return total.toFixed(2)
 
-    },getOverlmtAmtTotal(){
+    }, getOverlmtAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
       }
       return total.toFixed(2)
 
-    },getPreselfpayAmtTotal(){
+    }, getPreselfpayAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {
       }
       return total.toFixed(2)
 
-    },getInscpScpAmtTotal(){
+    }, getInscpScpAmtTotal() {
       var total = 0
       for (let i = 0; i < this.prescriptions.length; i++) {
         if (this.prescriptions[i].advices != null) {

src/xt_pages/hospitalStation/components/settlePrescriptionTable.vue

 <template>
   <div class="prescriptionTable">
-    <el-table v-if="prescription.type == 1" :data="prescription.advices" border style="width: 99%;"
-              :row-style="{ color: '#303133' }"
-              :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
+      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" label="名称">
-        <template slot-scope="scope"><span :title='scope.row.drug_name'>{{ scope.row.drug_name }}</span></template>
+        <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="90" label="单次用量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.single_dose" readonly style="width:65%;"></el-input>-->
-          <div>{{scope.row.single_dose}}&nbsp;&nbsp;{{scope.row.single_dose_unit}}</div>
+          <div>
+            {{ scope.row.single_dose }}&nbsp;&nbsp;{{
+              scope.row.single_dose_unit
+            }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="用法">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" readonly></el-input>-->
-          <div> {{scope.row.delivery_way}}</div>
-
+          <div>{{ scope.row.delivery_way }}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="100" label="频率">
         <template slot-scope="scope">
-          <div> {{scope.row.execution_frequency}}</div>
+          <div>{{ scope.row.execution_frequency }}</div>
 
           <!--<el-input v-model="scope.row.execution_frequency" readonly></el-input>-->
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="day" width="50" label="天数">
-        <template slot-scope="scope">{{scope.row.day}}天</template>
+        <template slot-scope="scope">{{ scope.row.day }}天</template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>-->
-          <div>{{scope.row.prescribing_number}}&nbsp;&nbsp;{{scope.row.prescribing_number_unit}}</div>
+          <div>
+            {{ scope.row.prescribing_number }}&nbsp;&nbsp;{{
+              scope.row.prescribing_number_unit
+            }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="单价">
         <template slot-scope="scope">
-          <div> {{scope.row.retail_price}}元</div>
+          <div>{{ scope.row.retail_price }}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div> {{(scope.row.prescribing_number * scope.row.retail_price).toFixed(2)}}元</div>
+          <div>
+            {{
+              (scope.row.prescribing_number * scope.row.retail_price).toFixed(
+                2
+              )
+            }}元
+          </div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
 
       <el-table-column align="center" prop="name" width="60" label="全自费金额">
         <template slot-scope="scope">
-          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+          <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">
-          <div> {{scope.row.overlmt_amt}}元</div>
+          <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="60"
+        label="先行自付金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.preselfpay_amt}}元</div>
+          <div>{{ scope.row.preselfpay_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="60"
+        label="符合正常范围金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.inscp_scp_amt}}元</div>
+          <div>{{ scope.row.inscp_scp_amt }}元</div>
         </template>
       </el-table-column>
 
-
-
-
       <el-table-column align="center" prop="name" width="50" 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>
+          <div>{{ scope.row.remark }}</div>
         </template>
       </el-table-column>
     </el-table>
-    <el-table v-if="prescription.type == 2" :data="prescription.project" border style="width: 99%;"
-              :row-style="{ color: '#303133' }"
-              :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
+      v-if="prescription.type == 2"
+      :data="prescription.project"
+      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="project_name" 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
+        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="单次用量">
-        <template slot-scope="scope">{{scope.row.single_dose}}{{scope.row.unit}}</template>
-
+      <el-table-column
+        align="center"
+        prop="single_dose"
+        width="80"
+        label="单次用量"
+      >
+        <template slot-scope="scope"
+          >{{ scope.row.single_dose }}{{ scope.row.unit }}</template
+        >
       </el-table-column>
-      <el-table-column align="center" prop="delivery_way" width="80" label="用法">
+      <el-table-column
+        align="center"
+        prop="delivery_way"
+        width="80"
+        label="用法"
+      >
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-          {{scope.row.delivery_way}}
-
+          {{ scope.row.delivery_way }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
+      <el-table-column
+        align="center"
+        prop="execution_frequency"
+        width="80"
+        label="频率"
+      >
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
-          {{scope.row.execution_frequency}}
-
+          {{ scope.row.execution_frequency }}
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="number_days" width="50" label="天数">
+      <el-table-column
+        align="center"
+        prop="number_days"
+        width="50"
+        label="天数"
+      >
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          {{scope.row.number_days}}天
-
+          {{ scope.row.number_days }}天
         </template>
-
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
+          <div style="display: flex">
             <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
-            {{scope.row.total}} {{scope.row.unit}}
-
+            {{ scope.row.total }} {{ scope.row.unit }}
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{scope.row.price}}元
-
+          {{ scope.row.price }}元
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="60" label="总价">
         <template slot-scope="scope">
-          <div> {{(scope.row.total * scope.row.price).toFixed(2)}}元</div>
+          <div>{{ (scope.row.total * scope.row.price).toFixed(2) }}元</div>
 
           <!--<el-input v-model="scope.row.retail_price" placeholder="" readonly></el-input>-->
         </template>
 
       <el-table-column align="center" prop="name" width="60" label="全自费金额">
         <template slot-scope="scope">
-          <div> {{scope.row.fulamt_ownpay_amt}}元</div>
+          <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">
-          <div> {{scope.row.overlmt_amt}}元</div>
+          <div>{{ scope.row.overlmt_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="60" label="先行自付金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="60"
+        label="先行自付金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.preselfpay_amt}}元</div>
+          <div>{{ scope.row.preselfpay_amt }}元</div>
         </template>
       </el-table-column>
 
-
-      <el-table-column align="center" prop="name" width="60" label="符合正常范围金额">
+      <el-table-column
+        align="center"
+        prop="name"
+        width="60"
+        label="符合正常范围金额"
+      >
         <template slot-scope="scope">
-          <div> {{scope.row.inscp_scp_amt}}元</div>
+          <div>{{ scope.row.inscp_scp_amt }}元</div>
         </template>
       </el-table-column>
 
-
-
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
           <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
-          {{scope.row.remark}}
-
+          {{ scope.row.remark }}
         </template>
       </el-table-column>
     </el-table>
 
     <div class="additionalBox">
-      <div class="additionalOne" v-for="(item,index) in prescription.addition" :key="index">
-        <span :title="item.item_name">{{item.item_name}}</span>
-        <el-input v-model="item.price" placeholder="" style="width:50px;" readonly></el-input>
+      <div
+        class="additionalOne"
+        v-for="(item, index) in prescription.addition"
+        :key="index"
+      >
+        <span :title="item.item_name">{{ item.item_name }}</span>
+        <el-input
+          v-model="item.price"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
         共
-        <el-input v-model="item.count" placeholder="" style="width:50px;" readonly></el-input>
+        <el-input
+          v-model="item.count"
+          placeholder=""
+          style="width: 50px"
+          readonly
+        ></el-input>
         次
         <!--<i class="el-icon-delete deleteIcon" @click="delAddition(index,item)"></i>-->
       </div>
 </template>
 
 <script>
-import { getInitData } from '@/api/his/his'
-import { getDictionaryDataConfig} from "@/utils/data";
+import { getInitData } from "@/api/his/his";
+import { getDictionaryDataConfig } from "@/utils/data";
 
 export default {
   props: {
-    prescription: Object
+    prescription: Object,
   },
   data() {
     return {
       drugways: [],
-      efs: []
-    }
-  }, mounted() {
-    getInitData().then(response => {
+      efs: [],
+    };
+  },
+  mounted() {
+    getInitData().then((response) => {
       if (response.data.state == 0) {
         this.$message.error(response.data.msg);
-        return false
+        return false;
       } else {
         this.drugways = response.data.data.drugways;
-        this.efs = response.data.data.efs
+        this.efs = response.data.data.efs;
       }
-    })
-  }, methods:  {
-
+    });
+  },
+  methods: {
+    changColor({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        // 变颜色的条件
+        return {
+          backgroundColor: "#C4E1FF",
+          color: "#303133", // 这个return的就是样式 可以是color 也可以是backgroundColor
+        };
+      } else {
+        return {
+          backgroundColor: "#ACD6FF",
+          color: "#303133",
+        };
+      }
+    },
 
-    getGroup(id){
+    getGroup(id) {
       var name = "";
-      var statistics_category =  getDictionaryDataConfig('system','statistics_category');
-      console.log("2235",statistics_category);
-      for(let i=0;i<statistics_category.length;i++){
-        if(id == statistics_category[i].id){
-          name = statistics_category[i].name
+      var statistics_category = getDictionaryDataConfig(
+        "system",
+        "statistics_category"
+      );
+      console.log("2235", statistics_category);
+      for (let i = 0; i < statistics_category.length; i++) {
+        if (id == statistics_category[i].id) {
+          name = statistics_category[i].name;
         }
       }
-      return name
+      return name;
     },
-
-
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss">
-.prescriptionTable{
-.additionalBox{
-  margin-top: 20px;
-  display: flex;
-  flex-wrap: wrap;
-.additionalOne{
-  margin-right:20px;
-  margin-bottom:10px;
-  display: flex;
-  align-items: center;
->span{
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  width:80px;
-  display: inline-block;
-  font-size: 14px;
-}
-}
-.deleteIcon{
-  color:red;
-  margin-left:5px;
-}
-}
-.el-table th .cell, .el-table td .cell{
-  padding: 0 2px;
-  white-space: pre-line;
-}
-.el-icon-delete{
-  color:red;
-}
+.prescriptionTable {
+  .additionalBox {
+    margin-top: 20px;
+    display: flex;
+    flex-wrap: wrap;
+    .additionalOne {
+      margin-right: 20px;
+      margin-bottom: 10px;
+      display: flex;
+      align-items: center;
+      > span {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        width: 80px;
+        display: inline-block;
+        font-size: 14px;
+      }
+    }
+    .deleteIcon {
+      color: red;
+      margin-left: 5px;
+    }
+  }
+  .el-table th .cell,
+  .el-table td .cell {
+    padding: 0 2px;
+    white-space: pre-line;
+  }
+  .el-icon-delete {
+    color: red;
+  }
 }
 </style>

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

                 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;
-                this.in_hosptial_time = this.list.order.his_hospital_patient.in_hosptial_time
-                this.out_hosptial_time = this.list.order.his_hospital_patient.out_hosptial_time
+                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]
             })
         },
         smalltoBIG(n) {

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

         width="30%"
     >
       <span>是否修改医疗类型</span>
-      <el-select v-if="this.$store.getters.xt_user.org_id == 10188" style="width:50%;" v-model="temp_med_type"
+      <el-select v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217" style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             v-for="(item,index) in registerThree"
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10188" style="width:50%;" v-model="temp_med_type"
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217" style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             v-for="(item,index) in register"

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

 <template>
   <div id="statement-print" class="statement-print">
-    <div class="statementTitle" v-if="info.fixmedins_code == 'H32092103007'">江苏省社会医疗保险医疗费用结算单</div>
-    <div class="statementTitle" v-if="info.fixmedins_code == 'H42138100547'">广水源生堂社会医疗保险医疗费用结算单</div>
-
-    <div class="statementTitle" v-else>广东省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10188 || this.$store.getters.xt_user.org_id == 10217">江苏省社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id == 10088">广水源生堂社会医疗保险医疗费用结算单</div>
+    <div class="statementTitle" v-if="this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10088">广东省社会医疗保险医疗费用结算单</div>
 
     <table class="statementTable" border="1">
       <tr>

src/xt_pages/outpatientCharges/summaryDetail.vue

               <el-table-column align="center" prop="name" width="60" label="总价">
                 <template slot-scope="scope">
                   <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-                  {{scope.row.price.toFixed(2)}}元
+                  {{(scope.row.count * scope.row.price).toFixed(2)}}元
 
                 </template>
               </el-table-column>