Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

@@ -43,6 +43,29 @@ export function getInitData(params) {
 }
 
 
+export function getDoctors() {
+  return request({
+    url: "/api/admin/get",
+    method: "get",
+  });
+}
+
+
+
+export function createHisPrescription(data, params) {
+  return request({
+    url: "/api/hisprescription/create",
+    method: "post",
+    data:data,
+    params:params,
+  });
+}
+
+
+
+
+
+
 // export function createCaseHistory(params) {
 //   return request({
 //     url: "/api/doctorworkstation/casehistory/create",

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -13,13 +13,13 @@
       <div class="centerLeft">
         <el-form :model="form"  ref="form" label-width="80px">
           <el-form-item label="姓名:" prop="name">
-            <el-input v-model="patientInfo.name" placeholder=""></el-input>
+            <el-input v-model="patientInfo.name" placeholder="" readonly></el-input>
           </el-form-item>
           <el-form-item label="证件号: " prop="name">
-            <el-input v-model="patientInfo.id_card_no" placeholder=""></el-input>
+            <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
           </el-form-item>
           <el-form-item label="挂号类型: " prop="name">
-            <el-input v-model="hisPatientInfo.register_type" placeholder=""></el-input>
+            <el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>
           </el-form-item>
           <el-form-item label="诊断:" prop="name">
             <el-autocomplete
@@ -30,18 +30,14 @@
               placeholder="请输入内容"
             ></el-autocomplete>
           </el-form-item>
-          <el-form-item label="大病类别: " prop="name">
-            <el-input v-model="form.name" placeholder=""></el-input>
-          </el-form-item>
-          <el-form-item label="处方类型: " prop="name">
-            <el-select v-model="value" placeholder="请选择" style="width:100%;">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
+          <el-form-item label="过敏及特殊病史: " prop="name">
+            <el-autocomplete
+              style="width:100%;"
+              class="inline-input"
+              v-model="state2"
+              :fetch-suggestions="querySearch2"
+              placeholder="请输入内容"
+            ></el-autocomplete>
           </el-form-item>
         </el-form>
         <div class="tabsBox">
@@ -68,19 +64,19 @@
           <span>医生：</span>
           <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
             <el-option
-              v-for="item in doctorOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="item,index in doctors"
+              :key="index"
+              :label="item.user_name"
+              :value="item.id">
             </el-option>
           </el-select>
           <span>科室：</span>
           <el-select style="margin-right:5px;" v-model="departmentValue" placeholder="">
             <el-option
-              v-for="item in departmentOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
+              v-for="(item,index) in getDictionaryDataConfig('system','department')"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
             </el-option>
           </el-select>
           <span>总计：</span>
@@ -208,7 +204,7 @@
 
 
 <script>
-  import { getPatientInfo, getSchedulePatientList, getInitData } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList, getInitData,getDoctors,createHisPrescription } from '@/api/his/his'
   import { getDictionaryDataConfig} from "@/utils/data";
   import prescriptionTable from './prescriptionTable'
   import selectTemplate from './selectTemplate'
@@ -221,7 +217,8 @@
     props: {
       patientInfo: Object,
       hisPatientInfo: Object,
-      prescriptions: Array
+      prescriptions: Array,
+      record_date:String,
     },
     components: {
       selectTemplate,
@@ -256,10 +253,11 @@
         doctorValue: '',
         departmentOptions: [],
         departmentValue: '',
+        diagnoses: this.getDictionaryDataConfig('system','diagnose'),
+        other_sick:this.getDictionaryDataConfig('system','other_sick_history'),
         total: 0,
-        showOne:true,
-        showTwo:false,
         state1:"",
+        state2:"",
         customTabIndex:1,
         options:[],
         tabProject:[],
@@ -269,9 +267,35 @@
         tableData:[],
         tabPrjectTeam:[],
         teamList:[],
+        doctors:[],
       }
     },
     methods: {
+      createFilter (queryString) {
+        return (restaurant) => {
+          return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+        }
+      },
+
+      querySearch (queryString, cb) {
+        var restaurants = this.diagnoses
+        console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
+      querySearch2 (queryString, cb) {
+        var restaurants = this.other_sick
+        restaurants.map(item => {
+          item.value = item.name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
+        // 调用 callback 返回建议列表的数据
+        cb(results)
+      },
       changeKind(val){
         this.drugs = []
 
@@ -286,6 +310,7 @@
         }
       },
       getDictionaryDataConfig(module, filed_name) {
+        console.log(getDictionaryDataConfig(module, filed_name))
         return getDictionaryDataConfig(module, filed_name)
 
       },
@@ -298,6 +323,8 @@
             this.drugs = response.data.data.drugs
             this.allDrugs = response.data.data.drugs
             this.advices_template = response.data.data.advices_template
+            this.doctors = response.data.data.doctors
+
           }
         })
 
@@ -313,7 +340,7 @@
                 this.customTabIndex = 1
               }
               if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
-               
+
                 this.customTabIndex = 2
               }
 
@@ -340,8 +367,40 @@
       },
       open(index) {
         if (index == 1) {
-          localStorage.setItem('drugs', JSON.stringify(this.preDrugs))
-          this.$message({ message: '保存成功', type: 'success' })
+          let params ={
+            patient_id: this.patientInfo.id,
+            diagnose: this.state1,
+            sick_history: this.state2,
+            doctor: this.doctorValue,
+            department: this.departmentValue,
+            record_date: this.record_date
+          }
+
+          for (let i = 0; i < this.prescriptions.length; i++){
+            if(this.prescriptions[i].advices.length > 0 && this.prescriptions[i].projects.length == 0){
+              this.prescriptions[i]['type'] = 1
+            }
+            if(this.prescriptions[i].advices.length == 0 && this.prescriptions[i].projects.length > 0){
+              this.prescriptions[i]['type'] = 2
+            }
+            for (let b = 0; b < this.prescriptions[i].advices.length; b++){
+              this.prescriptions[i].advices[b].single_dose = this.prescriptions[i].advices[b].single_dose.toString()
+              this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
+              this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
+
+            }
+          }
+          let data={
+            "prescriptions":this.prescriptions
+          }
+
+          createHisPrescription(data,params).then(response=>{
+            if(response.data.state == 1){
+              this.prescriptions = []
+              this.
+
+            }
+          })
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/print')
         } else if (index == 4) {
@@ -404,11 +463,11 @@
 
         //用来区分处方属于项目还是药品
         if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
-        
+
           this.customTabIndex = 1
         }
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
-         
+
           this.customTabIndex = 2
         }
         if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
@@ -428,13 +487,16 @@
       },
       comfirm() {
         this.preDrugs = this.curDrugs
-        
+
         for (let i = 0; i < this.prescriptions.length; i++){
           console.log("名称",this.prescriptions[i].name)
           console.log("名称2",this.editableTabsValue)
           if(this.prescriptions[i].name == this.editableTabsValue){
-            this.prescriptions[i].advices = this.preDrugs
-            this.prescriptions[i].project = this.teamList
+           var temp =  this.deepClone(this.preDrugs)
+            var temp2 =  this.deepClone(this.teamList)
+
+            this.prescriptions[i].advices = temp
+            this.prescriptions[i].project = temp2
             this.curPrescriptions = this.prescriptions[i]
             // this.$refs.prescription_tables.setNewData(this.prescriptions[i])
           }
@@ -455,6 +517,19 @@
       },
       querySearch(){
 
+      },deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
       },
       getAllProjectTeam(){
         getAllProjectTeam().then(response=>{
@@ -463,7 +538,7 @@
             console.log("team",team)
             this.tabPrjectTeam = team
           }
-        })  
+        })
       },
       selectTeam(row){
           var arr = []
@@ -474,10 +549,10 @@
         console.log("ids",ids)
         var strArr = ids.split(",")
         var res = [];//接收不重复的数据
-      
+
         for (var i = 0; i<strArr.length; i++){
         var flag = true;
-       
+
         for (var j = 0; j<i; j++){
           if(strArr[i]===strArr[j]){
             flag = false;
@@ -489,7 +564,7 @@
          }
         }
         console.log("res",res)
-      
+
         var idstr =  res.join(",")
         console.log("idstr",idstr)
         const params = {
@@ -512,7 +587,7 @@
       //获取所以项目组套
       this.getAllProjectTeam()
 
-   
+
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="prescriptionTable">
-    <div>{{prescription.name}}</div>
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 98%;" :row-style="{ color: '#303133' }"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
       <el-table-column align="center" prop="name" label="名称">
@@ -144,7 +143,6 @@
             name:"",
             advices:[],
             project:[],
-            projects:[],
             drugways:[],
             efs:[],
           };

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -45,7 +45,7 @@
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
         </div>
-        <desk-prescription ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"
+        <desk-prescription :record_date="record_date" ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :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>