Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -18,11 +18,11 @@
           <el-form-item label="证件号: " prop="name">
             <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="" readonly></el-input>-->
+          <!--</el-form-item>-->
           <el-form-item label="挂号类型: " prop="name">
-            <el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>
-          </el-form-item>
-          <el-form-item label="挂号类型: " prop="name">
-            <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="">
+            <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
               <el-option
                 v-for="(item,index) in doctors"
                 :key="index"
@@ -223,7 +223,8 @@
     delHisPrescription,
     getInitData,
     getPatientInfo,
-    getSchedulePatientList
+    getSchedulePatientList,
+
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
@@ -238,6 +239,7 @@
       hisPatientInfo: Object,
       prescriptions: Array,
       record_date: String,
+
       other_sick: {
         type: Array,
         default: []
@@ -255,6 +257,7 @@
     },
     data() {
       return {
+        register_type:"",
         value: '',
         form: {
           name: ''
@@ -378,35 +381,57 @@
           console.log(this.prescriptions[i].name)
           if (this.prescriptions[i].name == val.name) {
             this.curPrescriptions = this.prescriptions[i]
+            this.teamList = []
+            this.curDrugs = []
+            this.$refs.multipleTable.clearSelection()
+            this.$refs.tables.clearSelection()
 
             //用来区分处方属于项目还是药品
             if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = 1
               this.curStatus = 1
+              this.rightTab = 1
+              this.showOne = true
+              this.showTwo = false
             }
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
 
               this.customTabIndex = 2
               this.curStatus = 2
+              this.rightTab = 2
+
+              this.showTwo = true
+              this.showOne = false
             }
 
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = this.rightTab
+              this.curStatus = 0
+
             }
 
           }
 
         }
       }, clearData() {
-
+        console.log("111111")
         this.curPrescriptions = []
+        this.curStatus = 0
+        this.curDrugs = []
+        this.preDrugs = []
+        this.teamList = []
+
+
       },
       setData(data) {
+        this.curStatus = 0
+
         this.prescriptions = data
+        this.curPrescriptions = this.prescriptions[0]
         console.log(this.$refs)
-        this.$nextTick(() => {
-          this.$refs.prescription_tables.setNewData(this.prescriptions[0])
-        })
+        // this.$nextTick(() => {
+        //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
+        // })
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -420,7 +445,7 @@
             diagnose: this.state1,
             sick_history: this.state2,
             doctor: this.doctorValue,
-            department: this.departmentValue,
+               department: this.departmentValue,
             record_date: this.record_date,
             his_patient_id: this.hisPatientInfo.id
           }
@@ -444,7 +469,7 @@
           }
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
-              this.prescriptions = []
+              // this.prescriptions = []
               this.$message.success('保存成功')
             }
           })
@@ -518,6 +543,37 @@
           delHisPrescription(params).then(response => {
             if (response.data.state == 1) {
               this.$message.success('删除成功')
+              let tabs = this.prescriptions
+              let activeName = this.editableTabsValue
+              if (activeName === targetName) {
+                tabs.forEach((tab, index) => {
+                  if (tab.name === targetName) {
+                    let nextTab = tabs[index + 1] || tabs[index - 1]
+                    if (nextTab) {
+                      activeName = nextTab.name
+
+                    }
+                  }
+                })
+              }
+              this.editableTabsValue = activeName
+              this.prescriptions = tabs.filter(tab => tab.name !== targetName)
+
+              for (let i = 0; i < this.prescriptions.length; i++) {
+                if (activeName == this.prescriptions[i].name) {
+                  this.curPrescriptions = this.prescriptions[i]
+                  if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+                    this.curStatus = 1
+                  }
+                  if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
+                    this.curStatus = 2
+                  }
+                }
+              }
+              if (this.prescriptions.length == 0) {
+                this.curPrescriptions = []
+                this.curStatus = 0
+              }
             } else {
               this.$message.success(response.data.msg)
             }
@@ -525,7 +581,25 @@
         }
       },
       clickTab(index) {
+        if (index == 1){
+          if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
+            this.$message.error("当前处方为项目，无法切换为药品，需要新开处方")
+            return
+          }
+        }else{
+          if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
+            this.$message.error("当前处方为药品，无法切换为项目，需要新开处方")
+            return
+          }
+
+
+        }
+
         if (index == 1) {
+
+            this.teamList = []
+          this.$refs.tables.clearSelection()
+
           this.showOne = true
           this.showTwo = false
           this.$nextTick(() => {
@@ -534,6 +608,9 @@
           this.customTabIndex = 1
         }
         if (index == 2) {
+          this.curDrugs = []
+          this.$refs.multipleTable.clearSelection()
+
           this.showTwo = true
           this.showOne = false
           this.$nextTick(() => {
@@ -545,17 +622,22 @@
 
         //用来区分处方属于项目还是药品
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-
           this.customTabIndex = 1
+          this.curStatus =1
+
         }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
-
           this.customTabIndex = 2
+          this.curStatus =2
         }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           // this.customTabIndex = this.rightTab
           this.customTabIndex = index
+          this.curStatus =0
+
         }
+
+
       }, changeAllGoodInfoTableData: function(selection) {
         this.curDrugs = selection
       }, addCharges() {
@@ -565,9 +647,7 @@
         this.curDrugs = selection
       },
       comfirm() {
-        console.log(this.curStatus)
-        console.log(this.rightTab)
-        console.log(this.curPrescriptions)
+
 
 
         if (this.curStatus == 1  && this.rightTab == 2) {
@@ -589,6 +669,7 @@
             var temp = this.deepClone(this.curDrugs)
             var temp2 = this.deepClone(this.teamList)
 
+            console.log(temp2)
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
                 let obj = {
@@ -602,7 +683,8 @@
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].min_unit,
-                  min_unit: temp[b].min_unit
+                  min_unit: temp[b].min_unit,
+                  medical_insurance_number:temp[b].medical_insurance_number,
 
                 }
                 this.prescriptions[i].advices.push(obj)
@@ -612,10 +694,26 @@
 
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
-                this.prescriptions[i].project.push(temp2[b])
+                let obj = {
+                  id: 0,
+                  project_id: temp2[b].id,
+                  project_name: temp2[b].project_name,
+                  statistical_classification: temp2[b].statistical_classification,
+                  single_dose: temp2[b].single_dose,
+                  delivery_way: temp2[b].delivery_way,
+                  execution_frequency: temp2[b].execution_frequency,
+                  number_days: temp2[b].number_days,
+                  total:temp2[b].total,
+                  price:temp2[b].price,
+                  remark:"",
+                  medical_code:temp2[b].medical_code,
+                }
+                console.log(obj)
+                this.prescriptions[i].project.push(obj)
               }
               this.curStatus = 2
             }
+
             this.curPrescriptions = this.prescriptions[i]
             this.$refs.multipleTable.clearSelection()
             this.$refs.tables.clearSelection()

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -51,7 +51,7 @@
                                 <el-button type="primary" size="mini" @click="toHistoryDetail">详情</el-button>
                             </template>
                         </el-table-column>
-                    </el-table> 
+                    </el-table>
                 </el-tab-pane>
                 <el-tab-pane label="病历模板" name="second">
                     <div style="display:flex;align-items: center;margin-bottom:10px;">
@@ -106,7 +106,7 @@
             <el-button @click="hide">取 消</el-button>
             <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
         </div>
-    </el-dialog>         
+    </el-dialog>
 </template>
 
 <script>
@@ -119,6 +119,7 @@ export default {
     },
     data(){
         return{
+          submitLoading:false,
             visible:false,
             activeName:'first',
             form:{

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -2,17 +2,17 @@
   <div class="prescriptionTable">
     <el-table v-if="activeType  == 1" :data="prescription.advices" border style="width: 99%;" :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="名称">
+      <el-table-column align="center" prop="drug_name" label="名称">
         <template slot-scope="scope">{{ scope.row.drug_name }}</template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
+      <el-table-column align="center" prop="single_dose" width="50" :label="'单次\n用量'">
         <template slot-scope="scope">
           <el-input  v-model="scope.row.single_dose"></el-input>
           <div> {{scope.row.min_unit}}</div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="用法">
+      <el-table-column align="center" prop="delivery_way" width="50" label="用法">
         <template slot-scope="scope">
           <el-select v-model="scope.row.delivery_way" placeholder="请选择">
             <el-option
@@ -24,7 +24,7 @@
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="频率">
+      <el-table-column align="center" prop="execution_frequency" width="50" label="频率">
         <template slot-scope="scope">
           <el-select v-model="scope.row.execution_frequency" placehold er="请选择">
             <el-option
@@ -37,7 +37,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column align="center" prop="name" width="100" label="总量">
+      <el-table-column align="center" prop="prescribing_number" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
             <el-input v-model="scope.row.prescribing_number" style="width:50%" placeholder=""></el-input>
@@ -45,12 +45,12 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="单价">
+      <el-table-column align="center" prop="retail_price" width="50" label="单价">
         <template slot-scope="scope">
           <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="name" width="50" label="备注">
+      <el-table-column align="center" prop="remark" width="50" label="备注">
         <template slot-scope="scope">
           <el-input v-model="scope.row.remark" style="width:50%" placeholder=""></el-input>
         </template>
@@ -196,29 +196,32 @@
         })
 
       },deleteDrug:function(index, row){
-        console.log(row)
-       console.log(index)
 
-       if(row.advice_id == 0){
-          this.prescription.advices.splice(index, 1)
-        }else{
-          let params = {
-            'id': row.advice_id,
-          }
-          delHisAdvice(params).then(response => {
-            if (response.data.state == 0) {
-              this.$message.error(response.data.msg)
-              return false
-            } else {
-              var temp2 = this.deepClone(this.prescription.advices)
-              temp2.splice(index, 1)
-              this.prescription.advices = temp2
-              this.$message.success(response.data.data.msg)
-            }
-          })
+       this.$nextTick(function(){
+         this.prescription.advices.splice(index, 1)
+         // if(row.advice_id == 0){
+         // }else{
+         //   let params = {
+         //     'id': row.advice_id,
+         //   }
+         //   delHisAdvice(params).then(response => {
+         //     if (response.data.state == 0) {
+         //       this.$message.error(response.data.msg)
+         //       return false
+         //     } else {
+         //       var temp2 = this.deepClone(this.prescription.advices)
+         //       temp2.splice(index, 1)
+         //       this.prescription.advices = temp2
+         //       this.$message.success(response.data.data.msg)
+         //     }
+         //   })
+         //
+         //
+         // }
+
+       });
 
 
-        }
 
       },deepClone(source) {
        if (!source && typeof source !== 'object') {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -155,7 +155,6 @@
           'record_date': this.record_date,
           'patient_id': val.patients.id
         }
-        console.log("-------")
         getPatientInfo(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -203,6 +202,8 @@
               for (let i = 0; i < response.data.data.prescription.length; i++) {
                 var prescription = response.data.data.prescription[i]
                 let tempAdvice = []
+                let tempProject = []
+
                 for (let b = 0; b < prescription.advices.length; b++) {
                   let obj = {
                     advice_id: prescription.advices[b].id,
@@ -212,20 +213,45 @@
                     execution_frequency: prescription.advices[b].execution_frequency,
                     retail_price: prescription.advices[b].price.toString(),
                     remark: prescription.advices[b].remark,
-                    prescribing_number:prescription.advices[b].prescribing_number,
+                    prescribing_number:prescription.advices[b].prescribing_number.toString(),
                     single_dose_unit:prescription.advices[b].single_dose_unit,
                     prescribing_number_unit:prescription.advices[b].prescribing_number_unit,
-                    min_unit:prescription.advices[b].single_dose_unit
+                    min_unit:prescription.advices[b].single_dose_unit,
+                    medical_insurance_number:prescription.advices[b].med_list_codg,
 
                   }
                   tempAdvice.push(obj)
                 }
+
+
+                for (let b = 0; b < prescription.project.length; b++) {
+                  console.log(prescription.project[b])
+                  console.log(prescription.project[b].project)
+                  let obj = {
+                    id: prescription.project[b].id,
+                    project_id: prescription.project[b].project.id,
+                    project_name: prescription.project[b].project.project_name,
+                    statistical_classification: prescription.project[b].project.statistical_classification,
+                    single_dose: prescription.project[b].project.single_dose,
+                    delivery_way: prescription.project[b].project.delivery_way,
+                    execution_frequency: prescription.project[b].project.execution_frequency,
+                    number_days: prescription.project[b].project.number_days,
+                    total:prescription.project[b].count.toString(),
+                    price:prescription.project[b].price,
+                    remark:prescription.project[b].remark,
+                    medical_code:prescription.project[b].project.medical_code,
+                  }
+                  tempProject.push(obj)
+                }
+
+
+
                 let index = i + 1
                 let obj = {
                   id: prescription.id,
                   name: '处方' + index,
                   advices: tempAdvice,
-                  project: prescription.project
+                  project: tempProject
                 }
                 this.prescriptions.push(obj)
               }