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/deskRecord.vue

        this.getlist()
        this.getInitData()
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-       console.log("232322323",this)
+       this.allergic_history = this.case_history.allergic_history
        if(this.patientInfo.gender = 1){
          this.patientInfo.gender = '男'
        }else if(this.patientInfo.gender = 2){

src/xt_pages/qcd/basicInformationAnalysis.vue

       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-      // console.log("本月最后一天",timeEnd)
+        console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量