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

src/store/modules/globalConfig.js

       // 17: { id: 17, name: 'HDF前置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 },
       // 18: { id: 18, name: 'HDF后置换', dialysis_duration: 1, replacement_way: 1, hemodialysis_machine: 2, blood_filter: 1, perfusion_apparatus: 2, blood_flow_volume: 1, dialysate_flow: 1, kalium: 1, sodium: 1, calcium: 1, bicarbonate: 1 }
       20: {
-        id: 19,
+        id: 20,
         name: 'UF',
         dialysis_duration: 1,
         replacement_way: 1,

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

             console.log('project_config',)
             if(project_config.is_open == 1){
               this.project = resp.data.project
+              console.log( this.project)
               let projectArr = []
               this.project.map(item => {
                 resp.data.hisAdvices.map(it => {

src/xt_pages/hospitalStation/doctorDesk.vue

                 </div>
                 <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
                 <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
-                <desk-prescription v-on:setData="setData" :diagnoses="diagnoses" :loading="isloading"
-                                   :sick="sick" :record_date="record_date"
+                <desk-prescription v-on:setData="setData"
+                                   :diagnoses="diagnoses"
+                                   :loading="isloading"
+                                   :sick="sick"
+                                   :record_date="record_date"
                                    :drugs="drugs"
                                    :allDrugs="allDrugs"
                                    :advices_template="advices_template"

src/xt_pages/qcd/basicInformationAnalysis.vue

               <div class="borderBox">
                <div v-for="(item,index) in modetype" :key="index">
                  <span v-if="item.mode_id == 'HD'">
-                    <p>HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HDF'">
-                    <p>HDF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HD+HP'">
-                    <p>HD+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HP'">
-                    <p>HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HF'">
-                    <p>HF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'SCUF'">
                     <p>SCUF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'IUF'">
-                    <p>IUF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>IUF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HFHD'">
                     <p>HFHD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HFHD+HP'">
-                    <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'PHF'">
-                    <p>PHF:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>PHF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                    <span v-if="item.mode_id == 'HFR'">
-                    <p>HFR:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HFR:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HDF+HP'">
-                    <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                    <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                    <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                   <span v-if="item.mode_id == 'HFHD+HP'">
-                      <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HFHD+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                    <span v-if="item.mode_id == '腹水回输'">
-                      <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>腹水回输:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                    <span v-if="item.mode_id == 'HD前置换'">
-                      <p>HD前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HD前置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                     <span v-if="item.mode_id == 'HD后置换'">
-                      <p>HD后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HD后置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                     <span v-if="item.mode_id == 'HDF前置换'">
-                      <p>HDF前置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HDF前置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                     <span v-if="item.mode_id == 'HDF后置换'">
-                      <p>HDF后置换:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+                      <p>HDF后置换:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                    </span>
                    <span v-if="item.mode_id == 'IUF+HD'">
                       <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
                   </span>
-                  <span v-if="item.mode_id == 'CVVHDF'">
-                      <p>IUF+HD:{{item.count}}次({{(item.count/total*100).toFixed(1)}}%)</p>
-                      <el-progress :percentage="(item.count/total*100).toFixed(1)"></el-progress>
+
+                 <span v-if="item.mode_id == 'IU'">
+                      <p>IU:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                  <span v-if="item.mode_id == 'HD+'">
+                      <p>HD+:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == '血浆胆红素吸附+HDF'">
+                      <p>血浆胆红素吸附+HDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == '血浆胆红素吸附'">
+                      <p>血浆胆红素吸附:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'I-HDF'">
+                      <p>I-HDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'HD高通'">
+                      <p>HD高通:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'CVVH'">
+                      <p>CVVH:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == 'CVVHD'">
+                      <p>CVVHD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+
+                 <span v-if="item.mode_id == 'CVVHDF'">
+                      <p>CVVHDF:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                 <span v-if="item.mode_id == '未知'">
+                      <p>未知:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                      <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
                </div>
               </div>
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
        console.log("本月最后一天",timeEnd)
+
+      this.startDate  = startDate
+      this.endDate = endDate
+      this.listQuery.start_time = startDate
+      this.listQuery.end_time = endDate
       //本月
       if(state == 0){
        //统计透析总量
         // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
+        this.startDate  = startDate
+        this.endDate = endDate
+        this.listQuery.start_time = startDate
+        this.listQuery.end_time = endDate
          //统计透析总量
         this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
         // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
+       this.startDate  = startDate
+       this.endDate = endDate
+       this.listQuery.start_time = startDate
+       this.listQuery.end_time = endDate
          //统计透析总量
         this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
         // console.log("结束时间",endDate)
          var endunitx = Date.parse(endDate)/1000
         // console.log("日期时间搓",endunitx)
+       this.startDate  = startDate
+       this.endDate = endDate
+       this.listQuery.start_time = startDate
+       this.listQuery.end_time = endDate
          //统计透析总量
         this.getDialysisModeType(startDate,endDate,this.lapsetoType,this.sourceType)
          //统计转归状态
       getDialysisModeType(startDate,endDate,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
 
-          var modetype =  response.data.data.modetype
-          console.log("modetype",modetype)
-          this.modetype = modetype
+          // var modetype =  response.data.data.modetype
+          // console.log("modetype",modetype)
+
           var total =  response.data.data.total
           console.log("total",total)
           this.total = total.count
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
           for(let i=0;i<modedate.length;i++){
+            if(modedate[i].mode_id == 0){
+              modedate[i].mode_id = "未知"
+            }
             if(modedate[i].mode_id == 1){
                modedate[i].mode_id = "HD"
             }
            if(modedate[i].mode_id == 19){
                modedate[i].mode_id = "IUF+HD"
             }
+
+            if(modedate[i].mode_id == 20){
+              modedate[i].mode_id = "IU"
+            }
+
+            if(modedate[i].mode_id == 21){
+              modedate[i].mode_id = "HD+"
+            }
+
+            if(modedate[i].mode_id == 22){
+              modedate[i].mode_id = "血浆胆红素吸附+HDF"
+            }
+
+            if(modedate[i].mode_id == 23){
+              modedate[i].mode_id = "血浆胆红素吸附"
+            }
+
+            if(modedate[i].mode_id == 24){
+              modedate[i].mode_id = "I-HDF"
+            }
+
+            if(modedate[i].mode_id == 25){
+              modedate[i].mode_id = "HD高通"
+            }
+
+            if(modedate[i].mode_id == 26){
+              modedate[i].mode_id = "CVVH"
+            }
+
+            if(modedate[i].mode_id == 27){
+              modedate[i].mode_id = "CVVHD"
+            }
+
+            if(modedate[i].mode_id == 28){
+              modedate[i].mode_id = "CVVHDF"
+            }
+            this.modetype = modedate
+
             // this.modesData.xAxis.push(modedate[i].mode_id)
             // this.modesData.series.push(((modedate[i].count/total)*100).toFixed(1))
           }