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

src/api/patient.js

     params: params
   })
 }
+

src/xt_pages/stock/detail/cancelStockDetail.vue

         style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
-        placeholder="单据编码/制单人/规格名称"
+        placeholder="单据编码/制单人/规格名称/耗材名称"
       />
       <el-button
         size="small"
         type: this.type,
         keywords: this.searchKey
       };
-      console.log("param2323232222332",params)
+     
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {

src/xt_pages/stock/detail/stockInDetail.vue

         style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
-        placeholder="单据编码/制单人/规格名称"
+        placeholder="单据编码/制单人/规格名称/耗材名称"
       />
       <el-button
         size="small"

src/xt_pages/stock/detail/stockOutDetail.vue

         style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
-        placeholder="单据编码/制单人/规格名称"
+        placeholder="单据编码/制单人/规格名称/耗材名称"
       />
       <el-button
         size="small"

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

         style="width: 400px;"
         class="filter-item"
         v-model.trim="searchKey"
-        placeholder="单据编码/制单人/规格名称"
+        placeholder="单据编码/制单人/药品名称"
       />
       <el-button
         size="small"

src/xt_pages/user/hospitalSummary.vue

               </el-date-picker>   
             </div>
             <div class="cell clearfix" style="margin-top:10px">
-              <label class="title"><span class="name">病案号:</span> : </label>
+              <label class="title"><span class="name">病案号</span> : </label>
               <el-input v-model="form.sick_personnel" style="width:200px"></el-input>
             
               <label class="title"><span class="name">X线</span> : </label>
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
 
-  import { createHospitalSummary,getHospitalSummaryList,getHospitalSummaryDetail,updateHospitalSummary,deleteHospitalSummary } from '@/api/patient'
+  import { createHospitalSummary,getHospitalSummaryList,getHospitalSummaryDetail,updateHospitalSummary,deleteHospitalSummary,getPatientInfo } from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { uParseTime } from '@/utils/tools'
        doctorList:[],
        hosDetail:{},
        ids:"",
+       patient:{},
       }
     },
     created() {
      
- 
       this.patient_id = this.$route.params && this.$route.params.id
-      console.log("患者2332323",this.$store.getters.configlist.admitting_diagnosis)
+
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
       
      this.getAllDoctorList()
      this.getlist()
+     this.getPatientSummaryById()
     },
     methods: {
       getTime(val) {
         this.form.discharge_advice = content
       },
       createAction(){
-         console.log("hh23h",this.templates)
+       
          var admitting_diagnosis_id = ""
          var discharge_diagnosis_id = ""
          var diagnosis_admission_id = ""
          if(this.form.dean == ""){
            this.form.dean = 0
          }
-         console.log("hhj232322323",this.form.admitting_diagnosis_id)
+        
          var params = {
           patient_id:parseInt(this.patient_id),
           title:this.form.title,
           ultrasound:this.form.ultrasound,
           pathology:this.form.pathology,
          }
-         console.log("oaram2322323",params)
+  
         
          createHospitalSummary(params).then(response=>{
             if(response.data.state == 1){
             end_time:this.end_time,
             patient_id:parseInt(this.patient_id),
           }
-         console.log("param2233223",params)
         getHospitalSummaryList(params).then(response=>{
            if(response.data.state ==1){
              var list =  response.data.data.list
-             console.log("list23232",list)
              this.tableData = list
            }
         })
         getHospitalSummaryDetail(id).then(response=>{
            if(response.data.state == 1){
              var detail = response.data.data.detail
-             console.log("detial323232232323322323",detail)
+  
              if(detail.doctor == 0){
                this.form.doctor = ""
              }
              this.form.admitting_diagnosis_id = detail.admitting_diagnosis_id
              this.form.admitting_diagnosis = detail.admitting_diagnosis
              this.form.discharge_diagnosis = detail.discharge_diagnosis
-             console.log("出院争端233232",detail.discharge_diagnosis_id)
+           
              this.form.discharge_diagnosis_id = detail.discharge_diagnosis_id
              this.form.diagnosis_admission_id = detail.diagnosis_admission_id
              this.form.diagnosis_admission = detail.diagnosis_admission
-             console.log("详情233232232323",this.form.diagnosis_admission)
+       
              this.form.treatment_id = detail.treatment_id
              this.form.treatment = detail.treatment
              this.form.illness_discharge_id = detail.illness_discharge_id
             }
           }
          }
-        console.log("6666666",this.form.diagnosis_admission_id)
-        console.log("777777777",this.templatesTwo)
-        console.log("8888888",this.$refs.editorSixty.content)
+   
          if(this.templatesTwo!=undefined){
           for(let i=0;i<this.templatesTwo.length;i++){
             if(this.form.diagnosis_admission_id == this.templatesTwo[i].content){
             }
          }
         }
-         console.log("99999999",this.templatesFour)
-         console.log("88888888",this.form.illness_discharge_id)
-         console.log("ffffffff",this.$refs.editorThirty.content)
+   
         if(this.templatesFour!=undefined){
             for(let i=0;i<this.templatesFour.length;i++){
            if(this.form.illness_discharge_id == this.templatesFour[i].content){
           pathology:this.form.pathology,
           record_date:this.form.record_date,
          }
-        console.log("比你强2332322323232",params)
+      
    
         updateHospitalSummary(params).then(response=>{
           if(response.data.state == 1){
         this.form.admission_time = this.getTime(new Date())
         this.form.admission_time = this.getTime(new Date()),
         this.form.discharge_time = this.getTime(new Date()),
+        this.form.sick_personnel = this.patient.dialysis_no
         this.show_dialog = true
+      },
+      getPatientSummaryById(){
+        var params = {
+          patient_id:this.patient_id,
+        }
+        getPatientInfo(params).then(response=>{
+          if(response.data.state == 1){
+            var patient = response.data.data.patient
+            this.patient = patient
+          
+          }
+        })
       }
     },
     watch: {

src/xt_pages/user/hospitalSummaryPrint.vue

     getTimeDay(start,end){
       var count = ""
       count = (end-start)/86400
-      return count
+      return count + 1
     }
   },
  

src/xt_pages/workforce/appointment.vue

           }
         }
 
-        console.log(is_system_zone)
-        console.log(is_device_number)
-        console.log("表头长度",headers.length)
-
-
         if (headers.length > 65 || !is_system_zone || !is_device_number) {