Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/store/getters.js

   selected_date: state => state.xt_user.selected_date,
   search_mode: state => state.xt_user.search_mode,
   search_value: state => state.xt_user.search_value,
-
   xt_role_temps: state => state.xt_role_temps,
 
+  insuplc_admdvs: state => state.global_config.insuplc_admdvs,
   patient_types: state => state.global_config.patient_types,
   partitions: state => state.global_config.partitions,
   marital_options: state => state.global_config.marital_options,

src/store/index.js

 import xt_permission from './modules/xt_permission'
 import xt_role_temps from './modules/role_temps'
 import global_config from './modules/globalConfig'
+import insuplcAdmdvs_config from './modules/in'
+
 
 import getters from './getters'
 import data from './modules/data'
     xt_role_temps,
     global_config,
     temp_params,
-    pagedata
+    pagedata,
+    insuplcAdmdvs_config
   },
   getters
 

src/xt_pages/outpatientCharges/components/registerDialog.vue

       </el-form-item>
 
 
-      <el-form-item label="参保地：">
+      <el-form-item label="参保地：" v-if="this.$store.getters.xt_user.org.id != 10721  && this.$store.getters.xt_user.org.id != 0">
         <el-select v-model="form.insuplc_admdvs" placeholder="请选择" style="width:100%;">
           <el-option
               v-for="item in InsuplcAdmdvs"
       </el-form-item>
 
 
+      <el-form-item label="参保地：" v-if="this.$store.getters.xt_user.org.id == 10721 || this.$store.getters.xt_user.org.id == 0">
+
+        <el-select
+          v-model="form.insuplc_admdvs"
+          multiple
+          filterable
+          remote
+          reserve-keyword
+          placeholder="请选择"
+          :remote-method="remoteMethod"
+          :loading="loading">
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label+'(' + item.value + ')'"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+
 
       <el-form-item label="结算类型：">
         <el-select v-model="form.settlement_value" placeholder="请选择" style="width:100%;">
           // { value: 16, label: '门诊慢性病' },
           // { value: 21, label: '普通住院' }
         ],
+        loading:false,
         medical_care: [
           { value: 11, label: '普通门诊' },
           { value: 12, label: '家庭通道' },
           // sick_type: [{ required: true, message: '大病类别不能为空', trigger: 'change' }],
           // diagnosis: [{ required: true, message: '诊断不能为空', trigger: 'change' }]
         },
+        list:[],
+        options:[],
         visibility: false,
         labelPosition: 'right',
         isClose: false,
           phone: '',
           social_type: '',
           doctor_number:"",
-        }
 
+        }
       }
     },
     props: {
       },
       sick: Array,
       diagnoses: Array
+
+
     },
     methods: {
+      remoteMethod(query) {
+        if (query !== '') {
+          this.loading = true;
+          setTimeout(() => {
+            this.loading = false;
+            this.options = this.list.filter(item => {
+              return item.label.toLowerCase()
+                .indexOf(query.toLowerCase()) > -1 || item.value.toLowerCase()
+                .indexOf(query.toLowerCase()) > -1;
+            });
+          }, 200);
+        } else {
+          this.options = [];
+        }
+      },
       checkID(){
         this.$alert(this.form.psn_desc, '身份类型', {
           confirmButtonText: '确定',
                   }).catch(() => {
                   })
                 } else {
-
                   for(let i =0; i < response.data.data.info.output.insuinfo.length; i++){
                     that.InsuplcAdmdvs.push({
                       value:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
                       label:response.data.data.info.output.insuinfo[i].insuplc_admdvs,
                     })
-
                   }
-
-
                   that.form.social_type = parseInt(response.data.data.insutype)
                 }
               }
         return getDictionaryDataConfig(module, filed_name)
       },
       show: function(doctors,departments) {
+      console.log(this.$store.getters.insuplc_admdvs)
+       this.options =  this.$store.getters.insuplc_admdvs
+        console.log(this.options)
+        this.list =  this.$store.getters.insuplc_admdvs
+        console.log(this.list)
+
         this.visibility = true
         // this.form = Object.assign({}, this.resetForm)
         this.form.id = 0
 
       },
 
+
+      showTwo: function(doctors,departments,info,patient_info,insutype) {
+        console.log(this.$store.getters.insuplc_admdvs)
+        this.options =  this.$store.getters.insuplc_admdvs
+        console.log(this.options)
+        this.list =  this.$store.getters.insuplc_admdvs
+        console.log(this.list)
+
+        this.visibility = true
+        // this.form = Object.assign({}, this.resetForm)
+        this.form.id = 0
+        this.form.settlement_value = 1
+        this.form.medical_insurance_card = ''
+        this.form.name = ''
+        this.form.gender = ''
+        this.form.mdtrt_type=''
+        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.insuplc_admdvs =''
+
+        this.form.p_type = 14
+        this.form.sick_type = this.sick[0].id
+        this.form.diagnosis = this.diagnoses[0].id
+        this.form.id_card_type = 2
+        this.form.certificates = 1
+        if (this.$store.getters.xt_user.org_id == 10188  || this.$store.getters.xt_user.org_id == 10217 || this.$store.getters.xt_user.org_id == 10191){
+          this.form.id_card_type = 1
+        }
+        if (departments.length > 0) {
+          this.form.department = departments[0].id
+        }
+        console.log("11231231231223233432423dddd312")
+        if (doctors.length > 0) {
+          if(this.$store.getters.xt_user.org_id == 10318 || this.$store.getters.xt_user.org_id == 0){
+            console.log("~~~~~~~")
+            this.form.doctor = 3127
+
+          }else{
+            this.form.doctor = doctors[0].admin_user_id
+          }
+        }else{
+          this.form.doctor = 3127
+        }
+
+        this.form.social_type = insutype
+        var temp_insuplc_admdvs = ""
+        for(let i =0; i < info.output.insuinfo.length; i++){
+          //险种一致，且参保没过期
+          if(insutype == info.output.insuinfo[i].insutype && info.output.insuinfo[i].psn_insu_stas == 1)
+          temp_insuplc_admdvs = info.output.insuinfo[i].insuplc_admdvs
+        }
+        this.form.insuplc_admdvs = temp_insuplc_admdvs
+        this.form.id = patient_info.id
+        this.form.name = patient_info.name
+        this.form.gender = patient_info.gender
+        this.form.birthday = uParseTime(patient_info.birthday, '{y}-{m}-{d}')
+        this.form.phone = patient_info.phone
+        this.form.id_card = patient_info.id_card_no
+        var thisLen = this.form.id_card.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + this.form.id_card.substr(6, 6)
+        } else {
+          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, '-')
+      },
+
+
       hide: function () {
         this.visibility = false
         this.$refs['formValue'].resetFields()

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           </el-radio-group>
         </div>
 
+
         <div class="mainCell" v-if="this.org_id == 10191">
           <el-radio-group v-model="sch_type" @change="changeScheduleType">
             <el-radio :label="1">上午</el-radio>
                               type="primary"
                             >修改医疗类型
                             </el-button>
+
+                              <el-select style="margin-right:5px;width:300px;"
+                                         v-model="item.diagnoses" multiple placeholder="诊断">
+                                <el-option
+                                  v-for="(item,index) in diagnoses"
+                                  :key="index"
+                                  :label="item.class_name"
+                                  :value="item.id">
+                                </el-option>
+                              </el-select>
+
                             <div style="margin-bottom:10px;float: right">
                               <div>
-
                                 <el-button
                                   v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
                                   size="small"
-                                  @click="open(50,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  @click="open(50,items.med_type,items.prescriptions[0].order,items.prescriptions,item.diagnoses)"
                                   type="primary"
                                 >读电子凭证
                                 </el-button>
                                 <el-button
                                   v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0  && org_id != 10340)"
                                   size="small"
-                                  @click="open(55,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  @click="open(55,items.med_type,items.prescriptions[0].order,items.prescriptions,item.diagnoses)"
                                   type="primary"
                                 >人脸识别
                                 </el-button>
                                 <el-button
                                   v-if="(hisPatientInfo.id_card_type != 3  && hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0 && org_id != 10340)"
                                   size="small"
-                                  @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions,item.diagnoses)"
                                   type="primary"
                                 >预结算
                                 </el-button>
                                 <el-button
                                   v-if="items.curPrescriptions.order.order_status == 1 && hisPatientInfo.balance_accounts_type != 2 && org_id != 10340"
                                   size="small"
-                                  @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                  @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions,item.diagnoses)"
                                   type="primary"
                                 >撤销明细
                                 </el-button>
                                 <el-button v-loading="loadingtwo"
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
                                            size="small"
-                                           @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
+                                           @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions,item.diagnoses)"
                                            type="primary">收费
                                 </el-button>
                               </div>
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
                       <el-form-item label="大病类别：" prop="sick_type" >
-                        <el-select style="margin-right:5px;width:100px;"
+                        <el-select style="margin-right:5px;width:200px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
                             v-for="(item,index) in sick"
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" >
+                      <el-form-item label="诊断：" prop="diagnosis"  v-if="org_id != 10721 && org_id != 0">
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
                               <el-button
                                 v-if="(hisPatientInfo.balance_accounts_type != 2 && hisPatientInfo.id > 0 &&  items.curMonthPrescriptions.order.id == 0)"
                                 size="small"
-                                @click="open(8,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
+                                @click="open(8,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions,items.diagnoses)"
                                 type="primary"
                               >预结算
                               </el-button>
                               <el-button
                                 v-if="items.curMonthPrescriptions.order.order_status == 1"
                                 size="small"
-                                @click="open(11,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
+                                @click="open(11,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions,items.diagnoses)"
                                 type="primary"
                               >撤销明细
                               </el-button>
 
 
                       <el-form-item label="大病类别：" prop="sick_type" >
-                        <el-select style="margin-right:5px;width:100px;"
+                        <el-select style="margin-right:5px;width:200px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
                             v-for="(item,index) in sick"
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" >
+                      <el-form-item label="诊断：" prop="diagnosis"  v-if="org_id != 10721 && org_id != 0">
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
                     <el-form :model="form" :rules="rules" ref="formValue" label-width="100px">
 
                       <el-form-item label="大病类别：" prop="sick_type" >
-                        <el-select style="margin-right:5px;width:100px;"
+                        <el-select style="margin-right:5px;width:200px;"
                                    v-model="form.sick_type" placeholder="">
                           <el-option
                             v-for="(item,index) in sick"
                         </el-select>
                       </el-form-item>
 
-                      <el-form-item label="诊断：" prop="diagnosis" >
+                      <el-form-item label="诊断：" prop="diagnosis"  v-if="org_id != 10721 && org_id != 0">
                         <el-select style="margin-right:5px;width:100px;"
                                    v-model="form.diagnosis" multiple placeholder="">
                           <el-option
         </el-option>
       </el-select>
 
-      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 0"
+      <el-select v-if="this.$store.getters.xt_user.org_id != 10721 &&this.$store.getters.xt_user.org_id != 10726 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217"
                  style="width:50%;" v-model="temp_med_type"
                  placeholder="医疗类型" @change="changevalue">
         <el-option
             prescription.order.order_status = prescription.order.order_status.toString()
             prescription.order.order_status = parseInt(prescription.order.order_status)
 
+
+
+            let diass = []
+            for(let i = 0; i < prescription.diagnose.split(",").length;i++){
+              diass.push(parseInt(prescription.diagnose.split(",")[i]))
+            }
             const obj = {
               id: prescription.id,
               name: this.getPName(prescription.med_type, index),
               order_status: prescription.order_status,
               type: prescription.type,
               med_type: prescription.med_type,
-              order: prescription.order
+              order: prescription.order,
+              diagnoses:diass,
             }
             // inner_prescription.push(obj)
             big_prescriptions[c].prescriptions.push(obj)
           break
       }
     },
-    open(index, med_type, order, prescriptions) {
+    open(index, med_type, order, prescriptions,diagnosis) {
 
       this.other_prescriptions = prescriptions
 
         if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
           this.$refs.register9504.show()
         } else {
-          this.$refs.register.show(this.doctors, this.department)
-        }
 
+          if(this.$store.getters.xt_user.org_id == 10721000){
+            var  that= this
+            axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+              if (response.data.state == 0) {
+                // that.$message.error(response.data.data.msg);
+                that.$confirm("请检查医保程序是否有打开", "提示", {
+                  confirmButtonText: "确 定",
+                  cancelButtonText: "取 消",
+                  type: "warning",
+                }).then(() => {
+                  var that = this
+                  let params={
+                    id_card_no: this.patientInfo.id_card_no,
+                    admin_user_id:this.$store.getters.xt_user.user.id,
+                  }
+                  axios.get('http://127.0.0.1:9532/zh/api/patient/info', {
+                    params: params,
+                    headers: {
+                      'Permission': 5
+                    }
+                  })
+                    .then(function(response) {
+                      if (response.data.state == 0) {
+                        that.$message.error(response.data.msg)
+                        that.loadingone = false
+                        return false
+                      } else {
+                        that.loadingone = false
+                        if (response.data.data.failed_code == -10) {
+                          // that.$message.error(response.data.data.msg)
+                            this.$refs.register.showTwo(this.doctors, this.department,"")
+                        } else {
+                          this.$refs.register.showTwo(this.doctors, this.department,response.data.data.info)
+                        }
+                      }
+                    })
+                    .catch(function(error) {
+                    })
+                })
+                  .catch(() => {});
+                return false
+              } else {
+
+              }
+            }).catch(function(error) {
+              that.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
+                confirmButtonText: "确 定",
+                cancelButtonText: "取 消",
+                type: "warning",
+              }).then(() => {
+              })
+                .catch(() => {});
+            })
+
+          }else{
+            this.$refs.register.show(this.doctors, this.department)
+          }
+        }
       } else if (index == 8) {
+        console.log(diagnosis)
+
         var that = this
-        if (this.form.diagnosis.length == 0) {
-          that.$message.error('诊断不能为空,请选择诊断内容')
-          return
+        if(this.org_id == 10721 || this.org_id == 0){
+          if (diagnosis.length == 0) {
+            that.$message.error('当前操作的处方诊断不能为空,请选择诊断内容')
+            return
+          }
+        }else{
+          if (this.form.diagnosis.length == 0) {
+            that.$message.error('诊断不能为空,请选择诊断内容')
+            return
+          }
         }
 
-        if (this.form.sick_type.length || this.form.sick_type == 0) {
 
+        if (this.form.sick_type.length || this.form.sick_type == 0) {
           that.$message.error('疾病类型不能为空,请选择疾病类型')
           return
         }
         var new_time  = time_arr[0] + " " + hh+":"+mf+":"+ss
         form['begin_time'] = new_time
         form['p_type'] = med_type
-        form['diagnosis'] = this.form.diagnosis.join(',')
+
+        if(this.org_id == 10721 || this.org_id == 0){
+          form['diagnosis'] = diagnosis.join(',')
+        }else{
+          form['diagnosis'] = this.form.diagnosis.join(',')
+        }
         form['sick_type'] = this.form.sick_type
         form['admin_user_id'] = this.$store.getters.xt_user.user.id
         form['org_id'] = this.$store.getters.xt_user.org_id
           }).catch(() => {
           })
         } else {
-          if (this.$store.getters.xt_user.org_id == 10215 && this.order.id > 0) {
+          if (this.order.id > 0) {
             this.$message.error('该就诊号尚未撤销明细或者退费无法进行退号操作')
             return
           }
                   prescription.order.order_status = prescription.order.order_status.toString()
                   prescription.order.order_status = parseInt(prescription.order.order_status)
 
+                  let diass = []
+                  for(let i = 0; i < prescription.diagnose.split(",").length;i++){
+                    diass.push(parseInt(prescription.diagnose.split(",")[i]))
+                  }
                   const obj = {
                     id: prescription.id,
                     name: this.getPName(prescription.med_type, index),
                     order_status: prescription.order_status,
                     type: prescription.type,
                     med_type: prescription.med_type,
-                    order: prescription.order
+                    order: prescription.order,
+                    diagnoses:diass,
                   }
                   // inner_prescription.push(obj)
                   big_prescriptions[c].prescriptions.push(obj)

src/xt_pages/outpatientCharges/summary.vue

               患者性别: gender,
               患者年龄: age,
               开处时间: time,
+              险种类型: insutypeName,
+              参保所属医保区划: order.his_patient.insuplc_admdvs,
               参保号: order.his_patient.id_card_no,
               应收金额: order.medfee_sumamt,
               实收金额: order.medfee_sumamt,
           }
           if(this.org_id != 10697 && this.org_id != 0){
             import('@/vendor/Export2Excel').then((excel) => {
-              console.log('1111111南昌');
               const tHeader = [
               '就诊号',
               '患者姓名',
               "患者性别",
               "患者年龄",
               '开处时间',
+                '险种类型',
+                '参保所属医保区划',
               '参保号',
               '应收金额',
               '实收金额',
                 "患者性别",
                 "患者年龄",
                 '开处时间',
+                '险种类型',
+                '参保所属医保区划',
                 '参保号',
                 '应收金额',
                 '实收金额',

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

 
           </el-form-item>
 
-          <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;">
+          <el-form-item label="诊断:" prop="name" label-position="right" style="width:66.6%;" v-if="org_id != 10721 && org_id != 0">
 
             <el-select style="width:100%;" v-model="diagnose" placeholder="" multiple filterable>
               <el-option
                 </el-select>
 
 
-                <el-select v-if="org_id == 10721 || org_id == 0" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                <el-select v-if="org_id == 10721 || org_id == 0" style="width:30%;" v-model="item.med_type" placeholder="医疗类型"
                            @change="changevalue">
                   <el-option
                     v-for="(item,index) in register10721"
                   </el-option>
                 </el-select>
 
-<!--                <el-select v-if="org_id == 10721 || org_id == 0" style="width:100%;" v-model="item.diagnose" placeholder="" multiple filterable  placeholder="诊断">-->
-<!--                  <el-option-->
-<!--                    v-for="(item,index) in diagnoses"-->
-<!--                    :key="index"-->
-<!--                    :label="item.class_name"-->
-<!--                    :value="item.id">-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
+                <el-select v-if="org_id == 10721 || org_id == 0" style="width:30%;" v-model="item.diagnose"  multiple filterable  placeholder="诊断">
+                  <el-option
+                    v-for="(item,index) in diagnoses"
+                    :key="index"
+                    :label="item.class_name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
 
-                <el-select v-if="org_id == 10726" style="width:50%;" v-model="item.med_type" placeholder="医疗类型"
+                <el-select v-if="org_id == 10726" style="width:30%;" v-model="item.med_type" placeholder="医疗类型"
                            @change="changevalue">
                   <el-option
                     v-for="(item,index) in register10726"
 
     },
     setData(data, info, admin_info, doctors, department, hisPatientInfo, month_data, last_info, sick, diagnoses, patient_diagnose) {
-      console.log('诊断23333333333333', this.diagnose)
+
+      for(let i = 0; i < data.length;i++){
+        let aaa = data[i].diagnose
+        let uniqueArr = [...new Set(aaa)];
+        data[i].diagnose = uniqueArr
+      }
+
+
 
       //针对普爱医院获取药品和耗材相关库存数据
       if (this.org_id == 10206 && this.zuobiao_drug.length == 0) {
         }
       }
 
+
+
+
+
+
+
     },
     setMonthData(info, admin_info, doctors, department, hisPatientInfo, month_data, last_info) {
       // this.start_time = moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD')
       // }
       if (!isLoading) {
         if (this.dayorMonth == 'day') {
+          if(this.org_id == 10721) {
+            for (let i = 0; i < this.prescriptions.length; i++) {
+              let index = i + 1
+              // for (let b = 0; b < this.prescriptions[i].length; b++) {
+              if (this.prescriptions[i].diagnose.length == 0) {
+                this.$message.error('处方' + index + "诊断不能为空")
+                return
+                // }
+              }
+            }
+          }
+
+
           for (let i = 0; i < this.prescriptions.length; i++) {
+            let index = i + 1
             if (this.prescriptions[i].advices.length == 0 && this.prescriptions[i].project.length == 0) {
-              this.$message.error('请先开处方')
+
+              this.$message.error('处方' + index + '内容不能为空,请先开处方')
               return
             }
           }
             this.$message.error('疾病类型不能为空')
             return
           }
-          if (this.diagnose.length <= 0) {
+          if (this.diagnose.length <= 0 && this.org_id != 10721) {
             this.$message.error('诊断不能为空')
             return
           }
+
+
+
           for (let i = 0; i < this.prescriptions.length; i++) {
             for (let b = 0; b < this.prescriptions[i].advices.length; b++) {
               if (this.prescriptions[i].advices[b].prescribing_number == 0 || this.prescriptions[i].advices[b].prescribing_number == ''  || Number.isNaN(this.prescriptions[i].advices[b].prescribing_number)) {
 
                 }
               }
+
+
+
+              for(let i = 0; i < data.prescriptions.length; i++){
+                data.prescriptions[i]["diagnoses"] = data.prescriptions[i].diagnose.join(",")
+              }
               createHisPrescription(data, params).then(response => {
                 if (response.data.state == 1) {
                   this.$emit('change', this.patientInfo.id)
 
       }
 
-      if (this.org_id != 10206 && this.org_id != 0) {
+      if (this.org_id != 10206) {
         obj.med_type = 14
-        if (this.org_id == 10721){
+        if (this.org_id == 10721 || this.org_id == 0){
           obj.med_type = 992102
         }
-        if (obj.med_type == 992102){
-          obj.diagnose = 2465
-        }
        } else {
         obj.med_type = 12
       }

src/xt_pages/outpatientTool/components/settle.vue

               </template>
           </el-table-column>
 
+        <el-table-column align="center" prop="item_name" label="结算时间">
+          <template slot-scope="scope">
+            {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
+          </template>
+        </el-table-column>
+
         <el-table-column align="center" prop="item_name" label="参保地">
           <template slot-scope="scope">
             {{scope.row.clr_optins}}