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.js

 
 
 
+export function getIncomeStatisticsDataList(params) {
+  return request({
+    url: "/api/incomestatistics/get",
+    method: "get",
+    params:params,
+  });
+}
 
 
 

src/xt_pages/outpatientCharges/components/registerDialog.vue

 <template>
-  <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
-             :close-on-click-modal="isClose"
-             :close-on-press-escape="isClose">
-
-    <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
-      <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
-        <el-autocomplete
-          class="checkSearch"
-          popper-class="my-autocomplete"
-          v-model="form.name"
-          :fetch-suggestions="querySearchAsync"
-          :trigger-on-focus="false"
-          placeholder="请输入病人名字"
-          @select="handleSelect"
-          style="width:160px;"
-        >
-          <i class="el-icon-search el-input__icon" slot="suffix"></i>
-          <template slot-scope="{ item }">
-            <div class="name">{{ item.name }}</div>
-          </template>
-        </el-autocomplete>
-      </el-form-item>
-
-      <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
-        <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in sex"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-
-
-      </el-form-item>
-
-      <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
-        <el-input v-model="form.age"></el-input>
-      </el-form-item>
-
-
-      <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
-        <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
-                        value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
-      </el-form-item>
-
-      <el-form-item label="手机号码：" prop="phone">
-        <el-input v-model="form.phone"></el-input>
-      </el-form-item>
-
-
-      <el-form-item label="医疗类别：">
-        <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="(item,index) in medical_care"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
-        <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in certificates"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
-        <el-input v-model="form.id_card"></el-input>
-      </el-form-item>
-
-      <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
-                   >
-          <el-option
-            v-for="(item,index) in registers"
-            :key="index"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
-          <el-option
-            v-for="(item,index) in sick"
-            :key="index"
-            :label="item.class_name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
-        <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
-          <el-option
-            v-for="(item,index) in diagnoses"
-            :key="index"
-            :label="item.class_name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="结算类型：">
-        <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in settlement"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="社保类型：">
-        <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in medicalCare"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
-        <el-select v-model="form.id_card_type" placeholder="请选择">
-          <el-option
-            v-for="item in IDCardTypes"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-
-
-      <el-form-item class="specialFormItem" label="医保卡号：">
-        <div style="display:flex;">
-          <el-input v-model="form.medical_insurance_card"></el-input>
-          <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
-
-        </div>
-      </el-form-item>
-
-      <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
-        <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
-          <el-option
-            v-for="item in register"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="挂号费：">
-        <el-input  v-model="form.registration_fee"></el-input>
-      </el-form-item>
-      <el-form-item label="诊疗费：">
-        <el-input v-model="form.medical_expenses"></el-input>
-      </el-form-item>
-    </el-form>
-
-    <span slot="footer" class="dialog-footer">
+    <el-dialog width="854px" class="registerDialog" :title="titles" :visible.sync="visibility"
+               :close-on-click-modal="isClose"
+               :close-on-press-escape="isClose">
+
+        <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
+            <el-form-item label="患者姓名：" prop="name" :validate-event="is_Name">
+                <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="false"
+                        placeholder="请输入病人名字"
+                        @select="handleSelect"
+                        style="width:160px;"
+                >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.name }}</div>
+                    </template>
+                </el-autocomplete>
+            </el-form-item>
+
+            <el-form-item label="性别：" prop="gender" :validate-event="is_Name">
+                <el-select v-model="form.gender" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in sex"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+
+
+            </el-form-item>
+
+            <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
+                <el-input v-model="form.age"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
+                <el-date-picker v-model="form.birthday" type="date" format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%;"></el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="手机号码：" prop="phone">
+                <el-input v-model="form.phone"></el-input>
+            </el-form-item>
+
+
+            <el-form-item label="医疗类别：">
+                <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="(item,index) in medical_care"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="证件类型：" prop="certificates" :validate-event="is_Name">
+                <el-select v-model="form.certificates" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in certificates"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="证件号码：" prop="id_card" :validate-event="is_Name">
+                <el-input v-model="form.id_card"></el-input>
+            </el-form-item>
+
+            <el-form-item label="处方类型：" prop="p_type" :validate-event="is_Name">
+                <el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""
+                >
+                    <el-option
+                            v-for="(item,index) in registers"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="大病类别：" prop="sick_type" :validate-event="is_Name">
+                <el-select style="margin-right:5px;width:100px;" v-model="form.sick_type" placeholder="">
+                    <el-option
+                            v-for="(item,index) in sick"
+                            :key="index"
+                            :label="item.class_name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="诊断：" prop="diagnosis" :validate-event="is_Name">
+                <el-select style="margin-right:5px;width:100px;" v-model="form.diagnosis" placeholder="">
+                    <el-option
+                            v-for="(item,index) in diagnoses"
+                            :key="index"
+                            :label="item.class_name"
+                            :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="结算类型：">
+                <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in settlement"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="社保类型：">
+                <el-select v-model="form.social_type" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in medicalCare"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="读卡类型：" prop="id_card_type" :validate-event="is_Name">
+                <el-select v-model="form.id_card_type" placeholder="请选择">
+                    <el-option
+                            v-for="item in IDCardTypes"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
+
+            <el-form-item class="specialFormItem" label="医保卡号：">
+                <div style="display:flex;">
+                    <el-input v-model="form.medical_insurance_card"></el-input>
+                    <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
+
+                </div>
+            </el-form-item>
+
+            <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
+                <el-select v-model="form.register" placeholder="请选择" style="width:100%;">
+                    <el-option
+                            v-for="item in register"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="挂号费：">
+                <el-input v-model="form.registration_fee"></el-input>
+            </el-form-item>
+            <el-form-item label="诊疗费：">
+                <el-input v-model="form.medical_expenses"></el-input>
+            </el-form-item>
+        </el-form>
+
+        <span slot="footer" class="dialog-footer">
     <el-button @click="cancel('formValue')">取 消</el-button>
     <el-button type="primary" @click="confirm('formValue')">挂 号</el-button>
   </span>
-  </el-dialog>
+    </el-dialog>
 
 </template>
 
 <script>
-  import {uParseTime,jsGetAge} from "@/utils/tools";
+  import { jsGetAge, uParseTime } from '@/utils/tools'
   import axios from 'axios'
-  import {PostSearch} from '@/api/patient'
+  import { PostSearch } from '@/api/patient'
 
-  import {getDictionaryDataConfig} from '@/utils/data'
+  import { getDictionaryDataConfig } from '@/utils/data'
 
   export default {
 
 
       return {
         registers: [
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '门诊挂号'},
-          {value: 13, label: "急诊"},
-          {value: 14, label: "门诊特殊病"},
-          {value: 15, label: "门诊统筹"},
-          {value: 16, label: "门诊慢性病"},
-          {value: 21, label: "普通住院"},
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '门诊挂号' },
+          { value: 13, label: '急诊' },
+          { value: 14, label: '门诊特殊病' },
+          { value: 15, label: '门诊统筹' },
+          { value: 16, label: '门诊慢性病' },
+          { value: 21, label: '普通住院' }
         ],
-        medical_care:[
-          {value: 11, label: "普通门诊"},
-          {value: 12, label: '家庭通道'},
-          {value: 13, label: "门诊大病"},
-          {value: 14, label: "重疾特药"},
-          {value: 15, label: "门诊慢病"},
-          {value: 16, label: "门诊特检"},
-          {value: 17, label: "健康体检"},
-          {value: 18, label: "预防接种"},
-          {value: 19, label: "门诊输血"},
-          {value: 91, label: "新冠肺炎门诊"},
+        medical_care: [
+          { value: 11, label: '普通门诊' },
+          { value: 12, label: '家庭通道' },
+          { value: 13, label: '门诊大病' },
+          { value: 14, label: '重疾特药' },
+          { value: 15, label: '门诊慢病' },
+          { value: 16, label: '门诊特检' },
+          { value: 17, label: '健康体检' },
+          { value: 18, label: '预防接种' },
+          { value: 19, label: '门诊输血' },
+          { value: 91, label: '新冠肺炎门诊' }
         ],
 
-
-
-
         form: {
           id: '',
           settlement_value: '',
           name: '',
           gender: '',
           certificates: 1,
-          p_type:'',
-          sick_type:'',
-          diagnosis:'',
+          p_type: '',
+          sick_type: '',
+          diagnosis: '',
           medical_care: '',
           birthday: '',
           age: '',
           medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: '',
+          social_type: ''
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
         }, {
           value: 2,
-          label: "身份证"
+          label: '身份证'
         }, {
           value: 3,
-          label: "电子凭证"
-        },],
+          label: '电子凭证'
+        }],
         settlement: [
-          {value: 1, label: '医保'},
-          {value: 2, label: '自费'},
-          {value: 3, label: '公费'},
-          {value: 4, label: '农保'},
-          {value: 5, label: '会员'},
-          {value: 6, label: '职工'},
-          {value: 7, label: '合同'}
+          { value: 1, label: '医保' },
+          { value: 2, label: '自费' },
+          { value: 3, label: '公费' },
+          { value: 4, label: '农保' },
+          { value: 5, label: '会员' },
+          { value: 6, label: '职工' },
+          { value: 7, label: '合同' }
         ],
         sex: [{
           value: 1,
           label: '内地身份证'
         }, {
           value: 2,
-          label: "社保卡"
+          label: '社保卡'
         }, {
           value: 3,
-          label: "护照"
+          label: '护照'
         }, {
           value: 4,
-          label: "军官证"
+          label: '军官证'
         }, {
           value: 5,
-          label: "台胞证"
+          label: '台胞证'
         }, {
           value: 6,
-          label: "港澳地区身份证"
+          label: '港澳地区身份证'
         }],
         medicalCare: [{
           value: 1,
           label: '职工基本医疗保险'
         }, {
           value: 2,
-          label: "公务员医疗补助"
+          label: '公务员医疗补助'
         }, {
           value: 3,
-          label: "大额医疗费用补助"
+          label: '大额医疗费用补助'
         }, {
           value: 4,
-          label: "离休人员医疗"
+          label: '离休人员医疗'
         }, {
           value: 5,
-          label: "城乡居民基本医疗保险"
+          label: '城乡居民基本医疗保险'
         }, {
           value: 6,
-          label: "城乡居民大病医疗保险"
+          label: '城乡居民大病医疗保险'
         }, {
-            value: 7,
-            label: "生育保险"
-          }],
+          value: 7,
+          label: '生育保险'
+        }],
         register: [{
           value: 1,
           label: '普通'
         }, {
           value: 2,
-          label: "主治"
+          label: '主治'
         }, {
           value: 3,
-          label: "主任"
+          label: '主任'
         }, {
           value: 4,
-          label: "免收诊金"
+          label: '免收诊金'
         }, {
           value: 5,
-          label: "专家"
+          label: '专家'
         }],
         rules: {
-          name: [{required: true, message: "患者姓名不能为空", trigger: 'blur'}],
-          gender: [{required: true, message: "患者性别不能为空", trigger: 'blur'}],
-          id_card: [{required: true, message: '证件号码不能为空', trigger: 'blur'}],
-          register: [{required: true, message: '请选择挂号类型', trigger: 'blur'}],
-          doctor: [{required: true, message: '请选择医生', trigger: 'blur'}],
-          department: [{required: true, message: '请填写科室', trigger: 'blur'}],
-          age: [{required: true, message: "患者年龄不能为空", trigger: 'blur'}],
-          birthday: [{required: true, message: "患者出生日期不能为空", trigger: 'blur'}],
-          certificates: [{required: true, message: "证件类型不能为空", trigger: 'change'}],
-          id_card_type: [{required: true, message: "读卡类型不能为空", trigger: 'change'}],
-          p_type: [{required: true, message: "处方类型不能为空", trigger: 'change'}],
-          sick_type: [{required: true, message: "大病类别不能为空", trigger: 'change'}],
-          diagnosis: [{required: true, message: "诊断不能为空", trigger: 'change'}],
+          name: [{ required: true, message: '患者姓名不能为空', trigger: 'blur' }],
+          gender: [{ required: true, message: '患者性别不能为空', trigger: 'blur' }],
+          id_card: [{ required: true, message: '证件号码不能为空', trigger: 'blur' }],
+          register: [{ required: true, message: '请选择挂号类型', trigger: 'blur' }],
+          doctor: [{ required: true, message: '请选择医生', trigger: 'blur' }],
+          department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
+          age: [{ required: true, message: '患者年龄不能为空', trigger: 'blur' }],
+          birthday: [{ required: true, message: '患者出生日期不能为空', trigger: 'blur' }],
+          certificates: [{ required: true, message: '证件类型不能为空', trigger: 'change' }],
+          id_card_type: [{ required: true, message: '读卡类型不能为空', trigger: 'change' }],
+          p_type: [{ required: true, message: '处方类型不能为空', trigger: 'change' }],
+          sick_type: [{ required: true, message: '大病类别不能为空', trigger: 'change' }],
+          diagnosis: [{ required: true, message: '诊断不能为空', trigger: 'change' }]
         },
         visibility: false,
         labelPosition: 'right',
           medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: '',
-        },
+          social_type: ''
+        }
 
       }
     },
 
       },
       sick: Array,
-      diagnoses: Array,
+      diagnoses: Array
     },
     methods: {
       handleSelect(val) {
         this.form.birthday = uParseTime(val.birthday, '{y}-{m}-{d}')
         this.form.phone = val.phone
         this.form.id_card = val.id_card_no
-        var thisLen =  this.form.id_card.length;
-        var birth = "";
+        var thisLen = this.form.id_card.length
+        var birth = ''
         if (thisLen == 15) {
-          birth = "19" + this.form.id_card.substr(6, 6);
+          birth = '19' + this.form.id_card.substr(6, 6)
         } else {
-          birth = this.form.id_card.substr(6, 8);
+          birth = this.form.id_card.substr(6, 8)
         }
         var births =
-                birth.substr(0, 4) +
-                "-" +
-                birth.substr(4, 2) +
-                "-" +
-                birth.substr(6, 2);
-        this.form.age = jsGetAge(births, "-");
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+        this.form.age = jsGetAge(births, '-')
       },
       querySearchAsync(keyword, cb) {
         let key = ''
       reading(medicalInsuranceCard) {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error("请先选择读卡类型")
+          this.$message.error('请先选择读卡类型')
           return
         }
         let params = {
           'id_card_type': this.form.id_card_type,
-          'admin_user_id':this.$store.getters.xt_user.user.id,
+          'admin_user_id': this.$store.getters.xt_user.user.id
 
         }
         axios.get('http://127.0.0.1:9532/api/sscard', {
           params: params
         })
-          .then(function (response) {
+          .then(function(response) {
             if (response.data.state == 0) {
               that.$message.error(response.data.msg)
               return false
                 that.form.phone = patient.phone
                 that.form.idCard = patient.id_card_no
               }
-              that.$message({message: '读卡成功', type: 'success'})
+              that.$message({ message: '读卡成功', type: 'success' })
             }
           })
-          .catch(function (error) {
-
-          });
+          .catch(function(error) {
 
+          })
 
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      show: function () {
-        this.form = Object.assign({}, this.resetForm)
+      show: function() {
+        this.visibility = true
+        // this.form = Object.assign({}, this.resetForm)
+        this.form.id = 0
+        this.form.settlement_value = ''
+        this.form.medical_insurance_card = ''
+        this.form.name = ''
+        this.form.gender = ''
+        this.form.medical_care = ''
+        this.form.birthda = ''
+        this.form.age = ''
+        this.form.id_card = ''
+        this.form.register = ''
+        this.form.doctor = ''
+        this.form.department = ''
+        this.form.registration_fee = ''
+        this.form.medical_expenses = ''
+        this.form.cost = ''
+        this.form.phone = ''
+        this.form.social_type = ''
+
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id
         this.form.diagnosis = this.diagnoses[0].id
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
         // }
-        this.visibility = true
 
-      }, hide: function () {
+      }, hide: function() {
         this.visibility = false
         this.$refs['formValue'].resetFields()
-      }, cancel: function (formName) {
+      }, cancel: function(formName) {
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
       },
-      confirm: function (formName) {
+      confirm: function(formName) {
         this.$refs['formValue'].validate((valid) => {
           if (valid) {
             let value = {}
           }
         })
       },
-      getValue: function () {
+      getValue: function() {
         let form = {}
         form = this.form
         return form
 </script>
 
 <style lang="scss" scoped>
-  .registerDialog {
+    .registerDialog {
 
-  .el-form {
-    display: flex;
-    flex-wrap: wrap;
-  }
+    .el-form {
+        display: flex;
+        flex-wrap: wrap;
+    }
 
-  .el-form-item {
-    width: 50%;
-  }
+    .el-form-item {
+        width: 50%;
+    }
 
-  }
+    }
 </style>

src/xt_pages/outpatientCharges/costComparison.vue

                 <el-form :model="form" label-width="100px">
                     <el-form-item label="时间" label-width="100px">
                         <el-date-picker v-model="start_time" prefix-icon="el-icon-date"
-                                        @change="handleStartTimeChange" :editable="false" :clearable="false"
+                                        :editable="false" :clearable="false"
                                         style="width: 200px;" type="date" placeholder="选择开始日期"
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
                         -
 
                         <el-date-picker v-model="end_time" prefix-icon="el-icon-date"
-                                        @change="handleEndTimeChange" :editable="false" :clearable="false"
+                                       :editable="false" :clearable="false"
                                         style="width: 200px;margin-right:10px;" type="date" placeholder="选择结束日期"
                                         format="yyyy-MM-dd"
                                         value-format="yyyy-MM-dd"
                   that.$alert(result_desc, '对账结果', {
                     confirmButtonText: '确定',
                     callback: action => {
-                      this.dialogFormVisible = false
+                      that.dialogFormVisible = false
                     }
                   })
 

src/xt_pages/outpatientCharges/incomeStatistics.vue

           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
-          <el-select size="small" v-model="admin_user_id" placeholder="请选择" style="width:150px;margin-left:10px;" @change="changeDoctor">
-            <el-option
-              label="全部"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="(item,index) in type"
-              :key="index"
-              :label="item.user_name"
-              :value="item.admin_user_id">
-            </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="选择开始日期"
                           format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd"
                           align="right"></el-date-picker>
-          <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-          <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+          <el-radio v-model="radio" label="1" @change="changeType">汇总</el-radio>
+          <el-radio v-model="radio" label="2"  @change="changeType">明细</el-radio>
         </div>
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
       </div>
       <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row  v-if="radio == '1'">
         <el-table-column
           prop="date"
           label="序号"
         >
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">{{ scope.row.selt_time }}</template>
+          <template slot-scope="scope" >{{ scope.row.settle_accounts_date }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="总金额">
+          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医保统筹金额">
+          <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="大额基金金额">
+          <template slot-scope="scope">{{scope.row.hifob_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="大病基金金额">
+          <template slot-scope="scope">{{scope.row.hifmi_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="补充保险基金金额">
+          <template slot-scope="scope">{{scope.row.hifes_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医疗救助基金金额">
+          <template slot-scope="scope">{{scope.row.maf_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="公务员基金">
+          <template slot-scope="scope">{{scope.row.cvlserv_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付基金">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
         </el-table-column>
+        <el-table-column align="center" prop="name" label="折扣金额">
+          <template slot-scope="scope">{{scope.row.discount_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="优惠金额">
+          <template slot-scope="scope">{{scope.row.preferential_price}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人账户支付金额">
+          <template slot-scope="scope">{{scope.row.acct_pay}}</template>
+        </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="预交金">-->
+          <!--<template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>-->
+        <!--</el-table-column>-->
 
+        <!--<el-table-column align="center" prop="name" label="现金">-->
+          <!--<template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>-->
+        <!--</el-table-column>-->
 
-        <el-table-column align="center" prop="name" label="患者名字">
-          <template slot-scope="scope">{{ scope.row.psn_name }}</template>
-        </el-table-column>
-        <!--<el-table-column align="center" prop="name" label="患者类型">-->
-          <!--<template slot-scope="scope"></template>-->
+        <!--<el-table-column align="center" prop="name" label="微信">-->
+          <!--<template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>-->
         <!--</el-table-column>-->
-        <el-table-column align="center" prop="name" label="总金额">
-          <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
+
+        <!--<el-table-column align="center" prop="name" label="操作">-->
+          <!--<template slot-scope="scope">-->
+            <!--<el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
+      </el-table>
+
+      <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"  v-if="radio == '2'"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+        <el-table-column
+                prop="date"
+                label="序号"
+                width="60"
+                align="center"
+                type="index"
+        >
         </el-table-column>
 
+        <el-table-column align="center" prop="name" label="收费日期">
+          <template slot-scope="scope" >{{ scope.row.setl_time }}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="姓名">
+          <template slot-scope="scope" >{{ scope.row.psn_name }}</template>
+        </el-table-column>
         <el-table-column align="center" prop="name" label="总金额">
           <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
         </el-table-column>
+        <el-table-column align="center" prop="name" label="基金支付">
+          <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="个人支付基金">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
 
+        <el-table-column align="center" prop="name" label="床位费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'01')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="诊察费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'02')}}</template>
+        </el-table-column>
 
 
-        <el-table-column align="center" prop="name" label="实收金额">
-          <template slot-scope="scope">{{scope.row.reality_price}}</template>
+        <el-table-column align="center" prop="name" label="检查费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'03')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="科室">
-          <template slot-scope="scope">{{scope.row.p_info.department.name}}</template>
+
+        <el-table-column align="center" prop="name" label="化验费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'04')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope">  {{getTimes(scope.row.settle_accounts_date)}}</template>
+
+        <el-table-column align="center" prop="name" label="治疗费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'05')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="收费员">
-          <template slot-scope="scope">{{ scope.row.p_info.doctor }}</template>
+
+
+        <el-table-column align="center" prop="name" label="手术费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'06')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="状态">
-          <template slot-scope="scope">
-            <div v-if="scope.row.order_status == 1">待结算</div>
-            <div v-if="scope.row.order_status == 2">已结算</div>
-            <div v-if="scope.row.order_status == 3">已退费</div>
-          </template>
+
+        <el-table-column align="center" prop="name" label="护理费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'07')}}</template>
         </el-table-column>
-        <el-table-column align="center" prop="name" label="操作">
-          <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
-          </template>
+
+
+        <el-table-column align="center" prop="name" label="卫生材料费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'08')}}</template>
         </el-table-column>
+
+        <el-table-column align="center" prop="name" label="西药费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'09')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="中药饮片费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'10')}}</template>
+        </el-table-column>
+
+
+        <el-table-column align="center" prop="name" label="中成药费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'11')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="一般诊疗费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'12')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="挂号费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'13')}}</template>
+        </el-table-column>
+
+        <el-table-column align="center" prop="name" label="其他费">
+          <template slot-scope="scope">{{getPrice(scope.row.order_info,'14')}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="医保支付">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="现金">
+        <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="微信">
+        <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="支付宝">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+        <el-table-column align="center" prop="name" label="银行卡">
+          <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
+        </el-table-column>
+
       </el-table>
+
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
 
 <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
+  import { getIncomeStatisticsDataList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
 
   export default {
           { path: false, name: '项目消费明细汇总' }
         ],
         tableData: [],
+        radio:'1',
         limit:10,
         page:1,
         keywords:"",
       }
     },
     methods: {
+      getPrice(order_info, number){
+
+
+
+
+
+      },
+      changeType(val){
+
+        let params= {
+          page : this.page,
+          limit: this.limit,
+          keywords:this.keywords,
+          start_time:this.start_time,
+          end_time: this.end_time,
+          statistics_type: this.radio
+        }
+        getIncomeStatisticsDataList(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.tableData = response.data.data.list
+            this.total = response.data.data.total
+          }
+        })
+
+
+      },
       export_detail(){
         let params= {
           start_time:this.start_time,
       },  formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
-      changeDoctor(){
-        this.page = 1
-        this.keywords=""
-        this.getHisOrderList()
-      },
+
       handleSizeChange(limit){
         this.limit = limit;
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
       },handleCurrentChange(page){
         this.page = page;
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
 
       },
       handleStartTimeChange(){
         this.page = 1
         this.keywords=""
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
       },handleEndTimeChange(){
         this.page = 1
         this.keywords=""
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
       },
       searchAction(){
         this.page = 1
-        this.getHisOrderList()
+        this.getIncomeStatisticsDataList()
 
 
       },
           return uParseTime(value, temp)
         }
         return ''
-      },getHisOrderList(){
+      },getIncomeStatisticsDataList(){
         let params= {
           page : this.page,
           limit: this.limit,
           keywords:this.keywords,
           start_time:this.start_time,
           end_time: this.end_time,
-          type: this.admin_user_id
+          statistics_type: this.radio
         }
-        getHisOrderList(params).then(response => {
+        getIncomeStatisticsDataList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.tableData = response.data.data.order
+            this.tableData = response.data.data.list
             this.total = response.data.data.total
           }
         })
       }
     }, created() {
      this.getDoctorList()
-     this.getHisOrderList()
+     this.getIncomeStatisticsDataList()
 
 
     }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                             <template slot-scope="scope">{{scope.row.name}}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="就诊号" width="110">
-                            <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}
+                            <template slot-scope="scope">{{ scope.row.number?scope.row.number:''}}
                             </template>
                         </el-table-column>
                     </el-table>
                         </el-button>
 
                         <el-button
-                        v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"
-                        size="small" @click="open(11)" type="primary"
+                                v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671  || this.$store.getters.xt_user.org_id == 10106"
+                                size="small" @click="open(11)" type="primary"
                         >撤销明细
                         </el-button>
 
       }, chargeConfirm(form) {
 
         form['id'] = this.patientInfo.id
+        form['his_patient_id'] = this.hisPatientInfo.id
         form['record_time'] = this.record_date
         form['admin_user_id'] = this.$store.getters.xt_user.user.id
         form['order_id'] = this.order.id
                       let one_count = 0
                       let two_count = 0
                       let three_count = 0
+
                       for (let i = 0; i < response.data.data.list.length; i++) {
-                        that.all_table_data.push(response.data.data.list[i])
-                        if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+                        if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                          if (response.data.data.list[i].prescription.length > 0) {
+                            let obj = {
+                              id: response.data.data.list[i].id,
+                              name: response.data.data.list[i].name,
+                              number: '',
+                              order_status: 0,
+                              order_number: '',
+                              his_patient_id: 0
+                            }
+
+                            that.all_table_data.push(obj)
+                          }
+
+                        } else { //挂号
+                          if (response.data.data.list[i].his_patient.length == 1) {
+                            let obj = {
+                              id: response.data.data.list[i].id,
+                              name: response.data.data.list[i].name,
+                              number: response.data.data.list[i].his_patient[0].number,
+                              order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                              his_patient_id: response.data.data.list[i].his_patient[0].id,
+                              order_number: response.data.data.list[i].his_patient[0].order.number,
+                              order_id: response.data.data.list[i].his_patient[0].order.id
+                            }
+                            that.all_table_data.push(obj)
+
+                          }
+
+                          if (response.data.data.list[i].his_patient.length > 1) {
+                            for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                              let obj = {
+                                id: response.data.data.list[i].id,
+                                name: response.data.data.list[i].name,
+                                number: response.data.data.list[i].his_patient[b].number,
+                                order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                                his_patient_id: response.data.data.list[i].his_patient[b].id,
+                                order_number: response.data.data.list[i].his_patient[b].order.number,
+                                order_id: response.data.data.list[i].his_patient[b].order.id
+                              }
+                              that.all_table_data.push(obj)
+
+                            }
+                          }
+                        }
+
+                      }
+
+                      for (let i = 0; i < that.all_table_data.length; i++) {
+                        if (that.all_table_data[i].his_patient_id > 0) {
+                          that.hisPatientDatas.push(that.all_table_data[i])
+                        }
+                      }
+
+                      for (let i = 0; i < that.all_table_data.length; i++) {
+
+                        if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
                           one_count = one_count + 1
-                          that.patientTableData.push(response.data.data.list[i])
+                          that.patientTableData.push(that.all_table_data[i])
                         }
-                        if (response.data.data.list[i].order.order_status == 2) {
+                        if (that.all_table_data[i].order_status == 2) {
                           two_count = two_count + 1
-                          that.patientTableData.push(response.data.data.list[i])
+                          that.patientTableData.push(that.all_table_data[i])
                         }
                       }
-                      that.hisPatientDatas = response.data.data.list_two
                       that.cal_one = one_count
                       that.cal_two = two_count
                       that.cal_three = three_count
                       that.current_index = 0
 
                       for (let i = 0; i < that.patientTableData.length; i++) {
-                        if (this.patientTableData[i].id == this.patientInfo.id) {
+                        if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
                           that.$refs.tab.setCurrentRow(that.patientTableData[i])
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number, that.patientTableData[i].his_patient_id)
                         }
                       }
                       that.loadingone = false
                       let one_count = 0
                       let two_count = 0
                       let three_count = 0
+
                       for (let i = 0; i < response.data.data.list.length; i++) {
-                        that.all_table_data.push(response.data.data.list[i])
-                        if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+                        if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                          if (response.data.data.list[i].prescription.length > 0) {
+                            let obj = {
+                              id: response.data.data.list[i].id,
+                              name: response.data.data.list[i].name,
+                              number: '',
+                              order_status: 0,
+                              order_number: '',
+                              his_patient_id: 0
+                            }
+
+                            that.all_table_data.push(obj)
+                          }
+
+                        } else { //挂号
+                          if (response.data.data.list[i].his_patient.length == 1) {
+                            let obj = {
+                              id: response.data.data.list[i].id,
+                              name: response.data.data.list[i].name,
+                              number: response.data.data.list[i].his_patient[0].number,
+                              order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                              his_patient_id: response.data.data.list[i].his_patient[0].id,
+                              order_number: response.data.data.list[i].his_patient[0].order.number,
+                              order_id: response.data.data.list[i].his_patient[0].order.id
+                            }
+                            that.all_table_data.push(obj)
+
+                          }
+
+                          if (response.data.data.list[i].his_patient.length > 1) {
+                            for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                              let obj = {
+                                id: response.data.data.list[i].id,
+                                name: response.data.data.list[i].name,
+                                number: response.data.data.list[i].his_patient[b].number,
+                                order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                                his_patient_id: response.data.data.list[i].his_patient[b].id,
+                                order_number: response.data.data.list[i].his_patient[b].order.number,
+                                order_id: response.data.data.list[i].his_patient[b].order.id
+                              }
+                              that.all_table_data.push(obj)
+
+                            }
+                          }
+                        }
+
+                      }
+
+                      for (let i = 0; i < that.all_table_data.length; i++) {
+                        if (that.all_table_data[i].his_patient_id > 0) {
+                          that.hisPatientDatas.push(that.all_table_data[i])
+                        }
+                      }
+
+                      for (let i = 0; i < that.all_table_data.length; i++) {
+                        if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
                           one_count = one_count + 1
-                          that.patientTableData.push(response.data.data.list[i])
+                          that.patientTableData.push(that.all_table_data[i])
                         }
-                        if (response.data.data.list[i].order.order_status == 2) {
+                        if (that.all_table_data[i].order_status == 2) {
                           two_count = two_count + 1
-                          that.patientTableData.push(response.data.data.list[i])
+                          that.patientTableData.push(that.all_table_data[i])
                         }
                       }
-                      that.hisPatientDatas = response.data.data.list_two
+
                       that.cal_one = one_count
                       that.cal_two = two_count
                       that.cal_three = three_count
                       that.current_index = 0
 
                       for (let i = 0; i < that.patientTableData.length; i++) {
-                        if (this.patientTableData[i].id == this.patientInfo.id) {
+                        if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
                           that.$refs.tab.setCurrentRow(that.patientTableData[i])
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
                         }
                       }
                       that.$message({ message: '挂号成功', type: 'success' })
                       let one_count = 0
                       let two_count = 0
                       let three_count = 0
+
                       for (let i = 0; i < response.data.data.list.length; i++) {
-                        that.all_table_data.push(response.data.data.list[i])
-                        if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+                        if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                          if (response.data.data.list[i].prescription.length > 0) {
+                            let obj = {
+                              id: response.data.data.list[i].id,
+                              name: response.data.data.list[i].name,
+                              number: '',
+                              order_status: 0,
+                              order_number: '',
+                              his_patient_id: 0
+                            }
+
+                            that.all_table_data.push(obj)
+                          }
+
+                        } else { //挂号
+                          if (response.data.data.list[i].his_patient.length == 1) {
+                            let obj = {
+                              id: response.data.data.list[i].id,
+                              name: response.data.data.list[i].name,
+                              number: response.data.data.list[i].his_patient[0].number,
+                              order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                              his_patient_id: response.data.data.list[i].his_patient[0].id,
+                              order_number: response.data.data.list[i].his_patient[0].order.number,
+                              order_id: response.data.data.list[i].his_patient[0].order.id
+                            }
+                            that.all_table_data.push(obj)
+
+                          }
+
+                          if (response.data.data.list[i].his_patient.length > 1) {
+                            for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                              let obj = {
+                                id: response.data.data.list[i].id,
+                                name: response.data.data.list[i].name,
+                                number: response.data.data.list[i].his_patient[b].number,
+                                order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                                his_patient_id: response.data.data.list[i].his_patient[b].id,
+                                order_number: response.data.data.list[i].his_patient[b].order.number,
+                                order_id: response.data.data.list[i].his_patient[b].order.id
+                              }
+                              that.all_table_data.push(obj)
+
+                            }
+                          }
+                        }
+
+                      }
+
+                      for (let i = 0; i < that.all_table_data.length; i++) {
+                        if (that.all_table_data[i].his_patient_id > 0) {
+                          that.hisPatientDatas.push(this.all_table_data[i])
+                        }
+                      }
+
+                      for (let i = 0; i < that.all_table_data.length; i++) {
+                        if (that.all_table_data[i].order_status == 0 || that.all_table_data[i].order_status == 1 || that.all_table_data[i].order_status == 3) {
                           one_count = one_count + 1
-                          that.patientTableData.push(response.data.data.list[i])
+                          that.patientTableData.push(that.all_table_data[i])
                         }
-                        if (response.data.data.list[i].order.order_status == 2) {
+                        if (that.all_table_data[i].order_status == 2) {
                           two_count = two_count + 1
-                          that.patientTableData.push(response.data.data.list[i])
+                          that.patientTableData.push(that.all_table_data[i])
                         }
                       }
-                      that.hisPatientDatas = response.data.data.list_two
                       that.cal_one = one_count
                       that.cal_two = two_count
                       that.cal_three = three_count
                       that.current_index = 0
                       for (let i = 0; i < that.patientTableData.length; i++) {
-                        if (this.patientTableData[i].id == this.patientInfo.id) {
+                        if (that.patientTableData[i].his_patient_id == that.hisPatientInfo.id) {
                           that.$refs.tab.setCurrentRow(that.patientTableData[i])
-                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order.number)
+                          that.getPatientInformation(that.patientTableData[i].id, that.patientTableData[i].order_number, that.patientTableData[i].his_patient_id)
                         }
                       }
                       var his_info = response.data.data.his_info
                       that.hisPatientInfo = his_info
-
                     }
-
                   })
                 }
               }
             let one_count = 0
             let two_count = 0
             let three_count = 0
+
             for (let i = 0; i < response.data.data.list.length; i++) {
-              this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
-                one_count = one_count + 1
+              if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                if (response.data.data.list[i].prescription.length > 0) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: '',
+                    order_status: 0,
+                    order_number: '',
+                    his_patient_id: 0
+                  }
+
+                  this.all_table_data.push(obj)
+                }
+
+              } else { //挂号
+                if (response.data.data.list[i].his_patient.length == 1) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: response.data.data.list[i].his_patient[0].number,
+                    order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                    his_patient_id: response.data.data.list[i].his_patient[0].id,
+                    order_number: response.data.data.list[i].his_patient[0].order.number,
+                    order_id: response.data.data.list[i].his_patient[0].order.id
+                  }
+                  this.all_table_data.push(obj)
+
+                }
+
+                if (response.data.data.list[i].his_patient.length > 1) {
+                  for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                    let obj = {
+                      id: response.data.data.list[i].id,
+                      name: response.data.data.list[i].name,
+                      number: response.data.data.list[i].his_patient[b].number,
+                      order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                      his_patient_id: response.data.data.list[i].his_patient[b].id,
+                      order_number: response.data.data.list[i].his_patient[b].order.number,
+                      order_id: response.data.data.list[i].his_patient[b].order.id
+                    }
+                    this.all_table_data.push(obj)
+
+                  }
+                }
               }
 
-              if (response.data.data.list[i].order.order_status == 2) {
-                two_count = two_count + 1
+            }
+
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].his_patient_id > 0) {
+                this.hisPatientDatas.push(this.all_table_data[i])
               }
+            }
 
-              // if (response.data.data.list[i].order.order_status == 3) {
-              //   three_count = three_count + 1
-              // }
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
+                one_count = one_count + 1
+              }
+              if (this.all_table_data[i].order_status == 2) {
+                two_count = two_count + 1
+              }
             }
 
             switch (this.radio) {
                 this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
+                  if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
               case 2:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 2) {
+                  if (this.all_table_data[i].order_status == 2) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
 
-                  if (this.all_table_data[i].order.order_status == 3) {
+                  if (this.all_table_data[i].order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
 
             }
 
-            this.hisPatientDatas = response.data.data.list_two
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = three_count
 
             if (this.patientTableData.length > 0) {
               for (let i = 0; i < this.patientTableData.length; i++) {
-                if (this.patientTableData[i].id == this.patientInfo.id) {
+                if (this.patientTableData[i].his_patient_id == this.hisPatientInfo.id) {
                   this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
+                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id)
                 }
               }
             }
             let two_count = 0
             let three_count = 0
 
-            for (let i = 0; i < response.data.data.list_two.length; i++) {
-              this.hisPatientDatas.push(response.data.data.list_two[i])
-              if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1 || response.data.data.list_two[i].order.order_status == 3) {
-                one_count = one_count + 1
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                if (response.data.data.list[i].prescription.length > 0) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: '',
+                    order_status: 0,
+                    order_number: '',
+                    his_patient_id: 0
+                  }
+
+                  this.all_table_data.push(obj)
+                }
+
+              } else { //挂号
+                if (response.data.data.list[i].his_patient.length == 1) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: response.data.data.list[i].his_patient[0].number,
+                    order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                    his_patient_id: response.data.data.list[i].his_patient[0].id,
+                    order_number: response.data.data.list[i].his_patient[0].order.number,
+                    order_id: response.data.data.list[i].his_patient[0].order.id
+                  }
+                  this.all_table_data.push(obj)
+
+                }
+
+                if (response.data.data.list[i].his_patient.length > 1) {
+                  for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                    let obj = {
+                      id: response.data.data.list[i].id,
+                      name: response.data.data.list[i].name,
+                      number: response.data.data.list[i].his_patient[b].number,
+                      order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                      his_patient_id: response.data.data.list[i].his_patient[b].id,
+                      order_number: response.data.data.list[i].his_patient[b].order.number,
+                      order_id: response.data.data.list[i].his_patient[b].order.id
+                    }
+                    this.all_table_data.push(obj)
+
+                  }
+                }
               }
 
-              if (response.data.data.list_two[i].order.order_status == 2) {
-                two_count = two_count + 1
+            }
+
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].his_patient_id > 0) {
+                this.hisPatientDatas.push(this.all_table_data[i])
               }
+            }
 
-              // if (response.data.data.list_two[i].order.order_status == 3) {
-              //   three_count = three_count + 1
-              // }
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
+                one_count = one_count + 1
+              }
+              if (this.all_table_data[i].order_status == 2) {
+                two_count = two_count + 1
+              }
             }
+
             switch (this.radio) {
               case 1:
                 this.patientTableData = []
 
                 for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1 || this.hisPatientDatas[i].order.order_status == 3) {
+                  if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1 || this.hisPatientDatas[i].order_status == 3) {
                     this.patientTableData.push(this.hisPatientDatas[i])
                   }
 
               case 2:
                 this.patientTableData = []
                 for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                  if (this.hisPatientDatas[i].order.order_status == 2) {
+                  if (this.hisPatientDatas[i].order_status == 2) {
                     this.patientTableData.push(this.hisPatientDatas[i])
                   }
 
 
             if (this.patientTableData.length > 0) {
               for (let i = 0; i < this.patientTableData.length; i++) {
-                if (this.patientTableData[i].id == this.patientInfo.id) {
+                if (this.patientTableData[i].his_patient_id == this.hisPatientInfo.id) {
                   this.$refs.tab.setCurrentRow(this.patientTableData[i])
-                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order.number)
+                  this.getPatientInformation(this.patientTableData[i].id, this.patientTableData[i].order_number, this.patientTableData[i].his_patient_id)
                 }
               }
             }
             type: 'warning'
           }).then(() => {
             let params = {
+              'id': this.hisPatientInfo.id,
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date,
               'org_id': this.$store.getters.xt_user.org_id,
             let two_count = 0
             let three_count = 0
 
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                if (response.data.data.list[i].prescription.length > 0) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: '',
+                    order_status: 0,
+                    his_patient_id: 0
+                  }
+
+                  this.all_table_data.push(obj)
+                }
+
+              } else { //挂号
+                if (response.data.data.list[i].his_patient.length == 1) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: response.data.data.list[i].his_patient[0].number,
+                    order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                    his_patient_id: response.data.data.list[i].his_patient[0].id
+                  }
+                  this.all_table_data.push(obj)
+
+                }
+
+                if (response.data.data.list[i].his_patient.length > 1) {
+                  for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                    let obj = {
+                      id: response.data.data.list[i].id,
+                      name: response.data.data.list[i].name,
+                      number: response.data.data.list[i].his_patient[b].number,
+                      order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                      his_patient_id: response.data.data.list[i].his_patient[b].id
+                    }
+                    this.all_table_data.push(obj)
+
+                  }
+                }
+              }
+
+            }
+
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].his_patient_id > 0) {
+                this.hisPatientDatas.push(this.all_table_data[i])
+              }
+            }
+
+            console.log(this.hisPatientDatas)
+            console.log(this.all_table_data)
+
             if (this.activeName == 'first') { //日结
 
-              for (let i = 0; i < response.data.data.list.length; i++) {
-                this.all_table_data.push(response.data.data.list[i])
-                if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
+              for (let i = 0; i < this.all_table_data.length; i++) {
+                if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
                   one_count = one_count + 1
                 }
-
-                if (response.data.data.list[i].order.order_status == 2) {
+                if (this.all_table_data[i].order_status == 2) {
                   two_count = two_count + 1
                 }
-
-                // if (response.data.data.list[i].order.order_status == 3) {
-                //   three_count = three_count + 1
-                // }
               }
 
+              console.log(one_count)
+              console.log(two_count)
+
             } else { //月结
 
-              for (let i = 0; i < response.data.data.list_two.length; i++) {
-                this.hisPatientDatas.push(response.data.data.list_two[i])
-                if (response.data.data.list_two[i].order.order_status == 0 || response.data.data.list_two[i].order.order_status == 1) {
+              for (let i = 0; i < this.hisPatientDatas.length; i++) {
+                if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1) {
                   one_count = one_count + 1
                 }
 
-                if (response.data.data.list_two[i].order.order_status == 2) {
+                if (this.hisPatientDatas[i].order_status == 2) {
                   two_count = two_count + 1
                 }
 
-                if (response.data.data.list_two[i].order.order_status == 3) {
-                  three_count = three_count + 1
-                }
+                console.log(one_count)
+                console.log(two_count)
+                // if (this.hisPatientDatas[i].order_status == 3) {
+                //   three_count = three_count + 1
+                // }
               }
 
             }
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = three_count
-
+            console.log(this.cal_one)
+            console.log(this.cal_two)
             switch (temp_id) {
 
               case 1:
                 if (this.activeName == 'first') {
 
                   for (let i = 0; i < this.all_table_data.length; i++) {
-                    if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1) {
+                    if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1) {
                       this.patientTableData.push(this.all_table_data[i])
                     }
 
 
                 } else {
                   for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                    if (this.hisPatientDatas[i].order.order_status == 0 || this.hisPatientDatas[i].order.order_status == 1) {
+                    if (this.hisPatientDatas[i].order_status == 0 || this.hisPatientDatas[i].order_status == 1) {
                       this.patientTableData.push(this.hisPatientDatas[i])
                     }
-
                   }
-
                 }
 
                 break
               case 2:
                 this.patientTableData = []
                 if (this.activeName == 'first') {
-
                   for (let i = 0; i < this.all_table_data.length; i++) {
-                    if (this.all_table_data[i].order.order_status == 2) {
+                    if (this.all_table_data[i].order_status == 2) {
                       this.patientTableData.push(this.all_table_data[i])
                     }
-
                   }
                 } else {
                   for (let i = 0; i < this.hisPatientDatas.length; i++) {
-                    if (this.hisPatientDatas[i].order.order_status == 2) {
+                    if (this.hisPatientDatas[i].order_status == 2) {
                       this.patientTableData.push(this.hisPatientDatas[i])
                     }
                   }
                 break
               case 3:
                 this.patientTableData = []
-
                 if (this.activeName == 'first') {
-
                   for (let i = 0; i < this.all_table_data.length; i++) {
-
-                    if (this.all_table_data[i].order.order_status == 3) {
+                    if (this.all_table_data[i].order_status == 3) {
                       this.patientTableData.push(this.all_table_data[i])
                     }
-
                   }
                 } else {
-
                   for (let i = 0; i < this.hisPatientDatas.length; i++) {
-
-                    if (this.hisPatientDatas[i].order.order_status == 3) {
+                    if (this.hisPatientDatas[i].order_status == 3) {
                       this.patientTableData.push(this.hisPatientDatas[i])
                     }
-
                   }
-
                 }
                 break
               case 4:
                 this.patientTableData = []
                 if (this.activeName == 'first') {
-
                   this.patientTableData = this.all_table_data
                 } else {
-
                   this.patientTableData = this.hisPatientDatas
                 }
                 break
 
             this.current_index = 0
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
+            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id)
 
           }
         })
             let one_count = 0
             let two_count = 0
             let three_count = 0
+
             for (let i = 0; i < response.data.data.list.length; i++) {
-              this.all_table_data.push(response.data.data.list[i])
-              if (response.data.data.list[i].order.order_status == 0 || response.data.data.list[i].order.order_status == 1 || response.data.data.list[i].order.order_status == 3) {
-                one_count = one_count + 1
+              if (response.data.data.list[i].his_patient.length == 0) { //没挂号
+                if (response.data.data.list[i].prescription.length > 0) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: '',
+                    order_status: 0,
+                    order_number: '',
+                    his_patient_id: 0
+                  }
+
+                  this.all_table_data.push(obj)
+                }
+
+              } else { //挂号
+                if (response.data.data.list[i].his_patient.length == 1) {
+                  let obj = {
+                    id: response.data.data.list[i].id,
+                    name: response.data.data.list[i].name,
+                    number: response.data.data.list[i].his_patient[0].number,
+                    order_status: response.data.data.list[i].his_patient[0].order.order_status,
+                    his_patient_id: response.data.data.list[i].his_patient[0].id,
+                    order_number: response.data.data.list[i].his_patient[0].order.number,
+                    order_id: response.data.data.list[i].his_patient[0].order.id
+                  }
+                  this.all_table_data.push(obj)
+
+                }
+
+                if (response.data.data.list[i].his_patient.length > 1) {
+                  for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
+                    let obj = {
+                      id: response.data.data.list[i].id,
+                      name: response.data.data.list[i].name,
+                      number: response.data.data.list[i].his_patient[b].number,
+                      order_status: response.data.data.list[i].his_patient[b].order.order_status,
+                      his_patient_id: response.data.data.list[i].his_patient[b].id,
+                      order_number: response.data.data.list[i].his_patient[b].order.number,
+                      order_id: response.data.data.list[i].his_patient[b].order.id
+                    }
+                    this.all_table_data.push(obj)
+
+                  }
+                }
               }
 
-              if (response.data.data.list[i].order.order_status == 2) {
-                two_count = two_count + 1
+            }
+
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].his_patient_id > 0) {
+                this.hisPatientDatas.push(this.all_table_data[i])
               }
+            }
+
+            console.log(this.all_table_data)
+            console.log(this.hisPatientDatas)
 
-              // if (response.data.data.list[i].order.order_status == 3) {
-              //   three_count = three_count + 1
-              // }
+            for (let i = 0; i < this.all_table_data.length; i++) {
+              if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
+                one_count = one_count + 1
+              }
+              if (this.all_table_data[i].order_status == 2) {
+                two_count = two_count + 1
+              }
             }
 
             switch (this.radio) {
-
               case 1:
                 this.patientTableData = []
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 0 || this.all_table_data[i].order.order_status == 1 || this.all_table_data[i].order.order_status == 3) {
+                  if (this.all_table_data[i].order_status == 0 || this.all_table_data[i].order_status == 1 || this.all_table_data[i].order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
               case 2:
                 this.patientTableData = []
                 for (let i = 0; i < this.all_table_data.length; i++) {
-                  if (this.all_table_data[i].order.order_status == 2) {
+                  if (this.all_table_data[i].order_status == 2) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
 
                 for (let i = 0; i < this.all_table_data.length; i++) {
 
-                  if (this.all_table_data[i].order.order_status == 3) {
+                  if (this.all_table_data[i].order_status == 3) {
                     this.patientTableData.push(this.all_table_data[i])
                   }
 
                 this.patientTableData = []
                 this.patientTableData = this.all_table_data
                 break
-
             }
 
-            this.hisPatientDatas = response.data.data.list_two
             this.cal_one = one_count
             this.cal_two = two_count
             this.cal_three = three_count
             this.current_index = 0
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
-            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order.number)
+            this.getPatientInformation(this.patientTableData[0].id, this.patientTableData[0].order_number, this.patientTableData[0].his_patient_id)
 
           }
         })
         this.prescriptions = []
         this.month_prescriptions = []
 
-        this.getPatientInformation(val.id, val.order.number)
+        this.getPatientInformation(val.id, val.order_number, val.his_patient_id)
         this.patient_id = val.id
 
         for (let i = 0; i < this.patientTableData.length; i++) {
-          if (this.patientTableData[i].id == val.id) {
+          if (this.patientTableData[i].his_patient_id == val.his_patient_id) {
             this.current_index = i
           }
 
         }
 
       },
-
       //获取患者的基本信息
-      getPatientInformation(id, batch_number) {
-
+      getPatientInformation(id, batch_number, his_patient_id) {
         let params = {
           'record_date': this.record_date,
           'patient_id': id,
+          'his_patient_id': his_patient_id,
           'number': batch_number,
           'start_time': this.other_start_time,
           'end_time': this.other_end_time,
 
         }
         this.loading = true
-
         getChargeHisPatientInfo(params).then(response => {
           if (response.data.state == 0) {
             this.loading = false
             this.month_prescriptions = []
             this.curPrescriptions = {}
             this.curMonthPrescriptions = {}
-
             this.loading = false
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.info = response.data.data.info
             this.order = response.data.data.order
-
             this.p_type = ''
             this.sick_type = ''
             this.diagnosis = ''
             this.sick_history = ''
-
             if (this.info.id > 0) {
               this.p_type = this.info.register_type
               this.sick_type = this.info.sick_type
               if (this.info.diagnosis == 0) {
                 this.diagnosis = ''
               }
-
             } else {
               this.p_type = ''
               this.sick_type = ''
               this.diagnosis = ''
               this.sick_history = ''
-
             }
             this.addtions_charge = response.data.data.addtions_charge
             this.setMonthPrescription(response.data.data.month_prescriptions)
             } else {
               this.prescription_id = 0
             }
-
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]
               let tempAdvice = []
               'patient_id': this.patientInfo.id,
               'record_time': this.record_date,
               'settle_accounts_type': this.settle_accounts_type,
-              'admin_user_id': this.$store.getters.xt_user.user.id
+              'admin_user_id': this.$store.getters.xt_user.user.id,
+              'his_patient_id': this.hisPatientInfo.id
             }
             axios.get('http://127.0.0.1:9532/sz/api/upload/get', {
               params: params,
                 params: {
                   order_id: this.order.id,
                   record_time: this.record_date,
+                  his_patient_id: this.hisPatientInfo.id,
                   admin_user_id: this.$store.getters.xt_user.user.id,
                   patient_id: this.patientInfo.id
                 }

src/xt_pages/outpatientCharges/summary.vue

                     <template slot-scope="scope">
                         <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
                         <el-button size="mini" type="primary" @click="toPrint(scope.row)"
-                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
+                                   v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || ($store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4)">
                             结算单
                         </el-button>
                         <el-button size="mini" type="primary" @click="toRefund(scope.row)" v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106)">

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 
       },
       openLast(val) {
-        if (this.curPrescriptions.order_status == 2) {
-          this.$message.error('处方已经结算,无法添加')
-          return
-        }
+        // if (this.curPrescriptions.order_status == 2) {
+        //   this.$message.error('处方已经结算,无法添加')
+        //   return
+        // }
         if (this.patientInfo.id == 0) {
           this.$message.error('请选择患者')
           return
         }
       },
       openNext(val) {
-        if (this.curPrescriptions.order_status == 2) {
-          this.$message.error('处方已经结算,无法添加')
-          return
-        }
+        // if (this.curPrescriptions.order_status == 2) {
+        //   this.$message.error('处方已经结算,无法添加')
+        //   return
+        // }
         if (this.patientInfo.id == 0) {
           this.$message.error('请选择患者')
           return
             this.$emit('event1', this.prescription_id)
             this.curPrescriptions = this.prescriptions[i]
 
+
+
             this.teamList = []
             this.curDrugs = []
             this.$refs.multipleTable.clearSelection()
           }
 
         }
+        if (this.curPrescriptions.order_status == 0) {
+          this.order_status = ''
+        }
+
+        if (this.curPrescriptions.order_status == 1) {
+          this.order_status = '未收费'
+        }
+        if (this.curPrescriptions.order_status == 2) {
+          this.order_status = '已结算'
+        }
+
+        if (this.curPrescriptions.order_status == 3) {
+          this.order_status = '已退费'
+        }
+
+
+
 
       },
       clearData() {
           this.state2 = ''
         }
 
-        if (info.prescription_status == 0) {
+        console.log(this.curPrescriptions)
+
+        if (this.curPrescriptions.order_status == 0) {
           this.order_status = ''
         }
 
-        if (info.prescription_status == 1 || info.prescription_status == 2) {
+        if (this.curPrescriptions.order_status == 1) {
           this.order_status = '未收费'
         }
-        if (info.prescription_status == 3) {
+        if (this.curPrescriptions.order_status == 2) {
           this.order_status = '已结算'
         }
 
-        if (info.prescription_status == 4) {
+        if (this.curPrescriptions.order_status == 3) {
           this.order_status = '已退费'
         }
 
         }
       }, open_two() {
         if (this.dayorMonth == 'day') {
-          if (this.curPrescriptions.order_status == 2) {
-            this.$message.error('处方已经结算,无法添加')
-            return
-          }
           if (this.patientInfo == null || this.patientInfo.id == 0) {
             this.$message.error('请选择患者')
             return
         }
 
         if (this.dayorMonth == 'day') {
-          if (this.curPrescriptions.order_status == 2) {
-            this.$message.error('当前处方已经结算,无法保存')
-            return
-          }
+
           if (this.doctorValue.length <= 0) {
             this.$message.error('医生不能为空')
             return
           }
         } else if (this.dayorMonth == 'month') {
           if (this.isShowDayPrescription) {
-            if (this.curDayPrescriptions.order_status == 2) {
-              this.$message.error('当前处方已经结算,无法保存')
-              return
-            }
+            // if (this.curDayPrescriptions.order_status == 2) {
+            //   this.$message.error('当前处方已经结算,无法保存')
+            //   return
+            // }
             if (this.doctorValue.length <= 0) {
               this.$message.error('医生不能为空')
               return
         }
       },
       addTab(targetName) {
-        if (this.curPrescriptions.order_status == 2) {
-          this.$message.error('该处方已经结算或者退费，无法继续添加处方')
-          return
-        }
+        // if (this.curPrescriptions.order_status == 2) {
+        //   this.$message.error('该处方已经结算或者退费，无法继续添加处方')
+        //   return
+        // }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           this.$message.error('当前处方无数据，新增数据后才能新增处方')
           return
         this.editableTabsValue = newTabName
         this.curPrescriptions = this.prescriptions[this.prescriptions.length - 1]
         this.curStatus = 0
+
+
+
+        if (this.curPrescriptions.order_status == 0) {
+          this.order_status = '未收费'
+        }
+
+        if (this.curPrescriptions.order_status == 1 ) {
+          this.order_status = '未收费'
+        }
+        if (this.curPrescriptions.order_status == 2) {
+          this.order_status = '已结算'
+        }
+
+        if (this.curPrescriptions.order_status == 3) {
+          this.order_status = '已退费'
+        }
+
+
+
       },
       removeTab(targetName) {
         if (this.curPrescriptions.order_status == 2) {
         console.log("222222222222",this.curPrescriptions)
 
 
-        if (this.curPrescriptions.order_status == 2) {
-          this.$message.error('该处方已经结算，无法继续添加药品或者项目')
-          this.teamList = []
-          this.curDrugs = []
-          this.tempDrugs = []
-          this.$refs.tables.clearSelection()
-          this.$refs.multipleTableTwo.clearSelection()
-          this.$refs.multipleTable.clearSelection()
-          return
-        }
+        // if (this.curPrescriptions.order_status == 2) {
+        //   this.$message.error('该处方已经结算，无法继续添加药品或者项目')
+        //   this.teamList = []
+        //   this.curDrugs = []
+        //   this.tempDrugs = []
+        //   this.$refs.tables.clearSelection()
+        //   this.$refs.multipleTableTwo.clearSelection()
+        //   this.$refs.multipleTable.clearSelection()
+        //   return
+        // }
 
         if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')

src/xt_pages/outpatientRegistration/registrationHistory.vue

   import { getDictionaryDataConfig } from '@/utils/data'
   import axios from 'axios'
 
+
   export default {
     components: {
       BreadCrumb
           let params = {
             'id':row.id,
             'patient_id': row.patient_id,
-            'record_time': row.record_date,
+            'record_time': that.getTimes(row.record_date),
             'admin_user_id': this.$store.getters.xt_user.user.id
           }
           axios.get('http://127.0.0.1:9532/api/refundnumber/post', {
         })
           .catch(() => {
           })
+      }, getTimes(time) {
+        return uParseTime(time, '{y}-{m}-{d}')
       },
 
       querySearchAsync(keyword, cb) {