HIS 系统提交

src/api/project/project.js

@@ -443,4 +443,13 @@ export function changePatient(id,params){
       method:"Get",
       params:params
     })
-  }
+  }
+
+  export function getAllDePartmentList(params){
+   
+    return request({
+      url:"/api/hispatient/getalldepartmentlist",
+      method:"Get",
+      params:params
+    })
+  } 

src/api/role/admin.js

@@ -26,7 +26,7 @@ export function getAddAdminInitData() {
   })
 }
 
-export function addAdmin(mobile, name, type, title, role, intro, user_title_name) {
+export function addAdmin(mobile, name, type, title, role, intro, user_title_name,department,department_id) {
   const params = {
     mobile: mobile,
     name: name,
@@ -34,8 +34,12 @@ export function addAdmin(mobile, name, type, title, role, intro, user_title_name
     title: title,
     role: role,
     intro: intro,
-    user_title_name: user_title_name
+    user_title_name: user_title_name,
+    department:department,
+    department_id:department_id,
   }
+  console.log("epa",department_id,department)
+  
   return request({
     url: '/api/admin/add',
     method: 'post',
@@ -54,7 +58,8 @@ export function getModifyAdminInitData(uid) {
   })
 }
 
-export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort) {
+export function modifyAdmin(uid, name, type, title, role, intro, user_title_name, sort,department,department_id) {
+  console.log("进来",department,department_id)
   const params = {
     uid: uid,
     name: name,
@@ -63,8 +68,12 @@ export function modifyAdmin(uid, name, type, title, role, intro, user_title_name
     role: role,
     intro: intro,
     user_title_name: user_title_name,
-    sort: sort
+    sort: sort,
+    department:department,
+    department_id:department_id
   }
+ 
+ 
   return request({
     url: '/api/admin/edit',
     method: 'post',

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -223,7 +223,6 @@
 
       // },
       createCaseHistory() {
-        console.log("触发了吗")
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
             return
@@ -269,6 +268,8 @@
               var caseHistory = response.data.data.caseHistory
               console.log("caseHistory",caseHistory)
               this.$message.success("保存成功")
+              this.doctor_advice = ""
+              this.remark = ""
             }
           })
        

src/xt_pages/outpatientRegistration/index.vue

@@ -7,22 +7,6 @@
             <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.settlementValue" placeholder="请选择">
-                            <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 class="specialFormItem" label="医保卡号：">
-                        <div style="display:flex;">
-                            <el-input v-model="form.medicalInsuranceCard"></el-input>
-                            <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
-                        </div>
-                    </el-form-item>
                     <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
                         <!-- <el-input  v-model="form.name"></el-input> -->
                        <el-select v-model="form.name" placeholder="请选择">
@@ -34,6 +18,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+
                     <el-form-item label="性别：" prop="sex" :validate-event="is_Name">
                         <el-select v-model="form.sex" placeholder="请选择">
                             <el-option
@@ -44,7 +29,34 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="证件类型：">
+
+                    <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" @change="getBirthday" placeholder="选择日期"></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.medicalCare" placeholder="请选择">
+                            <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="证件类型：">
                         <el-select v-model="form.certificates" placeholder="请选择">
                             <el-option
                             v-for="item in certificates"
@@ -54,26 +66,41 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医疗类别：">
-                        <el-select v-model="form.medicalCare" placeholder="请选择">
+
+                   <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
+                        <el-input v-model="form.idCard"></el-input>
+                    </el-form-item>
+
+
+                    <el-form-item label="结算类型：">
+                        <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
-                            v-for="item in medicalCare"
+                            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="出生日期：" prop="birthday" :validate-event="is_Name">
-                        <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
-                        <el-input v-model="form.age"></el-input>
+
+
+                   <el-form-item label="社保类型:">
+                        <el-select v-model="form.social_type" placeholder="请选择">
+                            <el-option
+                            v-for="(item,index) in getDictionaryDataConfig('system','social_type')"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
-                        <el-input v-model="form.idCard"></el-input>
+                    <el-form-item class="specialFormItem" label="医保卡号：">
+                        <div style="display:flex;">
+                            <el-input v-model="form.medicalInsuranceCard"></el-input>
+                            <!-- <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button> -->
+                        </div>
                     </el-form-item>
-   
+                
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
@@ -139,6 +166,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { basename } from 'path'
 import { getAllDoctorList,saveHisPatient,getTodaySchedulePatient } from "@/api/project/project"
+import { getDictionaryDataConfig } from '@/utils/data'
 const moment = require('moment')
 export default {
     components:{
@@ -167,7 +195,9 @@ export default {
                 registrationFee:'',
                 medicalExpenses:'',
                 cost:'',
-                total: '' 
+                total: '',
+                phone:'', 
+                social_type:'',
             },
             settlement: [{
                 value: 1,
@@ -267,6 +297,7 @@ export default {
            show:false,
            is_Name:false,
            patient:[],
+           scialType:[]
         }
     },
     computed:{
@@ -443,10 +474,12 @@ export default {
                     registrationFee:this.form.registrationFee,
                     medicalExpenses:this.form.medicalExpenses,
                     cost:this.form.cost,
-                    total:this.total
+                    total:this.total,
+                    phone:this.form.phone,
+                    social_type:this.form.social_type
                 }
                 console.log("params",params)
-                return
+              
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -468,7 +501,9 @@ export default {
                      this.form.registrationFee = "",
                      this.form.medicalExpenses = "",
                      this.form.cost="",
-                     this.form.total= "" 
+                     this.form.total= "" ,
+                     this.form.phone = "",
+                     this.form.social_type = ""
                    } 
                 })
              } 
@@ -482,7 +517,11 @@ export default {
                this.patient = patient
              }
           }) 
-       }
+       },
+       getDictionaryDataConfig(module, filed_name) {
+        return getDictionaryDataConfig(module, filed_name)
+
+      },
     },
     created(){
       //获取当前机构有人员信息

src/xt_pages/role/components/AdminInfoForm.vue

@@ -37,10 +37,24 @@
         </el-select>
       </el-form-item>
 
+
+      <el-form-item label="科室:">
+         <el-select v-model="form.department_id" placeholder="科室">
+          <el-option
+            v-for="item in departMent"
+            :label="item.name"
+            :value="item.id"
+            :key="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item label="职位 : ">
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
 
+       
+
       <el-form-item label="介绍 : ">
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>
@@ -55,7 +69,7 @@
 <script>
   import Tinymce from '@/components/Tinymce'
   import { addAdmin, getAddAdminInitData, getModifyAdminInitData, modifyAdmin } from '@/api/role/admin'
-
+  import { getAllDePartmentList } from "@/api/project/project"
   export default {
     name: 'AdminInfoForm',
     components: {
@@ -118,7 +132,10 @@
           user_title: '',
           role: '', // 其实应该是 int 类型
           intro: '',
+          department:'',
+          department_id:"",
         },
+        departMent:[],
         rules: {
           mobile: [{ required: true, validator: checkMobile, trigger: 'blur' }],
           name: [{ required: true, validator: checkName, trigger: 'blur' }],
@@ -209,6 +226,7 @@
                 }
                 this.form.user_title = admin.user_title
                 this.form.role = admin.role_ids
+                this.form.department_id = admin.department_id
                 this.form.role_ids = []
                 for (let i = 0; i < this.form.role.split(",").length; i++) {
                   if (this.form.role.split(',')[i].length > 0) {
@@ -255,7 +273,16 @@
 
         this.dialogFormVisible = true
       },
-      submitAction: function() {     
+      submitAction: function() {   
+       console.log("第是",this.form.department_id)  
+        var department = ""
+        for(let i=0;i<this.departMent.length;i++){
+          if(this.form.department_id == this.departMent[i].id){
+              department = this.departMent[i].name
+          }
+        }
+        this.form.department = department
+        
         if (this.admin_id < 0) {
           return
         }
@@ -267,6 +294,7 @@
             }
 
             this.loading = true
+            console.log("id-----",this.form.id)
             if (this.form.id === 0) {
               this.form.role = this.form.role_ids.join(',')
               addAdmin(
@@ -276,7 +304,9 @@
                 this.form.user_title,
                 this.form.role,
                 this.form.intro,
-                this.form.user_title_name
+                this.form.user_title_name,
+                this.form.department,
+                this.form.department_id,
               ).then(rs => {
                   this.loading = false
                   var resp = rs.data
@@ -297,17 +327,17 @@
                 })
             } else {
               this.form.role = this.form.role_ids.join(',')
-
-              modifyAdmin(
-                this.form.id,
-                this.form.name,
-                this.form.user_type,
-                this.form.user_title,
-                this.form.role,
-                this.form.intro,
-                this.form.user_title_name,
-              )
-                .then(rs => {
+             
+               var department = ""
+               for(let i=0;i<this.departMent.length;i++){
+                if(this.form.department_id == this.departMent[i].id){
+                    department = this.departMent[i].name
+                }
+              }
+              this.form.department = department
+           
+             
+              modifyAdmin(this.form.id,this.form.name,this.form.user_type,this.form.user_title,this.form.role,this.form.intro, this.form.user_title_name,this.form.sort,this.form.department,this.form.department_id).then(rs => {
                   this.loading = false
                   var resp = rs.data
                   if (resp.state === 1) {
@@ -331,7 +361,23 @@
             return false
           }
         })
+      },
+
+      getlist(){
+        getAllDePartmentList().then(response=>{
+         if(response.data.state == 1){
+           var department =   response.data.data.departMent
+           console.log("department2222",department)
+           this.departMent = department
+         
+         }
+        })
       }
+    },
+
+    created(){
+        //获取所有科室
+       this.getlist()
     }
   }
 </script>

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -43,7 +43,7 @@
       <el-form-item label="职位 : ">
         <el-input v-model="form.user_title_name" placeholder="输入职位"></el-input>
       </el-form-item>
-
+      
       <el-form-item label="介绍 : ">
         <Tinymce :height="400" menubar ref="editor" v-model="form.intro" :show_upload_img="false"/>
       </el-form-item>

src/xt_pages/role/components/EditAdminInfo.vue

@@ -168,6 +168,7 @@ export default {
                     this.form.user_title = admin.user_title
                     this.form.role = admin.role_id
                     this.form.intro = admin.intro
+                    this.form.deparment_id = admin.deparment_id
                 } else {
                     this.$message.error(resp.msg)
                 }