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

@@ -472,4 +472,13 @@ export function createdTemplate(params,data) {
   });
 }
 
+export function preSettle(params) {
+  return request({
+    url: "/api/presettle/get",
+    method: "get",
+    params:params,
+  });
+}
+
+
 

src/xt_pages/data/components/addInspection.vue

@@ -46,7 +46,7 @@
                 </el-form-item>
 
                 <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" filterable placeholder="请选择">
+                    <el-select v-model="form.project_detail" filterable placeholder="请选择" @change="changeProject">
                         <el-option
                                 v-for="item in projectList"
                                 :key="item.id"
@@ -69,7 +69,7 @@
                           highlight-current-row ref="tab">
                     <el-table-column align="center" prop="name" label="分类" width="120">
                         <template slot-scope="scope">
-                            <div >{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
+                            <div>{{scope.row.type == 2?getId(scope.row.statistical_classification):'耗材'}}</div>
                         </template>
                     </el-table-column>
                     <el-table-column align="center" prop="name" label="组套明细" width="120">
@@ -123,21 +123,18 @@
     saveProjectTeam
   } from '@/api/project/project'
 
-  import {
-    saveTeam
-  } from '@/api/his/his'
-
+  import { saveTeam } from '@/api/his/his'
 
   export default {
     data() {
       return {
-        project_name:"",
+        project_name: '',
         visible: false,
         formTitle: '',
         activeName: 'first',
         form: {
           project_team: '',
-          price: '',
+          price: 0,
           pinyin: '',
           wubi: '',
           tube_color: '',
@@ -166,18 +163,22 @@
       }
     },
     methods: {
+      changeProject() {
+        this.form.number = 1
+
+      },
       querySearch(queryString, cb) {
-        var restaurants = this.projectList;
-        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        var restaurants = this.projectList
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
         // 调用 callback 返回建议列表的数据
-        cb(results);
+        cb(results)
 
       }, createFilter(queryString) {
         return (restaurant) => {
-          return (restaurant.project_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
-        };
+          return (restaurant.project_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
       },
-      handleSelect(val){
+      handleSelect(val) {
         this.project_name = val.project_name
         this.form.project_detail = val.id
       },
@@ -211,12 +212,12 @@
             wubi: this.form.wubi,
             tube_color: this.form.tube_color,
             team_type: this.form.team_type,
-            remark: this.form.remark,
+            remark: this.form.remark
           }
           let data = {
-            "info":this.tableData
+            'info': this.tableData
           }
-          saveTeam(data,params).then(response => {
+          saveTeam(data, params).then(response => {
             if (response.data.state == 1) {
               var projectTeam = response.data.data.projectTeam
               console.log('projectTeam', projectTeam)
@@ -240,7 +241,7 @@
       },
       getlist() {
         let params = {
-          keyword: ""
+          keyword: ''
 
         }
         getAllProjectList(params).then(response => {
@@ -310,9 +311,9 @@
         for (let i = 0; i < this.projectList.length; i++) {
           if (this.form.project_detail == this.projectList[i].id) {
             this.projectList[i].number = this.form.number
-            this.projectList[i].number =  this.projectList[i].number.toString()
+            this.projectList[i].number = this.projectList[i].number.toString()
             this.tableData.push(this.projectList[i])
-            this.form.project_detail = ""
+            this.form.project_detail = ''
             this.form.number = 1
           }
         }
@@ -343,7 +344,7 @@
           cancelButtonText: '取 消',
           type: 'warning'
         }).then(() => {
-            this.tableData.splice(index, 1)
+          this.tableData.splice(index, 1)
         })
           .catch(() => {
           })
@@ -353,6 +354,23 @@
       //获取所以的项目
       this.getlist()
 
+    }, watch: {
+      'tableData': function() {
+        let c = 0
+        this.form.price  = 0
+        for (let i = 0; i < this.tableData.length; i++) {
+          let a = parseFloat(this.tableData[i].number).toFixed(2)
+          let b = parseFloat(this.tableData[i].price).toFixed(2)
+          console.log(a)
+          console.log(b)
+
+
+          c = c + this.form.price + (a * b)
+
+        }
+        this.form.price = c.toFixed(2)
+      }
+
     }
   }
 </script>

src/xt_pages/data/components/editInspection.vue

@@ -32,7 +32,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
-                    <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
+                    <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择" @change="changeProject">
                         <el-option
                                 v-for="item in options"
                                 :key="item.value"
@@ -166,6 +166,10 @@
       }
     },
     methods: {
+      changeProject() {
+        this.form.number = 1
+
+      },
       getDataConfig(module, filed_name) {
         return getDataConfig(module, filed_name)
       },
@@ -380,6 +384,23 @@
     },
     created() {
       this.getlist()
+    },watch: {
+      'tableData': function() {
+        let c = 0
+        this.form.price  = 0
+        for (let i = 0; i < this.tableData.length; i++) {
+          let a = parseFloat(this.tableData[i].number).toFixed(2)
+          let b = parseFloat(this.tableData[i].price).toFixed(2)
+          console.log(a)
+          console.log(b)
+
+
+          c = c + this.form.price + (a * b)
+
+        }
+        this.form.price = c.toFixed(2)
+      }
+
     }
   }
 </script>

src/xt_pages/hospitalStation/components/registerDialog9504.vue

@@ -50,16 +50,16 @@
             </el-form-item>
 
 
-            <el-form-item label="医疗类别：" prop="medical_care">
-                <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="medical_care">-->
+                <!--<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" >

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -166,7 +166,7 @@
     },
     methods: {
       show: function (total,order) {
-        this.total = total
+        this.form.total = total
         this.form.private_price = total
         this.form.pay_price = total
         this.form.total = total + this.form.medical_insurance_price
@@ -178,11 +178,10 @@
         this.order = order
 
         if(this.order && this.order.id > 0){
-          this.total = this.order.medfee_sumamt
-          this.medical_insurance_price = this.order.fund_pay_sumamt
-          this.private_price =  this.order.psn_part_amt
-
-
+          this.form.total = this.order.medfee_sumamt
+          this.form.pay_price = this.order.medfee_sumamt
+          this.form.medical_insurance_price = this.order.fund_pay_sumamt
+          this.form.private_price =  this.order.psn_part_amt
         }
 
         this.visibility = true

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -50,16 +50,16 @@
             </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="医疗类别：">-->
+                <!--<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">
@@ -77,38 +77,38 @@
                 <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="处方类型：" prop="p_type" :validate-event="is_Name">-->
+                <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""-->
+                <!--&gt;-->
+                    <!--<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="结算类型：">
@@ -334,8 +334,8 @@
           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' }]
+          // sick_type: [{ required: true, message: '大病类别不能为空', trigger: 'change' }],
+          // diagnosis: [{ required: true, message: '诊断不能为空', trigger: 'change' }]
         },
         visibility: false,
         labelPosition: 'right',

src/xt_pages/outpatientCharges/costComparison.vue

@@ -576,19 +576,28 @@
 
             for (let i = 0; i < this.fromData.length; i++) {
               let obj = {
-                '结算金额': this.fromData[i].medfee_sumamt,
+                '序号': i+1,
                 '姓名': this.fromData[i].psn_name,
-                '身份证': this.fromData[i].id_card_no,
+                '单位名称': this.fromData[i].psn_name,
                 '个人编号': this.fromData[i].psn_no,
-                '门诊流水号': this.fromData[i].mdtrt_id,
+                '门诊号': this.fromData[i].mdtrt_id,
                 '挂号日期': this.getTimes(this.fromData[i].settle_accounts_date),
-                '起付线': this.fromData[i].act_pay_dedc,
+                '挂号科室': this.getTimes(this.fromData[i].settle_accounts_date),
+                '门诊费用': this.fromData[i].medfee_sumamt,
+                '自费': this.fromData[i].psn_cash_pay,
+                '起付线I': this.fromData[i].act_pay_dedc,
+                '按比例自付II': this.fromData[i].psn_cash_pay,
+                '小计I+II': this.fromData[i].act_pay_dedc + this.fromData[i].psn_cash_pay,
                 '统筹基金': this.fromData[i].fund_pay_sumamt,
-                '个人支付': this.fromData[i].psn_cash_pay,
-                '个账支付': this.fromData[i].acct_pay,
-                '现金支付': this.fromData[i].cash_pay,
-                '总费用': this.fromData[i].sumamt,
-                '冲销标志': '已结算'
+                '公务员补助': this.fromData[i].cvlserv_pay,
+                '单位补充保险': this.fromData[i].hifes_pay,
+                '大额医疗保险应付': this.fromData[i].hifob_pay,
+                '大额合计': this.fromData[i].hifob_pay,
+                '诊断':"",
+                "血透次数":1,
+                "置留管数量":1,
+                "备注":"",
+
               }
               list.push(obj)
             }

src/xt_pages/outpatientCharges/incomeStatistics.vue

@@ -112,6 +112,9 @@
         <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.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>

src/xt_pages/outpatientCharges/summary.vue

@@ -66,7 +66,7 @@
         >
         </el-table-column>
         <el-table-column align="center" width="100" prop="name" label="就诊号">
-          <template slot-scope="scope">{{ scope.row.his_patient.number }}</template>
+          <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
         </el-table-column>
         <el-table-column align="center" width="90" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -126,6 +126,24 @@
                                         value-format="yyyy-MM-dd HH:mm"
                                         placeholder="选择日期">
                                 </el-date-picker>
+
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-if="($store.getters.xt_user.org_id == 10028 || $store.getters.xt_user.org_id == 9504 || $store.getters.xt_user.org_id == 10138)" >
+                                    <el-option
+                                            v-for="(item,index) in medical_care"
+                                            :key="index"
+                                            :label="item.label"
+                                            :value="item.value">
+                                    </el-option>
+                                </el-select>
+                                <el-select style="width:50%;" v-model="item.med_type" placeholder="医疗类型"  v-else >
+                                    <el-option
+                                            v-for="(item,index) in register"
+                                            :key="index"
+                                            :label="item.label"
+                                            :value="item.value">
+                                    </el-option>
+                                </el-select>
+
                                 <div style="float: right;margin-bottom:5px;margin-right:1%;">
                                     <el-button
                                             round
@@ -511,6 +529,19 @@
           { 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: "新冠肺炎门诊"},
+        ],
+
         isLastOrNextVisible: false,
         multipleTableHeight: '',
         register_type: '',
@@ -1267,6 +1298,7 @@
             (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + (hours < 10 ? '0' + hours : hours) +
             ':' + (min < 10 ? '0' + min : min)
           this.prescriptions[i]['pre_time'] = nowTime
+          this.prescriptions[i]['med_type'] = ""
           this.prescriptions[i].name = '处方' + (i + 1)
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
@@ -1319,6 +1351,8 @@
         for (let i = 0; i < this.prescriptions.length; i++) {
           this.prescriptions[i].name = '处方' + (i + 1)
           this.prescriptions[i]['pre_time'] = nowTime
+          this.prescriptions[i]['med_type'] = ""
+
           if (i == 0) {
             if (this.prescriptions[0].advices.length > 0 && this.prescriptions[0].project.length == 0) {
               this.customTabIndex = 1
@@ -2092,15 +2126,14 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
-
-            // createHisPrescription(data, params).then(response => {
-            //   if (response.data.state == 1) {
-            //     this.$emit('change', this.patientInfo.id)
-            //     this.$message.success('保存成功')
-            //   } else {
-            //     this.$message.error(response.data.msg)
-            //   }
-            // })
+            createHisPrescription(data, params).then(response => {
+              if (response.data.state == 1) {
+                this.$emit('change', this.patientInfo.id)
+                this.$message.success('保存成功')
+              } else {
+                this.$message.error(response.data.msg)
+              }
+            })
           } else if (index == 2) {
             this.$router.push('/outpatientDoctorStation/print')
           } else if (index == 4) {
@@ -2222,8 +2255,8 @@
           advices: [],
           project: [],
           addition: [],
-          pre_time: this.prescriptions[0].pre_time
-          // pre_time: nowTime
+          pre_time: this.prescriptions[0].pre_time,
+          med_type: ""
 
         })
         this.editableTabsValue = newTabName

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1301,7 +1301,8 @@
                   project: tempProject,
                   addition: tempAddition,
                   order_status: prescription.order_status,
-                  pre_time: preTime
+                  pre_time: preTime,
+                  med_type:parseInt(prescription.med_type),
                 };
                 this.prescriptions.push(obj)
               }
@@ -1380,7 +1381,8 @@
                     project: tempProject,
                     addition: tempAddition,
                     order_status: 1,
-                    pre_time: preTime
+                    pre_time: preTime,
+                    med_type: "",
                   };
                   this.prescriptions.push(obj)
                 }
@@ -1394,6 +1396,7 @@
                   addition: [],
                   order_status: 0,
                   pre_time: nowTime,
+                  med_type:"",
 
                 };
                 this.prescriptions.push(obj)
@@ -1704,7 +1707,8 @@
                         project: tempProject,
                         addition: tempAddition,
                         order_status: prescription.order_status,
-                        pre_time: preTime
+                        pre_time: preTime,
+                        med_type: parseInt(prescription.med_type),
                       };
                       this.prescriptions.push(obj)
                     }
@@ -1784,7 +1788,8 @@
                           project: tempProject,
                           addition: tempAddition,
                           order_status: 1,
-                          pre_time: preTime
+                          pre_time: preTime,
+                          med_type: "",
                         };
                         this.prescriptions.push(obj)
                       }
@@ -1799,6 +1804,7 @@
                         addition: [],
                         order_status: 0,
                         pre_time: nowTime,
+                        med_type:"",
 
                       };
                       this.prescriptions.push(obj)
@@ -2098,7 +2104,8 @@
                         project: tempProject,
                         addition: tempAddition,
                         order_status: prescription.order_status,
-                        pre_time: preTime
+                        pre_time: preTime,
+                        med_type:parseInt(prescription.med_type),
                       };
                       this.prescriptions.push(obj)
                     }
@@ -2178,7 +2185,8 @@
                           project: tempProject,
                           addition: tempAddition,
                           order_status: 1,
-                          pre_time: preTime
+                          pre_time: preTime,
+                          med_type: "",
                         };
                         this.prescriptions.push(obj)
                       }
@@ -2192,6 +2200,7 @@
                         addition: [],
                         order_status: 0,
                         pre_time: nowTime,
+                        med_type: "",
 
                       };
                       this.prescriptions.push(obj)
@@ -2490,7 +2499,8 @@
                         project: tempProject,
                         addition: tempAddition,
                         order_status: prescription.order_status,
-                        pre_time: preTime
+                        pre_time: preTime,
+                        med_type: parseInt(prescription.med_type),
                       };
                       this.prescriptions.push(obj)
                     }
@@ -2570,7 +2580,8 @@
                           project: tempProject,
                           addition: tempAddition,
                           order_status: 1,
-                          pre_time: preTime
+                          pre_time: preTime,
+                          med_type:"",
                         };
                         this.prescriptions.push(obj)
                       }
@@ -2584,6 +2595,7 @@
                         addition: [],
                         order_status: 0,
                         pre_time: nowTime,
+                        med_type: "",
 
                       };
                       this.prescriptions.push(obj)
@@ -2938,7 +2950,8 @@
                       project: tempProject,
                       addition: tempAddition,
                       order_status: prescription.order_status,
-                      pre_time: preTime
+                      pre_time: preTime,
+                      med_type: parseInt(prescription.med_type)
                     };
                     this.prescriptions.push(obj)
                   }
@@ -3018,7 +3031,8 @@
                         project: tempProject,
                         addition: tempAddition,
                         order_status: 1,
-                        pre_time: preTime
+                        pre_time: preTime,
+                        med_type:"",
                       };
                       this.prescriptions.push(obj)
                     }
@@ -3033,6 +3047,7 @@
                       addition: [],
                       order_status: 0,
                       pre_time: nowTime,
+                      med_type: "",
 
                     };
                     this.prescriptions.push(obj)
@@ -3331,7 +3346,8 @@
                     project: tempProject,
                     addition: tempAddition,
                     order_status: prescription.order_status,
-                    pre_time: preTime
+                    pre_time: preTime,
+                    med_type: parseInt(prescription.med_type)
                   };
                   this.prescriptions.push(obj)
                 }
@@ -3411,7 +3427,8 @@
                       project: tempProject,
                       addition: tempAddition,
                       order_status: 1,
-                      pre_time: preTime
+                      pre_time: preTime,
+                      med_type:"",
                     };
                     this.prescriptions.push(obj)
                   }
@@ -3425,6 +3442,8 @@
                     addition: [],
                     order_status: 0,
                     pre_time: nowTime,
+                    med_type:"",
+
 
                   };
                   this.prescriptions.push(obj)
@@ -3638,7 +3657,7 @@
                 list[i].prescription_number = list[i].prescription_number + i
                 arr.push(list[i])
               }
-              
+
             }
             this.tableData = arr
           }

src/xt_pages/outpatientRegistration/index.vue

@@ -136,16 +136,16 @@
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="医疗类别：" :validate-event="is_Name" prop="medicalCare">
-                        <el-select v-model="form.medicalCare" placeholder="请选择">
-                            <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="医疗类别：" :validate-event="is_Name" prop="medicalCare">-->
+                        <!--<el-select v-model="form.medicalCare" placeholder="请选择">-->
+                            <!--<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="doctor" :validate-event="is_Name">
                         <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
@@ -315,61 +315,61 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <!--<el-form-item label="挂号类型：" >-->
-                        <!--<el-select v-model="form.register" placeholder="请选择">-->
-                            <!--<el-option-->
-                                    <!--v-for="item in his_registers"-->
-                                    <!--:key="item.value"-->
-                                    <!--:label="item.label"-->
-                                    <!--:value="item.value">-->
-                            <!--</el-option>-->
-                        <!--</el-select>-->
-                    <!--</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-form-item label="挂号类型：" >
+                        <el-select v-model="form.register" placeholder="请选择">
                             <el-option
-                                    v-for="(item,index) in registers"
-                                    :key="index"
+                                    v-for="item in his_registers"
+                                    :key="item.value"
                                     :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="处方类型：" prop="p_type" :validate-event="is_Name">-->
+                        <!--<el-select style="margin-right:5px;width:100px;" v-model="form.p_type" placeholder=""-->
+                        <!--&gt;-->
+                            <!--<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.medicalCare" placeholder="请选择">
-                            <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="医疗类别：">-->
+                        <!--<el-select v-model="form.medicalCare" placeholder="请选择">-->
+                            <!--<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="doctor" :validate-event="is_Name">
                         <el-select v-model="form.doctor" placeholder="请选择" @change="changeDoctor">
@@ -737,8 +737,57 @@
 
           })
       },
-
-      reading(medicalInsuranceCard) {
+      // reading() {
+      //   var that = this
+      //   if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
+      //     this.$message.error('请先选择读卡类型')
+      //     return
+      //   }
+      //   let params = {
+      //     'id_card_type': this.form.id_card_type,
+      //     'admin_user_id': this.$store.getters.xt_user.user.id,
+      //     'certificates':this.form.certificates,
+      //   }
+      //   axios.get('http://127.0.0.1:9532/api/readcard', {
+      //     params: params
+      //   })
+      //     .then(function(response) {
+      //       if (response.data.state == 0) {
+      //         that.$message.error(response.data.msg)
+      //         return false
+      //       } else {
+      //         var patient = response.data.data.patient
+      //
+      //         if (that.form.id_card_type == 1) {
+      //           this.form.id = patient.id
+      //           that.form.name = patient.name
+      //           that.form.sex = patient.gender
+      //           that.form.age = patient.age
+      //           that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+      //           that.form.phone = patient.phone
+      //           that.form.idCard = patient.id_card_no
+      //           that.form.medicalInsuranceCard = response.data.data.number
+      //
+      //         } else if (that.form.id_card_type == 2) {
+      //           this.form.id = patient.id
+      //           that.form.name = patient.name
+      //           that.form.sex = patient.gender
+      //           that.form.age = patient.age
+      //           that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
+      //           that.form.phone = patient.phone
+      //           that.form.idCard = patient.id_card_no
+      //         }
+      //         that.$message({ message: '读卡成功', type: 'success' })
+      //       }
+      //     })
+      //     .catch(function(error) {
+      //
+      //     })
+      //
+      // },
+
+
+      reading() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
           this.$message.error('请先选择读卡类型')
@@ -747,7 +796,7 @@
         let params = {
           'id_card_type': this.form.id_card_type
         }
-        axios.get('http://127.0.0.1:9532/api/sscard', {
+        axios.get('http://127.0.0.1:9532/api/readcard', {
           params: params
         })
           .then(function(response) {