HIS 系统提交

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -221,9 +221,8 @@
 
 
       // },
-      open(index) {
-        console.log("index",index)
-        if (index == 1) {
+      createCaseHistory() {
+        console.log("触发了吗")
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
@@ -269,13 +268,7 @@
               this.$message.success("保存成功")
             }
           })
-        } else if (index == 2) {
-          this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
-        } else if (index == 3) {
-          this.$refs.medicalRecord.show()
-        } else if (index == 4) {
-          this.$refs.saveRecordTemplate.show(this.case_history)
-        }
+       
 
       },
       getMsgFormSon(data){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -64,8 +64,10 @@
                            :hisPatientInfo="hisPatientInfo"
                            v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo" v-if="titleType == '病历'"></desk-record>
-        <medicalRecord ref='medicalRecord'  @func="getMsgFormSon"></medicalRecord>
+                     :hisPatientInfo="hisPatientInfo"   v-if="titleType == '病历'"  ref="child"></desk-record>
+                    
+        <!-- <medicalRecord ref='medicalRecord'  @func="getMsgFormSon"></medicalRecord> -->
+         <medicalRecord ref='medicalRecord' ></medicalRecord>
        <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
 
@@ -306,53 +308,57 @@
         // }
       },
       opentwo(index) {
-        console.log("index",index)
+        console.log("index===",index)
         if (index == 1) {
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
           }
-          if(this.case_history.is_infect == true){
-            this.case_history.is_infect = 1
-          }
-          if(this.case_history.is_infect == false){
-             this.case_history.is_infect = 2
-          }
-          let params = {
-            "his_patient_id":this.hisPatientInfo.id,
-            "delivery_way":this.delivery_way?"":0,
-            "patient_id":this.patientInfo.id,
-            "temperature":this.case_history.temperature,
-            "blood_sugar":this.case_history.blood_sugar,
-            "pulse":this.case_history.pulse,
-            "sbp":this.case_history.sbp,
-            "dbp":this.case_history.dbp,
-            "blood_fat":this.case_history.blood_fat,
-            "height":this.case_history.height,
-            "sick_type":this.case_history.sick_type,
-            "symptom":this.case_history.symptom,
-            "sick_date":this.start_time,
-            "is_infect":this.case_history.is_infect,
-            "chief_conplaint":this.case_history.chief_conplaint,
-            "history_of_present_illness":this.case_history.history_of_present_illness,
-            "past_history":this.case_history.past_history,
-            "personal_history":this.case_history.personal_history,
-            "family_history":this.case_history.family_history,
-            "record_date":this.record_date,
-            "diagnostic":this.case_history.diagnostic,
-            "breathing":this.case_history.breathing,
-            "doctor_advice":this.doctor_advice,
-            "remark":this.remark
-          }
-        
-          createCaseHistory(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error("患者病历已存在")
-              return false
-            } else {
-              this.$message.success("保存成功")
-            }
-          })
+          this.$refs.child.createCaseHistory()
+          // if(this.case_history.is_infect == true){
+          //   this.case_history.is_infect = 1
+          // }
+          // if(this.case_history.is_infect == false){
+          //    this.case_history.is_infect = 2
+          // }
+          // let params = {
+          //   "his_patient_id":this.hisPatientInfo.id,
+          //   "delivery_way":this.delivery_way?"":0,
+          //   "patient_id":this.patientInfo.id,
+          //   "temperature":this.case_history.temperature,
+          //   "blood_sugar":this.case_history.blood_sugar,
+          //   "pulse":this.case_history.pulse,
+          //   "sbp":this.case_history.sbp,
+          //   "dbp":this.case_history.dbp,
+          //   "blood_fat":this.case_history.blood_fat,
+          //   "height":this.case_history.height,
+          //   "sick_type":this.case_history.sick_type,
+          //   "symptom":this.case_history.symptom,
+          //   "sick_date":this.start_time,
+          //   "is_infect":this.case_history.is_infect,
+          //   "chief_conplaint":this.case_history.chief_conplaint,
+          //   "history_of_present_illness":this.case_history.history_of_present_illness,
+          //   "past_history":this.case_history.past_history,
+          //   "personal_history":this.case_history.personal_history,
+          //   "family_history":this.case_history.family_history,
+          //   "record_date":this.record_date,
+          //   "diagnostic":this.case_history.diagnostic,
+          //   "breathing":this.case_history.breathing,
+          //   // "doctor_advice":this.doctor_advice,
+          //   // "remark":this.remark
+          //   "doctor_advice":this.$ref.doctor_advice,
+          //   // "remark":this.remark
+          // }
+          // console.log("params",params)
+          // return
+          // createCaseHistory(params).then(response => {
+          //   if (response.data.state == 0) {
+          //     this.$message.error("患者病历已存在")
+          //     return false
+          //   } else {
+          //     this.$message.success("保存成功")
+          //   }
+          // })
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
         } else if (index == 3) {

src/xt_pages/outpatientRegistration/index.vue

@@ -70,7 +70,7 @@
             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" :model="form" label-width="100px">
+                <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
                     <el-form-item label="挂号类型："  prop="register">
                         <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
@@ -245,7 +245,7 @@ export default {
             },
 
             rules: {
-              idCard: [{ required: true, message: '请填写身份证', trigger: 'blur'  }],
+              idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
               department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
@@ -358,6 +358,9 @@ export default {
            })   
         },
         saveHisPatient(formName){   
+           if(this.form.idCard == ""){
+             this.$message.error("证件号码不能为空")
+           }
           this.$refs[formName].validate((valid)=>{
              if(valid){
                   if(this.form.costChecked == true){

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -88,7 +88,7 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="80">
                     <template slot-scope="scope">
-                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)" >退号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 2" :disabled="true">已退号</el-button>
                         <el-button size="mini" type="primary" v-if="scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
                     </template>