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

src/xt_pages/dialysis/bloodPresssWatch.vue

                     a
                   ].diastolic_blood_pressure.toString();
 
-                SchedualPatientsTable.bp.unshift(bp);
+                SchedualPatientsTable.bp.push(bp);
               }
 
               this.SchedualPatientsTableData.push(SchedualPatientsTable);

src/xt_pages/dialysis/details/NavIgation.vue

       this.$refs.finish_dialog.show(this.dialysis_order);
     },
     showPrescription: function() {
-      this.$refs.prescription.show(this.prescription,this.schedual);
+      this.$refs.prescription.show(this.prescription,this.schedual,this.last_dialysis_prescribe);
     },
     showAccepts: function() {
       this.$refs.accepts.show(this.receiver_treatment_access);

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

       getTime(val) {
         return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
       },
-      show(pre,schedual) {
+      show(pre,schedual,last) {
+        console.log(last)
+        console.log(pre)
+
         if(schedual.schedule_type == 1){
           this.start_time = new Date(2016, 9, 10, 7, 0,0)
           this.advice_start_time = "07:00"
         }
 
         if (this.predialysis == null || this.predialysis.id == 0) {
+          this.dialysisPrescription.niprocart = last.niprocart
+          this.dialysisPrescription.jms = last.jms
+          this.dialysisPrescription.fistula_needle_set = last.fistula_needle_set
+          this.dialysisPrescription.fistula_needle_set_16 = last.fistula_needle_set_16
+          this.dialysisPrescription.hemoperfusion = last.hemoperfusion
+          this.dialysisPrescription.dialyser_sterilised = last.dialyser_sterilised
+          this.dialysisPrescription.filtryzer = last.filtryzer
+          this.dialysisPrescription.target_ktv = last.target_ktv
+          this.dialysisPrescription.dialyzers = last.dialyzers
+          this.dialysisPrescription.injector = last.injector
+          this.dialysisPrescription.bloodlines = last.bloodlines
+          this.dialysisPrescription.tubing_hemodialysis = last.tubing_hemodialysis
+          this.dialysisPrescription.package = last.package
+          this.dialysisPrescription.a_liquid = last.a_liquid
           weight_before = 0
         } else {
           weight_before = this.predialysis.weight_before
             if (response.data.data.solution != null) {
               for (const key in response.data.data.solution) {
                 // 长期处方不为空
-                if (key != 'target_ultrafiltration') {
+                if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms'&& key != 'fistula_needle_set'&& key != 'fistula_needle_set_16'
+                  && key != 'hemoperfusion'&& key != 'dialyser_sterilised'&& key != 'filtryzer'&& key != 'target_ktv'&& key != 'dialyzers'
+                  && key != 'injector'&& key != 'bloodlines'&& key != 'tubing_hemodialysis'&& key != 'package'&& key != 'a_liquid') {
                   this.dialysisPrescription[key] =
                     response.data.data.solution[key]
                 }
               if (response.data.data.prescription != null) {
                 // 临时处方不为空
                 for (const key in response.data.data.prescription) {
-                  if (key != 'target_ultrafiltration') {
+                  if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms'&& key != 'fistula_needle_set'&& key != 'fistula_needle_set_16'
+                    && key != 'hemoperfusion'&& key != 'dialyser_sterilised'&& key != 'filtryzer'&& key != 'target_ktv'&& key != 'dialyzers'
+                    && key != 'injector'&& key != 'bloodlines'&& key != 'tubing_hemodialysis'&& key != 'package'&& key != 'a_liquid') {
                     this.dialysisPrescription[key] =
                       response.data.data.prescription[key]
                   }
                 }
               } else if (response.data.data.system_prescription != null) {
-                // 临时处方不为空
+                // 系统处方不为空
                 for (const key in response.data.data.system_prescription) {
-                  if (key != 'target_ultrafiltration') {
+                  if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms'&& key != 'fistula_needle_set'&& key != 'fistula_needle_set_16'
+                    && key != 'hemoperfusion'&& key != 'dialyser_sterilised'&& key != 'filtryzer'&& key != 'target_ktv'&& key != 'dialyzers'
+                    && key != 'injector'&& key != 'bloodlines'&& key != 'tubing_hemodialysis'&& key != 'package'&& key != 'a_liquid') {
                     this.dialysisPrescription[key] =
                       response.data.data.system_prescription[key]
                   }
               } else {
                 for (const key in this.dialysisPrescription) {
                   // 临时处方为空
-                  if (key != 'target_ultrafiltration') {
+                  if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms'&& key != 'fistula_needle_set'&& key != 'fistula_needle_set_16'
+                    && key != 'hemoperfusion'&& key != 'dialyser_sterilised'&& key != 'filtryzer'&& key != 'target_ktv'&& key != 'dialyzers'
+                    && key != 'injector'&& key != 'bloodlines'&& key != 'tubing_hemodialysis'&& key != 'package'&& key != 'a_liquid') {
                     this.dialysisPrescription[key] = ''
                   }
                 }

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

             </el-autocomplete>
           </el-form-item>
         </el-form>
-
       </div>
 
       <div class="cell clearfix">
       <el-container>
         <div style="width:160px">
           <div class="tableTitle">患者列表</div>
-          
+
 
           <el-table ref="table" :data="patientsData" border style="width: 100%;" height="500"
                     :row-style="{ color: '#303133' }"
         </div>
         <div style="padding-left:10px;flex:1">
           <div class="tableTitle">统计图<span style="font-weight:normal">&nbsp;&nbsp;（当前患者: {{patient_name}}）</span></div>
+
+          <div class="tableTitle"><span style="font-weight:normal">{{item_name}} {{range_value}}</span></div>
+
           <div>
             <!--<line-chart :options="options2"></line-chart>-->
             <line-chart v-if="this.$route.query.range_type == 1" :options="options"></line-chart>
     },
     data() {
       return {
+        item_name:"",
+        range_value:"",
         custom_chart_data_color: [],
         patient_name: '',
         options2: {
               }else{
                 this.getArrLength(this.options2.xAxis.data,this.$route.query.range_type)
               }
-              console.log(this.options.xAxis.data)
-
-              console.log(this.options.series[0].data)
 
               //获取无法确定选项的颜色
               if (this.query.range_type == 2) {
           }
         }
 
-      }
+      },GetInspectionIndexInit() {
+        GetInspectionIndexInit()
+          .then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
+              this.all_inspection_reference = resp.data.references
+              for (let i = 0; i < this.all_inspection_reference.length; i++){
+                  if(this.all_inspection_reference[i].id == this.query.item_id){
+                    if(this.all_inspection_reference[i].range_type == 1) {
+                      this.item_name = this.all_inspection_reference[i].item_name
+                      this.range_value = "(" + this.all_inspection_reference[i].range_min + "~" + this.all_inspection_reference[i].range_max +")"
+                    }else{
+                      this.item_name = this.all_inspection_reference[i].item_name
+                      this.range_value = ""
+                    }
+                  }
+              }
+
+            } else {
+              this.$message.error(resp.msg)
+            }
+          })
+          .catch(error => {
+          })
+      },
+
 
     },
     created() {
       this.query.project_id = this.$route.query.project_id
       this.query.item_id = this.$route.query.item_id
       this.query.range_type = this.$route.query.range_type
+      this.GetInspectionIndexInit()
       this.GetPatientInspectionIndexChart(this.query)
     }
   }

src/xt_pages/workforce/schedule_print.vue

 </template>
 
 <script>
-  import { GetWeekSchedulePrintInitData } from '@/api/schedule'
+  import { GetWeekSchedulePrintInitData,initDate } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
           var begin_day = parseInt(parseTime(resp.data.monday * 1000, '{d}'))
           for (let index = 0; index < this.schedules.length; index++) {
             const collection = this.schedules[index]
-            collection.day = begin_day + index
+            collection.day = resp.data.days[index].split("-")[1]+"-"+resp.data.days[index].split("-")[2]
           }
 
           var schedules = resp.data.schedules