1

src/utils/tools.js

@@ -175,3 +175,28 @@ export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
   // console.log((shouji + (shichang - t) * weichi).toFixed(1))
   return (shouji + (shichang - t) * weichi).toFixed(1)
 }
+
+
+export function formatDate (date, format) {
+  if (/(y+)/.test(format)) {
+      format= format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds()
+  };
+  for (let k in o) {
+      if (new RegExp(`(${k})`).test(format)) {
+          let str = o[k] + '';
+          format= format.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+      }
+  }
+  return format;
+};
+
+function padLeftZero (str) {
+  return ('00' + str).substr(str.length);
+};

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -561,22 +561,22 @@
             this.department = response.data.data.department
             this.sick = response.data.data.sick
             this.additions = response.data.data.additions
-            var info = response.data.data.info
-            if (info.user_type == 2 || info.user_type == 1) {
-              this.doctorValue = info.admin_user_id
-              if (info.department_id == 0) {
-                if (this.department.length > 0) {
-                  this.departmentValue = this.department[0].id
-                } else {
-                  this.departmentValue = ''
-
-                }
-              } else {
-                this.departmentValue = info.department_id
-              }
-            }else{
-              this.doctorValue = this.doctors[0].admin_user_id
-            }
+            // var info = response.data.data.info
+            // if (info.user_type == 2 || info.user_type == 1) {
+            //   this.doctorValue = info.admin_user_id
+            //   if (info.department_id == 0) {
+            //     if (this.department.length > 0) {
+            //       this.departmentValue = this.department[0].id
+            //     } else {
+            //       this.departmentValue = ''
+            //
+            //     }
+            //   } else {
+            //     this.departmentValue = info.department_id
+            //   }
+            // }else{
+            //   this.doctorValue = this.doctors[0].admin_user_id
+            // }
           }
         })
 
@@ -630,14 +630,13 @@
         this.teamList = []
 
       },
-      setData(data, info) {
+      setData(data, info, admin_info,doctors,department) {
         this.prescription_id = data[0].id
         this.editableTabsValue = "处方1"
         this.$emit('event1', this.prescription_id)
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
-        console.log( this.curPrescriptions)
 
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
@@ -645,7 +644,6 @@
           this.rightTab = 1
           this.showOne = true
           this.showTwo = false
-
         }
 
         if (this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0) {
@@ -655,23 +653,19 @@
           this.showOne = false
           this.showTwo = true
         }
-
         this.state1 = info.diagnosis
         this.state2 = info.sick_history
-        this.doctorValue = info.doctor_id
-        this.departmentValue = info.departmentValue
-
-        if(this.doctorValue == 0){
 
-        }
 
         this.register_type = info.register_type
 
+        if(info.prescription_status == 0){
+          this.order_status = ''
+        }
+
         if (info.prescription_status == 1 || info.prescription_status == 2) {
           this.order_status = '未收费'
-
         }
-
         if (info.prescription_status == 3) {
           this.order_status = '已结算'
         }
@@ -680,10 +674,40 @@
           this.order_status = '已退费'
         }
 
-        // console.log(this.$refs)
-        // this.$nextTick(() => {
-        //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
-        // })
+        if(info.id > 0){
+          this.doctorValue = info.doctor_id
+          this.departmentValue = info.department
+        }else{
+          this.doctorValue = ''
+          this.departmentValue = ''
+
+          if (admin_info.user_type == 2 || admin_info.user_type == 1) {
+            this.doctorValue = admin_info.admin_user_id
+            if (admin_info.department_id == 0) {
+              if (this.department.length > 0) {
+                this.departmentValue = department[0].id
+              } else {
+                this.departmentValue = ''
+              }
+            } else {
+              this.departmentValue = admin_info.department_id
+            }
+          }else{
+            this.doctorValue = doctors[0].admin_user_id
+          }
+
+          if(this.doctorValue == 0){
+            this.doctorValue = ''
+          }
+
+
+
+        }
+
+
+
+
+
       },
       moreState(tab, event) {
         if (tab == 'more') {
@@ -1155,13 +1179,15 @@
           }
         })
       }, changeDoctor(val) {
-        console.log(val)
-        console.log(this.doctors)
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.doctorValue) {
             this.departmentValue = this.doctors[i].department_id
           }
         }
+
+        if(this.departmentValue == 0){
+          this.departmentValue = ""
+        }
       }
     },mounted(){
       this.getInitData()

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -45,7 +45,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="医保证号: " prop="name">
-        <el-input v-model="patientInfo.home_address" placeholder="" readonly></el-input>
+        <el-input v-model="patientInfo.health_care_no" placeholder="" readonly></el-input>
       </el-form-item>
       <el-form-item label="家庭住址: " prop="name">
         <el-input v-model="patientInfo.home_address" placeholder="" readonly></el-input>
@@ -138,7 +138,7 @@
           type="textarea"
           :rows="2"
           placeholder="请输入内容"
-          v-model="doctor_advice">
+          v-model="case_history.doctor_advice">
         </el-input>
       </el-form-item>
        <el-form-item label="备注:" prop="name" style="width:100%;">
@@ -146,7 +146,7 @@
           type="textarea"
           :rows="2"
           placeholder="请输入内容"
-          v-model="remark">
+          v-model="case_history.remark">
         </el-input>
       </el-form-item>
     </el-form>
@@ -254,8 +254,8 @@
             "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.case_history.doctor_advice,
+            "remark":this.case_history.remark
           }
 
           createCaseHistory(params).then(response => {

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,13 +25,11 @@
           <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="commonCell">
           <p style="color:#409EFF;">基本信息</p>
           <div class="detailMain">
@@ -84,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>
@@ -114,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 },
@@ -146,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) {
@@ -210,6 +214,7 @@
             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)
 
@@ -279,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>

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -87,7 +87,7 @@
                             <template slot-scope="scope">{{ scope.row.user_name }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="创建日期">
-                            <template slot-scope="scope">{{ scope.row.record_date }}</template>
+                            <template slot-scope="scope">{{getTimes(scope.row.record_date) }}</template>
                         </el-table-column>
                         <el-table-column align="center" prop="name" label="模板说明">
                             <template slot-scope="scope">{{ scope.row.template_remark }}</template>
@@ -115,6 +115,7 @@
 import recordHistoryDetail from './recordHistoryDetail'
 import recordTemplateDetail from './recordTemplateDetail'
 import { getHistoryTemplate } from "@/api/project/project"
+import { uParseTime } from '@/utils/tools'
 export default {
     components:{
         recordHistoryDetail,
@@ -192,7 +193,10 @@ export default {
         },
         changeEndTime(){
           this.getlist()
-        }
+        },
+        getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
+      },
     },
     created(){
        console.log("99999999999999999")

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -173,13 +173,15 @@
         templatedetail:{},
         detalid:0,
         prescription_id:0,
-
+        doctors:[],
+        department:[],
         patientid:0,
         prescriptionList:[],
         centerDialogVisible:false,
         tableData:[],
         selecting_schs: [],
         index:0,
+        admin_info:{},
       }
     },
     methods: {
@@ -227,6 +229,8 @@
             this.patientTableDataTwo = response.data.data.list
             this.cal_one = response.data.data.total_one
             this.cal_two =  response.data.data.total_two
+            this.admin_info =  response.data.data.info
+
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
 
             if(this.patientTableData.length > 0) {
@@ -258,6 +262,9 @@
             this.case_history = response.data.data.case_history
 
             this.info = response.data.data.info
+            this.doctors = response.data.data.doctors
+            this.department = response.data.data.department
+
 
 
 
@@ -380,7 +387,7 @@
 
 
 
-            this.$refs.prescriptions.setData(this.prescriptions,this.info)
+            this.$refs.prescriptions.setData(this.prescriptions,this.info,this.admin_info,this.doctors,this.department)
           }
         })
 
@@ -670,8 +677,6 @@
 
       this.diagnoses = this.getDictionaryDataConfig('system', 'diagnose')
       this.other_sick = this.getDictionaryDataConfig('system', 'other_sick_history')
-
-      console.log('1222232434234',document.documentElement.clientHeight)
       let tableHeight = document.body.clientHeight - 263
       this.tableHeight = tableHeight
 

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>
@@ -98,11 +98,12 @@ export default {
     props:{
       patient:Object,
       hispatient:Object,
-      history:Object,
+    //   history:Object,
     },
     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");

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -31,12 +31,12 @@
 
           </div>
           <div class="doctorBox">
-              <p>医师：{{getDoctor(item.doctor)?getDoctor(item.doctor):""}}</p>
+              <p>医师：{{item.doctor?item.doctor:""}}</p>
               <p>日期：{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
           </div>
           <div class="actionBar">
                  <p>审核：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
-                 <p>配对：{{getDoctor(item.advices[0].advice_doctor)?getDoctor(item.advices[0].advice_doctor):""}}</p>
+                 <p>配对：</p>
                  <p>核对：{{getDoctor(item.advices[0].checker)?getDoctor(item.advices[0].checker):""}}</p>
                  <p>发药：{{getDoctor(item.advices[0].execution_staff)?getDoctor(item.advices[0].execution_staff):""}}</p>
                  <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
@@ -149,7 +149,7 @@ export default {
        return name
      },
      getTotalOne(id) {
-        
+        console.log("处方数据",this.prescriptions)
         var total = 0
         var addtotal = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -167,6 +167,7 @@ export default {
             }
               addtotal =  Math.floor(addtotal * 100) / 100
         }
+        
         return total + addtotal
        }
       }, 

src/xt_pages/outpatientDoctorStation/template/printTwo.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="actionBar">
             <p>审核：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
-            <p>配对：{{getDoctor(advicePrint[0].advice_doctor)?getDoctor(advicePrint[0].advice_doctor):""}}</p>
+            <p>配对:</p>
             <p>核对：{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
             <p>发药：{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
             <p>药费：{{advicePrint[0].price?advicePrint[0].price:""}}</p>

src/xt_pages/outpatientRegistration/index.vue

@@ -529,6 +529,8 @@ export default {
                      this.form.total= "" ,
                      this.form.phone = "",
                      this.form.social_type = ""
+                   }else{
+                       this.$message.error("今日患者已挂号!")
                    }
                 })
              }
@@ -561,6 +563,11 @@ export default {
          }
       },
       changeName(id){
+            this.form.sex = ""
+            this.form.age = ""
+            this.form.birthday = ""
+            this.form.phone = ""
+            this.form.idCard = ""
         getPatientDetail(id).then(response=>{
            if(response.data.state == 1){
              var patient =  response.data.data.patient

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -99,7 +99,8 @@
                 </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 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
+                        <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @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" >已就诊</el-button>  
                     </template>
@@ -181,7 +182,8 @@ export default {
             }],
             
             tablePatient:[],
-            creator:""
+            creator:"",
+            startUnix:''
         }
     },
     created(){
@@ -198,7 +200,10 @@ export default {
        //获取所有挂号号的患者
 
        this.creator = this.$store.getters.xt_user.user.user_name
-    
+       var today = moment().startOf('day').format('YYYY-MM-DD')
+       var todayUnix = Date.parse(today)/1000 
+       this.startUnix = todayUnix - 28800
+      
        this.getlist()
     },
     methods:{
@@ -254,6 +259,7 @@ export default {
           getHisPatientHistory(params).then(response=>{
              if(response.data.state == 1){
                 var history = response.data.data.history
+
                 console.log("history",history)
                 this.tableData = history
                 var total =  response.data.data.total
@@ -345,7 +351,7 @@ export default {
       handleSelect(val){   
           this.search_input = val.name
           this.getlist()
-        },
+       },
 
     }
 }