Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -6,7 +6,7 @@
     :before-close="_close"
     class="detailDialog"
   >
-    <div style="position: absolute;right:20px;">
+    <div style="position: absolute;right:20px;z-index:99">
       <el-button v-if="activeName == 'first'" @click="open(1)" type="primary">打印</el-button>
       <el-button v-if="activeName == 'second'" @click="open(2)" type="primary">打印</el-button>
     </div>
@@ -25,31 +25,29 @@
           <div class="RP">
             Rp
           </div>
-          <new-prescription-table ref="prescription_tables"
-                                  :prescription="curPrescriptions"></new-prescription-table>
+          <new-prescription-table ref="prescription_tables" :prescription="curPrescriptions"></new-prescription-table>
         </el-tabs>
 
       </el-tab-pane>
       <el-tab-pane label="病历详情" name="second">
-        <div class="detailMain">
-          <span style="width:240px;">处方号：{{order.prescription_number}}</span>
-          <span style="width:200px;">医生：{{order.doctor}}</span>
-          <span style="width:200px;">科室：{{order.departments}}</span>
-          <span style="width:200px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
-        </div>
         <div class="commonCell">
-          <p>基本信息</p>
+          <p style="color:#409EFF;">基本信息</p>
           <div class="detailMain">
-            <span style="width:240px;">疾病名称：{{case_history.diagnostic}}</span>
-            <span style="width:200px;">症状：{{case_history.diagnostic}}</span>
-            <span style="width:200px;">发病日期：{{getTimes(case_history.sick_date,"{y}-{m}-{d}")}}</span>
-            <span style="width:200px;" v-if="case_history.is_infect== 1">是否传染：是</span>
-          <span style="width:200px;" v-if="case_history.is_infect != 1">是否传染：否</span>
+            <span style="width:260px;">处方号：{{order.prescription_number}}</span>
+            <span style="width:180px;">姓名：{{order.patient.name}}</span>
+            <span style="width:240px;">证件号：{{order.patient.id_card_no}}</span>
+            <span style="width:180px;">联系电话：{{order.patient.phone}}</span>
+            <span style="width:260px;">医生：{{order.doctor}}</span>
+            <span style="width:180px;">科室：{{order.departments}}</span>
+            <span style="width:240px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
+            <!-- <span style="width:180px;">疾病名称：{{case_history.diagnostic}}</span>
+            <span style="width:180px;">症状：{{case_history.diagnostic}}</span> -->
+            
 
           </div>
         </div>
         <div class="commonCell">
-          <p>体格信息</p>
+          <p style="color:#409EFF;">体格信息</p>
           <div class="detailMain">
             <span style="width:140px;">体温：{{case_history.temperature}}℃</span>
             <span style="width:140px;">呼吸：{{case_history.breathing}} 次/分</span>
@@ -58,6 +56,14 @@
             <span style="width:200px;">血压：{{case_history.sbp}}~{{case_history.dbp}} mmHg</span>
           </div>
         </div>
+        <div class="commonCell">
+          <p style="color:#409EFF;">病历信息</p>
+          <div class="detailMain">
+            <span style="width:260px;" v-if="case_history.is_infect== 1">是否传染：是</span>
+            <span style="width:260px;" v-if="case_history.is_infect != 1">是否传染：否</span>
+            <span style="width:180px;">发病日期：{{getTimes(case_history.sick_date,"{y}-{m}-{d}")}}</span>
+          </div>
+        </div>
         <div class="commonCell">
           <p>主诉</p>
           <div>{{case_history.chief_conplaint}}</div>
@@ -76,7 +82,7 @@
         </div>
         <div class="commonCell">
           <p>过敏史</p>
-          <div>{{order.sick_history}}</div>
+          <div>{{case_history.past_history}}</div>
         </div>
         <div class="commonCell">
           <p>既往史</p>
@@ -106,6 +112,8 @@
   import { getHisPrescriptionInfo } from '@/api/his/his'
   import NewPrescriptionTable from './newPrescriptionTable'
   import { uParseTime } from '@/utils/tools'
+ import { getAllDoctorList } from "@/api/project/project"
+import moment from 'moment';
 
   export default {
     components: { NewPrescriptionTable },
@@ -138,14 +146,18 @@
         search_input: '',
         case_history:{},
         order:{},
+        doctorList:[],
+        departmentList:[]
       }
     },
     methods: {
       open(index){
         if(index == 1){
 
+          //  /outpatientDoctorStation/print?record=2020-12-11&prescription_id=157&ids=157,159&patient_id=1064
         }else if(index == 2){
-
+           var record_date = this.format(this.case_history.sick_date)    
+          this.$router.push("/outpatientDoctorStation/recordPrint?record="+record_date+"&patient_id="+this.case_history.patient_id)
         }
       },
       getTimes(time,temp) {
@@ -202,7 +214,9 @@
             this.patientInfo = response.data.data.order.patient
             this.hisPatientInfo = response.data.data.order.his_patient
             this.case_history = response.data.data.order.case_history
+            console.log("历史详情",this.case_history)
             this.order = response.data.data.order
+            console.log('this.order',this.order)
 
 
             this.prescriptions = []
@@ -270,6 +284,36 @@
         // this.clear()
         this.visible = false
       },
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+            var doctor =  response.data.data.doctor 
+            this.doctorList = doctor
+             var department = response.data.data.department
+             console.log("department",department)
+             this.departmentList = department
+            }
+         })   
+      },
+      getDepartMent(id){
+         var name = ""
+         for(let i=0;i<this.departmentList.length;i++){
+           if(id == this.departmentList[i].id){
+              name = this.departmentList[i].name
+           }
+         }
+         return name
+      },
+
+      format(time){
+        moment.locale()
+        var times = time*1000
+        times = moment(times).format('YYYY-MM-DD')
+        return times
+      }
+    },
+    created(){
+      this.getAllDoctorList()
     }
   }
 </script>
@@ -283,6 +327,7 @@
   }
 
   .detailMain {
+    flex: 1;
   span {
     display: inline-block;
   }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -23,7 +23,7 @@
           </el-button>
         </div>
         <div>
-          <el-table :data="patientTableData" :height="tableHeight" @row-click='choosePatient' border style="width: 100%;"
+          <el-table :data="patientTableData" :height="tableHeight" @row-click='choosePatient' @current-change='currentChange' border style="width: 100%;"
                     :row-style="{ color: '#303133' }"
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                     highlight-current-row
@@ -259,6 +259,7 @@
 
             if(this.patientTableData.length > 0) {
               this.$refs.tab.setCurrentRow(this.patientTableData[0])
+              this.oldCurrentRow = this.patientTableData[0]
               this.getPatientInfo(this.patientTableData[0])
             }
 
@@ -417,18 +418,25 @@
 
 
       },
+
       choosePatient(val) {
-        // let isShowDailog = false
-        // for (let i = 0; i < this.prescriptions.length; i++){
-        //   if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
-        //     isShowDailog = true
-        //   }
-        // }
-        // if(isShowDailog){
-        //   this.$message.error('需要保存当前处方才能切换')
-        //   return
-        // }
-        //
+        let isShowDailog = false
+        for (let i = 0; i < this.prescriptions.length; i++){
+          if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
+            isShowDailog = true
+          }
+        }
+        if(isShowDailog){
+
+          this.patientTableData.map((item,index) => {
+            if(item.patient_id == this.oldCurrentRow.patient_id){
+              this.$refs.tab.setCurrentRow(this.patientTableData[index])
+            }
+          })
+          this.$message.error('需要保存当前处方才能切换')
+          return
+        }
+
 
         this.patientid = val.patients.id
         let params = {
@@ -562,6 +570,20 @@
             this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
+      },
+      currentChange(currentRow, oldCurrentRow){
+        let isShowDailog = false
+        for (let i = 0; i < this.prescriptions.length; i++){
+          if((this.prescriptions[i].id == 0 && this.prescriptions[i].advices.length > 0) || (this.prescriptions[i].id == 0 && this.prescriptions[i].project.length > 0)){
+            isShowDailog = true
+          }
+        }
+        if(!isShowDailog){
+          this.oldCurrentRow = currentRow
+          return
+        }
+
+
       },
       open(index) {
         console.log("index0999999",this.prescriptions)

src/xt_pages/outpatientDoctorStation/recordTemplate/printOne.vue

@@ -41,7 +41,7 @@
 
         <div class="printTitle">病历内容</div>
         <div class="recordTitle">
-            <div>科别：{{hispatient.departments?hispatient.departments:''}}</div>
+            <div>科别：{{getDeparment(hispatient.departments)?getDeparment(hispatient.departments):''}}</div>
             <div>姓名：{{patient.name?patient.name:''}}</div>
             <div>性别：
                 <span v-if="patient.gender == 1">男</span>
@@ -102,7 +102,8 @@ export default {
     },
     data(){
         return{
-            educationOptions:[]
+            educationOptions:[],
+            departmentList:[]
         }                   
     },
     methods:{
@@ -121,9 +122,9 @@ export default {
                var doctor =  response.data.data.doctor
 
                this.doctorList = doctor
-            //    var department = response.data.data.department
-            //    console.log("department",department)
-            //    this.departmentList = department
+               var department = response.data.data.department
+               console.log("department",department)
+               this.departmentList = department
              }
            })   
        },
@@ -156,6 +157,16 @@ export default {
          }
       })
     },
+    getDeparment(id){
+    console.log("id---",id)
+     var name = ''
+     for(let i=0;i<this.departmentList.length;i++){
+         if(id == this.departmentList[i].id){
+            name = this.departmentList[i].name
+         }
+      }
+      return name
+    }
     },
     created(){
       this.educationOptions = getDataConfig("patient", "education_types");