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

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

         </el-col>
         <el-col :span="8" v-if="isShow('透析相关高血压')">
             <el-form-item label="透析相关高血压：">
-             <el-select v-model="form.channel">
+             <el-select v-model="form.hypertenison">
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option
                 v-for="item in option"
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-            </el-select>
+             </el-select>
             </el-form-item>
         </el-col>
          <el-col :span="8" v-if="isShow('透析相关低血压')">
             <el-form-item label="透析相关低血压">
-               
+             <el-select v-model="form.hypopiesia">
+              <el-option :key="0" label="请选择" :value="0"></el-option>
+              <el-option
+                v-for="item in option"
+                :label="item.name"
+                :value="item.id"
+                :key="item.id"
+              ></el-option>
+             </el-select>
             </el-form-item>
         </el-col>
         <el-col :span="8" v-if="isShow('离科方式')">
             <el-form-item label="离科方式">
-               <el-input v-model="form.urr"></el-input>
+               <el-input v-model="form.leave_office_method"></el-input>
             </el-form-item>
         </el-col>
          <el-col :span="8" v-if="isShow('转归')">
             <el-form-item label="转归">
-               <el-input v-model="form.urr"></el-input>
+               <el-input v-model="form.lapse"></el-input>
             </el-form-item>
         </el-col>
         <el-col :span="24" v-if="isShow('KT/V')">

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){
        //统计透析总量