Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/utils/tools.js

@@ -21,13 +21,68 @@ export function jsGetAge(strBirthday, splitstr) {
   // debugger
   var returnAge
   var strBirthdayArr = strBirthday.split(splitstr)
+ 
   var birthYear = strBirthdayArr[0]
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
+
+  
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
   var nowDay = d.getDate()
+  
+  if (nowYear == birthYear) {
+    returnAge = 0 // 同年 则为0岁
+  } else {
+    var ageDiff = nowYear - birthYear // 年之差
+    if (ageDiff > 0) {
+      if (nowMonth == birthMonth) {
+        var dayDiff = nowDay - birthDay // 日之差
+        if (dayDiff < 0) {
+          returnAge = ageDiff - 1
+        } else {
+          returnAge = ageDiff
+        }
+      } else {
+        var monthDiff = nowMonth - birthMonth // 月之差
+        if (monthDiff < 0) {
+          returnAge = ageDiff - 1
+        } else {
+          returnAge = ageDiff
+        }
+      }
+    } else {
+      returnAge = -1 // 返回-1 表示出生日期输入错误 晚于今天
+    }
+  }
+
+  return returnAge // 返回周岁年龄
+}
+
+
+export function jsGetAgeOne(strBirthday,splitstr, nowYear,nowMonth,nowDay) {
+ 
+  // debugger
+  var returnAge
+  var strBirthdayArr = strBirthday.split(splitstr)
+  console.log("strBirthdayArr",strBirthdayArr)
+  var birthYear = strBirthdayArr[0]
+  var birthMonth = strBirthdayArr[1]
+  var birthDay = strBirthdayArr[2]
+  // var d = new Date()
+  // var anowYear = d.getFullYear()
+  // var anowMonth = d.getMonth() + 1
+  // var anowDay = d.getDate()
+  
+  // console.log("anowYear",anowYear)
+  // console.log("anowMonth",anowMonth)
+  // console.log("anowDay",anowDay)
+  
+  console.log("brityYear666",strBirthdayArr[0])
+  console.log("birthMonth5656",strBirthdayArr[1])
+  console.log("birthDay5656",strBirthdayArr[2])
+  
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁
   } else {

src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicators.vue

@@ -0,0 +1,105 @@
+<!-- 甲状旁腺激素分析 -->
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="page_patientControlAnalysis">
+        <el-tabs v-model="activeName" @tab-click="handleClick" >
+          <el-tab-pane label="统计全部" name="first">
+            <keep-alive>
+              <otherIndicatorsall :project_id="project_id" :item_id="item_id" v-if="activeName == 'first'"></otherIndicatorsall>
+            </keep-alive>
+          </el-tab-pane>
+
+          <el-tab-pane label="统计个人" name="second">
+            <keep-alive>
+              <otherIndicatorsone  :project_id="project_id" :item_id="item_id"  v-if="activeName == 'second'"></otherIndicatorsone>
+            </keep-alive>
+          </el-tab-pane>
+
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+// import echarts from 'echarts'
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import otherIndicatorsall from './otherIndicatorsall.vue'
+import otherIndicatorsone from './otherIndicatorsone.vue'
+export default {
+  name:'otherIndicators',
+  components: {
+    BreadCrumb,
+    otherIndicatorsall,
+    otherIndicatorsone
+  },
+  data() {
+    return {
+      activeName: 'first',
+      project_id:this.$route.query.project_id,
+      item_id:this.$route.query.item_id,
+
+    }
+  },
+  methods:{
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+// .page_patientControlAnalysis {
+
+// .pointTitle {
+   //   font-size: 13px;
+   // }
+
+// .chartTitle {
+   //   font-size: 16px;
+   //   font-weight: bold;
+   //   color: #000000;
+   // }
+
+// .point {
+   //   width: 13px;
+   //   height: 13px;
+   //   background: linear-gradient(
+   //       0deg,
+   //       rgba(169, 224, 243, 1),
+   //       rgba(159, 189, 252, 1)
+   //   );
+   //   border-radius: 7px;
+   //   margin-right: 8px;
+   // }
+
+// .pointTitle {
+   //   font-size: 13px;
+   // }
+
+// }
+
+</style>
+
+<style lang="scss">
+// .page_patientControlAnalysis {
+
+// .el-form-item {
+   //   margin-bottom: 0;
+   // }
+
+// .cell {
+   //   text-align: center;
+   // }
+
+// ::-webkit-scrollbar {
+   //   height: 15px !important;
+   // }
+
+// }
+</style>

src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsall.vue

@@ -0,0 +1,697 @@
+<template>
+  <div>
+    <el-row :gutter="25">
+      <el-col :span="5">
+        <div class="block">
+          <span>查询时间:</span>
+          <el-select size="small" v-model="time_type" placeholder="请选择"
+                     style="width:150px;margin-left:10px;" @change="changeItem">
+            <el-option
+              v-for="item,index in times"
+              :key="index"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <div>
+          <el-date-picker
+            style="width: 200px"
+
+            v-model="start_time"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            type="date"
+
+            placeholder="选择日期">
+          </el-date-picker>
+          <span>-</span>
+          <el-date-picker
+            style="width: 200px"
+            v-model="end_time"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            type="date"
+            placeholder="选择日期">
+          </el-date-picker>
+        </div>
+      </el-col>
+      <el-col :span="5">
+        <div >
+          <el-input disabled v-model="input" placeholder="请输入内容"></el-input>
+        </div>
+      </el-col>
+      <el-col :span="3">
+        <el-button type="primary" @click="getData()">查询</el-button>
+      </el-col>
+    </el-row>
+    <div class="cell clearfix" style="margin: 20px; font-weight: bold;">
+      <p class="chartTitle">统计图</p>
+    </div>
+    <div class="echart" id="mychart" :style={width:width,height:height}></div>
+    <div style="width: 80%;margin: auto;">
+      <el-table
+        :data="tableData"
+        border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        style="width: 100%;">
+        <el-table-column
+          prop="name"
+          align="center"
+          label="血红蛋白"
+
+
+        >
+        </el-table-column>
+        <el-table-column
+          prop="count"
+          label="人数"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          align="center"
+          label="操作">
+          <template slot-scope="scope">
+            <el-button @click="handleClick(scope.row)" style="font-size:16px;"
+                       type="text">查看详情
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <el-dialog
+      width="1000px" class="registerDialog" :visible.sync="detailVisibility"
+      :close-on-click-modal="isClose"
+      :close-on-press-escape="isClose"
+    >
+      <el-row :gutter="25">
+        <el-col :span="5">
+          <div class="block">
+            <span>查询时间:</span>
+            <el-select size="small" v-model="time_type_two" placeholder="请选择"
+                       style="width:100px;margin-left:5px;" @change="changeItemTwo">
+              <el-option
+                v-for="item,index in times"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </el-col>
+        <el-col :span="10">
+          <div>
+            <el-date-picker
+              style="width: 120px"
+              v-model="start_time_one"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+
+              placeholder="选择日期">
+            </el-date-picker>
+            <span>-</span>
+            <el-date-picker
+              style="width: 120px"
+              v-model="end_time_one"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </div>
+        </el-col>
+
+        <el-col :span="4">
+          <div>
+
+            <el-select size="small" v-model="statistics_type" placeholder="请选择"
+                       style="width:100px;margin-left:5px;">
+              <el-option
+                v-for="item,index in statistics_types"
+                :key="index"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+
+          </div>
+        </el-col>
+
+        <!--        <el-col :span="4">-->
+        <!--          <div>-->
+        <!--            <el-select size="small" v-model="sort_type" placeholder="请选择"-->
+        <!--                       style="width:100px;margin-left:5px;">-->
+        <!--              <el-option-->
+        <!--                v-for="item,index in sort_types"-->
+        <!--                :key="index"-->
+        <!--                :label="item.label"-->
+        <!--                :value="item.value">-->
+        <!--              </el-option>-->
+        <!--            </el-select>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+
+        <el-col :span="4">
+          <div >
+            <el-input v-model="keyword" placeholder="请输入患者姓名或透析号"></el-input>
+          </div>
+        </el-col>
+
+        <el-col :span="2">
+          <div>
+            <el-button @click="getDataTwo()">查询</el-button>
+          </div>
+        </el-col>
+
+        <el-col :span="2">
+          <div>
+            <el-button @click="exportAction()">导出</el-button>
+          </div>
+        </el-col>
+
+        <!--        <el-col :span="2">-->
+        <!--          <div>-->
+        <!--            <el-button @click="getDataTwo()">打印</el-button>-->
+        <!--          </div>-->
+        <!--        </el-col>-->
+
+
+
+
+
+      </el-row>
+
+      <el-table
+        :data="patientTableData"
+        border
+        ref="table"
+        max-height="500px"
+        style="width: 100%">
+        <el-table-column
+          prop="dialysis_no"
+          align="center"
+          label="透析号"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="患者姓名"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="date"
+          label="检查日期"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="inspect_value"
+          label="结果"
+        >
+        </el-table-column>
+
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="detailVisibility = false">取消</el-button>
+        <el-button type="primary" @click="detailVisibility = false">确定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+import * as echarts from 'echarts'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
+import { number } from 'echarts/lib/export'
+
+const moment = require('moment')
+
+export default {
+  props: {
+    project_id:{
+      type: number,
+    }, item_id:{
+      type: number,
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '400px'
+    }
+
+  },
+  data() {
+    return {
+      statistics_types:[
+        { value: 1, label: '不达标患者' },
+        { value: 2, label: '未检查患者' },
+        { value: 3, label: '达标患者' },
+      ],
+      sort_types:[
+        { value: 1, label: '时间' },
+        { value: 2, label: '患者' },
+      ],
+      detailVisibility:false,
+      isClose:true,
+      time_type: 1,
+      time_type_two:1,
+      times: [
+        { value: 1, label: '本月' },
+        { value: 2, label: '上月' },
+        { value: 3, label: '今年' },
+        { value: 4, label: '上一年' },
+        { value: 5, label: '第一季度' },
+        { value: 6, label: '第二季度' },
+        { value: 7, label: '第三季度' },
+        { value: 8, label: '第四季度' },
+        { value: 9, label: '自定义' }
+
+      ],
+      reference:{},
+      time_month: '',
+      start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
+      end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
+      start_time_one: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
+      end_time_one: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
+      input: '',
+      myChart: {},
+      pieData: [],
+      pieName: [],
+      // myChartStyle:{float: "right", width: "100%", height: "400px"},
+      tableData: [],
+      statistics_type:1,
+      sort_type:"",
+      keyword:"",
+      patientTableData:[],
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    exportAction(){
+      let list = []
+      for (let i = 0; i < this.patientTableData.length; i++) {
+        let order = this.patientTableData[i]
+        let name = order.name
+        let value = order.inspect_value
+        let inspect_date = order.date
+
+        let obj = {
+          '姓名': name,
+          '数值': value,
+          '日期': inspect_date,
+        }
+        list.push(obj)
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['姓名', '数值', '日期']
+        const filterVal = ['姓名', '数值', '日期']
+        const data = this.formatJson(filterVal, list)
+        excel.export_json_to_excel1({
+          header: tHeader,
+          data,
+          filename: '明细',
+          ref: this.$refs['table'].$el
+        })
+      })
+    },
+
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    changeItemTwo(val) {
+      const currentDate = new Date()
+      switch (val) {
+        case 1:
+          const startOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1).toLocaleDateString('en-CA')
+          const endOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0).toLocaleDateString('en-CA')
+          this.start_time_one = startOfMonth
+          this.end_time_one = endOfMonth
+          // this.getDataTwo()
+          break
+        case 2:
+          // 上月的起始日期和结束日期
+          const startOfLastMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1).toLocaleDateString('en-CA')
+          const endOfLastMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0).toLocaleDateString('en-CA')
+          this.start_time_one = startOfLastMonth
+          this.end_time_one = endOfLastMonth
+          // this.getDataTwo()
+          break
+        case 3:
+          // 今年的起始日期和结束日期
+          const startOfYear = new Date(currentDate.getFullYear(), 0, 1).toLocaleDateString('en-CA')
+          const endOfYear = new Date(currentDate.getFullYear(), 11, 31).toLocaleDateString('en-CA')
+
+          this.start_time_one = startOfYear
+          this.end_time_one = endOfYear
+          // this.getDataTwo()
+
+          break
+        case 4:
+          // 上一年的起始日期和结束日期
+          const startOfLastYear = new Date(currentDate.getFullYear() - 1, 0, 1).toLocaleDateString('en-CA')
+          const endOfLastYear = new Date(currentDate.getFullYear() - 1, 11, 31).toLocaleDateString('en-CA')
+
+          this.start_time_one = startOfLastYear
+          this.end_time_one = endOfLastYear
+          // this.getDataTwo()
+
+          break
+        case 5:
+          // 第一季度的起始日期和结束日期
+          const startOfFirstQuarter = new Date(currentDate.getFullYear(), 0, 1).toLocaleDateString('en-CA')
+          const endOfFirstQuarter = new Date(currentDate.getFullYear(), 2, 31).toLocaleDateString('en-CA')
+          this.start_time_one = startOfFirstQuarter
+          this.end_time_one = endOfFirstQuarter
+          // this.getDataTwo()
+          break
+        case 6:
+          // 第二季度的起始日期和结束日期
+          const startOfSecondQuarter = new Date(currentDate.getFullYear(), 3, 1).toLocaleDateString('en-CA')
+          const endOfSecondQuarter = new Date(currentDate.getFullYear(), 5, 30).toLocaleDateString('en-CA')
+          this.start_time_one = startOfSecondQuarter
+          this.end_time_one = endOfSecondQuarter
+          // this.getDataTwo()
+          break
+        case 7:
+          // 第三季度的起始日期和结束日期
+          const startOfThirdQuarter = new Date(currentDate.getFullYear(), 6, 1).toLocaleDateString('en-CA')
+          const endOfThirdQuarter = new Date(currentDate.getFullYear(), 8, 30).toLocaleDateString('en-CA')
+
+          this.start_time_one = startOfThirdQuarter
+          this.end_time_one = endOfThirdQuarter
+          // this.getDataTwo()
+
+          break
+        case 8:
+          // 第四季度的起始日期和结束日期
+          const startOfFourthQuarter = new Date(currentDate.getFullYear(), 9, 1).toLocaleDateString('en-CA')
+          const endOfFourthQuarter = new Date(currentDate.getFullYear(), 11, 31).toLocaleDateString('en-CA')
+
+          this.start_time_one = startOfFourthQuarter
+          this.end_time_one = endOfFourthQuarter
+          // this.getDataTwo()
+          break
+        case 9:
+          this.start_time_one = ''
+          this.end_time_one = ''
+          break
+      }
+    },
+
+    getDataTwo() {
+      if(this.start_time_one.length == 0){
+        this.$message.error("请选择开始时间")
+      }
+      if(this.end_time_one.length == 0){
+        this.$message.error("请选择结束时间")
+      }
+      let params = {
+        start_date: this.start_time_one,
+        end_date: this.end_time_one,
+        project_id: this.project_id,
+        item_id: this.item_id,
+        item_type:this.statistics_type,
+        order_type:this.sort_type,
+        keyword: this.keyword,
+      }
+      this.patientTableData = []
+      GetAllQCStatistisData(params).then(response => {
+        if (response.data.state == 1) {
+          this.detailVisibility = true
+          this.patientTableData  =  this.patientTableData.concat(response.data.data.list)
+        } else {
+          this.$message.error(response.data.msg)
+        }
+      })
+
+    },
+    getData() {
+      if(this.start_time.length == 0){
+        this.$message.error("请选择开始时间")
+      }
+      if(this.end_time.length == 0){
+        this.$message.error("请选择结束时间")
+      }
+      let params = {
+        start_date: this.start_time,
+        end_date: this.end_time,
+        project_id: this.project_id,
+        item_id: this.item_id
+      }
+      this.pieData = []
+      this.tableData = []
+      console.log("~~~~~~~~~~")
+      GetQCStatistisData(params).then(response => {
+        if (response.data.state == 1) {
+          this.reference = response.data.data.reference
+          this.input = response.data.data.reference.range_min + "<=" + response.data.data.reference.item_name + "<=" + response.data.data.reference.range_max
+          let objone = {
+            value:  response.data.data.unusual_total ,
+            name: '不达标值患者',
+            count:response.data.data.unusual_total,
+          }
+          this.pieData.push(objone)
+          this.tableData.push(objone)
+
+          let objtwo = {
+            value:   response.data.data.normal_total ,
+            name: '达标值患者',
+            count:response.data.data.normal_total,
+
+          }
+          this.pieData.push(objtwo)
+          this.tableData.push(objtwo)
+
+          let objthree = {
+            value: response.data.data.no_check_total ,
+            name: '未检查患者',
+            count:response.data.data.no_check_total,
+
+          }
+          this.pieData.push(objthree)
+          this.tableData.push(objthree)
+
+          let objfour = {
+            value: response.data.data.patient_count,
+            name: '合计',
+            count:response.data.data.patient_count,
+          }
+          this.tableData.push(objfour)
+          for (let i = 0; i < this.pieData.length; i++) {
+            this.pieName[i] = this.pieData[i].name
+          }
+          this.myChart = echarts.init(document.getElementById('mychart'))
+          window.addEventListener('resize', () => {
+            this.myChart.resize()
+          })
+          const option = {
+            legend: {
+              // 图例
+              data: this.pieName,
+              left: '10%',
+              top: '30%',
+              orient: 'vertical'
+            },
+            color: ['#F74587', '#32D79B', '#6590FF'],
+
+
+            title: {
+              // 设置饼图标题，位置设为顶部居中
+              //   text: "国内院士前五省份图示",
+              top: '0%',
+              left: 'center'
+            },
+            series: [
+              {
+                type: 'pie',
+                label: {
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
+                  // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
+                },
+                radius: '65%', //饼图半径
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
+              }
+            ]
+          }
+          //   console.log(this.seriesData);
+          const optionFree = {
+            series: [
+              {
+                data: this.seriesData,
+                type: 'line',
+                smooth: true
+              }
+            ]
+          }
+          this.myChart = echarts.init(document.getElementById('mychart'))
+          this.myChart.setOption(option)
+        } else {
+          this.$message.error(response.data.msg)
+        }
+      })
+
+    },
+    changeItem(val) {
+      const currentDate = new Date()
+      switch (val) {
+        case 1:
+
+          const startOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1).toLocaleDateString('en-CA')
+          const endOfMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0).toLocaleDateString('en-CA')
+
+          this.start_time = startOfMonth
+          this.end_time = endOfMonth
+          this.getData()
+
+          break
+        case 2:
+          // 上月的起始日期和结束日期
+          const startOfLastMonth = new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, 1).toLocaleDateString('en-CA')
+          const endOfLastMonth = new Date(currentDate.getFullYear(), currentDate.getMonth(), 0).toLocaleDateString('en-CA')
+
+          this.start_time = startOfLastMonth
+          this.end_time = endOfLastMonth
+          this.getData()
+
+          break
+        case 3:
+          // 今年的起始日期和结束日期
+          const startOfYear = new Date(currentDate.getFullYear(), 0, 1).toLocaleDateString('en-CA')
+          const endOfYear = new Date(currentDate.getFullYear(), 11, 31).toLocaleDateString('en-CA')
+
+          this.start_time = startOfYear
+          this.end_time = endOfYear
+          this.getData()
+
+          break
+        case 4:
+          // 上一年的起始日期和结束日期
+          const startOfLastYear = new Date(currentDate.getFullYear() - 1, 0, 1).toLocaleDateString('en-CA')
+          const endOfLastYear = new Date(currentDate.getFullYear() - 1, 11, 31).toLocaleDateString('en-CA')
+
+          this.start_time = startOfLastYear
+          this.end_time = endOfLastYear
+          this.getData()
+
+          break
+        case 5:
+          // 第一季度的起始日期和结束日期
+          const startOfFirstQuarter = new Date(currentDate.getFullYear(), 0, 1).toLocaleDateString('en-CA')
+          const endOfFirstQuarter = new Date(currentDate.getFullYear(), 2, 31).toLocaleDateString('en-CA')
+
+          this.start_time = startOfFirstQuarter
+          this.end_time = endOfFirstQuarter
+          this.getData()
+
+          break
+        case 6:
+          // 第二季度的起始日期和结束日期
+          const startOfSecondQuarter = new Date(currentDate.getFullYear(), 3, 1).toLocaleDateString('en-CA')
+          const endOfSecondQuarter = new Date(currentDate.getFullYear(), 5, 30).toLocaleDateString('en-CA')
+
+          this.start_time = startOfSecondQuarter
+          this.end_time = endOfSecondQuarter
+          this.getData()
+
+          break
+        case 7:
+          // 第三季度的起始日期和结束日期
+          const startOfThirdQuarter = new Date(currentDate.getFullYear(), 6, 1).toLocaleDateString('en-CA')
+          const endOfThirdQuarter = new Date(currentDate.getFullYear(), 8, 30).toLocaleDateString('en-CA')
+
+          this.start_time = startOfThirdQuarter
+          this.end_time = endOfThirdQuarter
+          this.getData()
+
+          break
+        case 8:
+          // 第四季度的起始日期和结束日期
+          const startOfFourthQuarter = new Date(currentDate.getFullYear(), 9, 1).toLocaleDateString('en-CA')
+          const endOfFourthQuarter = new Date(currentDate.getFullYear(), 11, 31).toLocaleDateString('en-CA')
+
+          this.start_time = startOfFourthQuarter
+          this.end_time = endOfFourthQuarter
+          this.getData()
+          break
+        case 9:
+          this.start_time = ''
+          this.end_time = ''
+          break
+      }
+    },
+
+
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+          return
+        }
+        const values = data.map(item => Number(item[column.property]))
+        if (!values.every(value => isNaN(value))) {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr)
+            if (!isNaN(value)) {
+              return prev + curr
+            } else {
+              return prev
+            }
+          }, 0)
+          sums[index] += ' 元'
+        } else {
+          sums[index] = 'N/A'
+        }
+      })
+
+      return sums
+    },
+    handleClick(row) {
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
+    }
+  }
+
+}
+</script>
+<style lang="scss" scoped>
+.content_top {
+  display: flex;
+  justify-content: space-around;
+  color: #1e5feb;
+}
+</style>

src/xt_pages/Dialysisanalysis/otherIndicators/otheralone.vue → src/xt_pages/Dialysisanalysis/otherIndicators/otherIndicatorsone.vue

@@ -83,9 +83,9 @@
           <div style="padding-left:10px;flex:1;width:0;">
             <div class="tableTitle">指标趋势<span style="font-weight:normal">&nbsp;&nbsp;（当前患者: {{patient_name}}）</span></div>
             <div>
-              <line-chart :options="chart"
-                          v-if="query.statistics_type != 9 && query.statistics_type != 10"></line-chart>
-              <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>
+              <line-chart :options="chart"></line-chart>
+              <!--              <line-chart :options="bar" v-if="query.statistics_type == 9 || query.statistics_type == 10"></line-chart>-->
+              <!--              <line-chart></line-chart>-->
 
             </div>
             <div class="tableTitle">统计表</div>
@@ -93,32 +93,25 @@
               <el-table ref="table" :data="tableData" v-loading="loading" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
                 <el-table-column label="姓名" align="center">
                   <template slot-scope="scope">
+                    {{scope.row.name}}
                   </template>
                 </el-table-column>
 
                 <el-table-column width="100" label="检查日期" align="center">
                   <template slot-scope="scope">
+                    {{getTime(scope.row.inspect_date)}}
+
                   </template>
                 </el-table-column>
 
-                <el-table-column width="100" label="甲状旁腺激素分析" align="center">
+                <el-table-column width="100" label="血红蛋白" align="center">
                   <template slot-scope="scope">
+                    {{scope.row.value}}
                   </template>
                 </el-table-column>
               </el-table>
 
-              <el-pagination
-                align="right"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
-                :current-page="query.page"
-                :page-sizes="[10, 20, 50, 100]"
-                :page-size="10"
-                background
-                style="margin-top:20px;"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="total"
-              ></el-pagination>
+
             </div>
           </div>
         </el-container>
@@ -130,7 +123,6 @@
 
 <script>
 import echarts from 'echarts'
-// import LineChart from '../../qcd/components/LineChart'
 import {  uParseTime } from '@/utils/tools'
 import { getCurrentOrgPatients } from '@/api/common/common'
 import {
@@ -139,9 +131,11 @@ import {
 import { PostSearch } from '@/api/patient'
 import { getDataConfig } from '@/utils/data'
 import { GetPersonQCStatistisData } from '../../../api/qcd'
+import LineChart from '../../qcd/components/LineChart.vue'
 
 export default {
   components: {
+    LineChart
   },
   data() {
     return {
@@ -365,25 +359,19 @@ export default {
       for (let i = 0; i < this.tableData.length; i++) {
         let order = this.tableData[i]
         let name = order.name
-        let item_name = order.item_name
-        let count = order.count
-        let price = order.price.toFixed(2)
-        let pay_sumamt = (order.price.toFixed(2) * order.count).toFixed(2)
-        let total = order.total.toFixed(2)
+        let value = order.value
+        let inspect_date = order.inspect_date
 
         let obj = {
-          '患者姓名': name,
-          '项目名称': item_name,
-          '数量': count,
-          '单价': price,
-          '费用': pay_sumamt,
-          '费用总额': total
+          '姓名': name,
+          '数值': value,
+          '日期': inspect_date,
         }
         list.push(obj)
       }
       import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
-        const filterVal = ['患者姓名', '项目名称', '数量', '单价', '费用', '费用总额']
+        const tHeader = ['姓名', '数值', '日期']
+        const filterVal = ['姓名', '数值', '日期']
         const data = this.formatJson(filterVal, list)
         excel.export_json_to_excel1({
           header: tHeader,
@@ -480,7 +468,7 @@ export default {
       if(val == "" || val == undefined){
         return ""
       }else {
-        return uParseTime(val, '{y}-{m}-{d} {h}:{i}')
+        return uParseTime(val, '{y}-{m}-{d}')
       }
     },
     GetInspectionCheckIndexTableData(params) {
@@ -493,7 +481,12 @@ export default {
             this.loading = false
             this.tableData = []
             for (let i = 0; i < resp.data.inspections.length; i++) {
-              this.tableData.push(resp.data.inspections[i])
+              let obj = {
+                name:resp.data.patient.name,
+                value:resp.data.inspections[i].inspect_value,
+                inspect_date:resp.data.inspections[i].inspect_date
+              }
+              this.tableData.push(obj)
             }
             this.total = resp.data.total
 
@@ -515,10 +508,14 @@ export default {
         .then(rs => {
           var resp = rs.data
           if (resp.state == 1) {
+            console.log(resp.data.inspections)
             for (let i = 0; i < resp.data.inspections.length; i++) {
               this.chart.xAxis.data.push(this.getTime(resp.data.inspections[i].inspect_date))
               this.chart.series[0].data.push(resp.data.inspections[i].inspect_value)
             }
+            console.log(this.chart.xAxis.data)
+            console.log( this.chart.series[0].data)
+
             this.getArrLength(this.chart.xAxis.data,1)
           } else {
 
@@ -610,8 +607,8 @@ export default {
     this.query.patient_id = 0
     this.query.end_time = year + '-' + month + '-' + day
     this.query.start_time = year + '-' + last_month + '-' + day
-    this.query.project_id = 20
-    this.query.item_id = 171
+    this.query.project_id = 1
+    this.query.item_id = 17
     this.getCurrentOrgPatients()
 
     // this.GetPersonQCStatistisData()

src/xt_pages/Dialysisanalysis/otherIndicators/otherall.vue

@@ -1,265 +0,0 @@
-<template>
-    <div>
-        <!-- <div class="content_top">
-            <div class="block">
-                <span>查询时间:</span>
-                <el-date-picker
-                v-model="time_month"
-                type="month"
-                placeholder="选择月">
-                </el-date-picker>
-            </div>
-            <div>
-                <el-date-picker
-                v-model="stat_time"
-                type="date"
-                placeholder="选择日期">
-                </el-date-picker>
-                <span>-</span>
-                <el-date-picker
-                v-model="end_time"
-                type="date"
-                placeholder="选择日期">
-                </el-date-picker>
-            </div>
-            <div style="width: 200px;">
-                <el-input v-model="input" placeholder="请输入内容"></el-input>
-            </div>
-            <el-button type="primary">查询</el-button>
-        </div> -->
-
-        <el-row :gutter="20">
-        <el-col :span="5">
-          <div class="block">
-            <span>查询时间:</span>
-            <el-date-picker
-            v-model="time_month"
-            type="month"
-            placeholder="选择月">
-            </el-date-picker>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div>
-            <el-date-picker
-            v-model="stat_time"
-            type="date"
-            placeholder="选择日期">
-            </el-date-picker>
-            <span>-</span>
-            <el-date-picker
-            v-model="end_time"
-            type="date"
-            placeholder="选择日期">
-            </el-date-picker>
-          </div>
-        </el-col>
-        <el-col :span="3">
-          <div style="width: 200px;">
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
-          </div>
-        </el-col>
-        <el-col :span="2">
-            <el-button type="primary">查询</el-button>
-        </el-col>
-        </el-row>
-
-        <div class="cell clearfix" style="margin: 20px; font-weight: bold;">
-          <p class="chartTitle">统计图</p>
-        </div>
-        <div class="echart" id="mychart" :style={width:width,height:height}></div>
-        <div style="width: 80%;margin: auto;">
-            <el-table
-            :data="tableData"
-            :show-summary = true
-            border
-            :header-cell-style="{
-              backgroundColor: 'rgb(245, 247, 250)',
-              color: '#606266'
-            }"
-            style="width: 100%;">
-                <el-table-column
-                    prop="date"
-                    align="center"
-                    label="白蛋白"
-                    >
-                </el-table-column>
-                <el-table-column
-                    prop="name"
-                    label="人数"
-                    >
-                </el-table-column>
-<!--                <el-table-column-->
-<!--                    prop="address"-->
-<!--                    align="center"-->
-<!--                    label="操作">-->
-<!--                    <template slot-scope="scope">-->
-<!--                        <el-button @click="handleClick(scope.row)" style="font-size:16px;"-->
-<!--                                type="text" >查看详情-->
-<!--                        </el-button>-->
-<!--                    </template>-->
-<!--                </el-table-column>-->
-            </el-table>
-        </div>
-    </div>
-</template>
-<script>
-import * as echarts from "echarts";
-export default{
-    props: {
-
-    width: {
-      type: String,
-      default: "100%"
-    },
-    height: {
-      type: String,
-      default: "400px"
-    },
-
-  },
-    data() {
-        return {
-            time_month:'',
-            stat_time:'',
-            end_time:'',
-            input:'',
-            myChart: {},
-            pieData : [
-            {
-          value: 463,
-          name: "不达标值患者"
-        },
-        {
-          value: 395,
-          name: "未检查患者"
-        },
-        {
-          value: 157,
-          name: "达标值患者"
-        },
-        // {
-        //   value: 149,
-        //   name: "广东"
-        // },
-        // {
-        //   value: 147,
-        //   name: "湖南"
-        // }
-
-            ],
-            pieName: [],
-            // myChartStyle:{float: "right", width: "100%", height: "400px"},
-            tableData:[],
-        }
-    },
-    mounted() {
-    this.initDate(); //数据初始化
-    this.initEcharts();
-  },
-  methods: {
-    initDate() {
-      for (let i = 0; i < this.pieData.length; i++) {
-        this.pieName[i] = this.pieData[i].name;
-      }
-    },
-    initEcharts() {
-      // 饼图
-      const option = {
-        legend: {
-          // 图例
-          data: this.pieName,
-          left: "10%",
-          top: "30%",
-          orient: "vertical"
-        },
-        color:['#ff7f9f','#fff67f','#1e5feb'],
-        title: {
-          // 设置饼图标题，位置设为顶部居中
-        //   text: "国内院士前五省份图示",
-          top: "0%",
-          left: "center"
-        },
-        series: [
-          {
-            type: "pie",
-            label: {
-              normal : {
-                formatter: '{b}:{c}: ({d}%)',
-                textStyle : {
-                    fontWeight : 'normal',
-                    fontSize : 15,
-                    color : "black"
-                }
-              }
-              // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
-            },
-            radius: "65%", //饼图半径
-            data: this.pieData,
-            itemStyle : {
-              emphasis: {
-                  shadowBlur: 10,
-                  shadowOffsetX: 0,
-                  shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      };
-    //   console.log(this.seriesData);
-      const optionFree = {
-        series: [
-          {
-            data: this.seriesData,
-            type: "line",
-            smooth: true
-          }
-        ]
-      };
-      this.myChart = echarts.init(document.getElementById("mychart"));
-      this.myChart.setOption(option);
-      //随着屏幕大小调节图表
-      window.addEventListener("resize", () => {
-        this.myChart.resize();
-      });
-    },
-    getSummaries(param) {
-        const { columns, data } = param;
-        const sums = [];
-        columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '总价';
-            return;
-          }
-          const values = data.map(item => Number(item[column.property]));
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr);
-              if (!isNaN(value)) {
-                return prev + curr;
-              } else {
-                return prev;
-              }
-            }, 0);
-            sums[index] += ' 元';
-          } else {
-            sums[index] = 'N/A';
-          }
-        });
-
-        return sums;
-    },
-    handleClick(id){
-        console.log(id);
-    }
-  }
-
-}
-</script>
-<style lang="scss" scoped>
-.content_top{
-    display: flex;
-    justify-content: space-around;
-    color: #1e5feb;
-}
-</style>

src/xt_pages/device/objectRegistration.vue

@@ -106,8 +106,8 @@
                 </el-table-column>
             </el-table>
             <el-pagination
-              :page-sizes="[10, 20, 50, 100]"
-              :page-size="10"
+              :page-sizes="[500, 1000, 1500, 2000,2500]"
+              :page-size="500"
               background
               style="margin-top:20px;float: right"
               layout="total, sizes, prev, pager, next, jumper"

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -56,9 +56,8 @@
                <!-- <span v-if="record.dialysis_order && record.dialysis_order.dialysis_date<=1672416000">{{record.patient.total_dialysis + record.patient.user_sys_before_count}}</span>  
                <span v-if="record.dialysis_order && record.dialysis_order.dialysis_date>=1672502400">{{record.patient.total_dialysis}}</span>   -->
               <span>
-                            <!-- {{ record.Count ? record.Count:''}} -->
-                            {{ record.patient.total_dialysis }}
-                        </span>
+                 {{ record.Count ? record.Count:''}}  
+                </span>
               </span>
             </td>
                   <td style="text-align:center;">

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1318,7 +1318,7 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[20, 40, 60, 80,100]"
+        :page-sizes="[20, 40, 60, 80,100,300,500]"
         :page-size="10"
         background
         style="margin-top:20px;"

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -357,7 +357,7 @@
 
         <li v-if="isShow('维持时长')">
           <label>维持时长: </label>
-          <span class="content">{{this.prescription.anticoagulant_weichi_hour}}</span>
+          <span class="content">{{this.prescription.anticoagulant_weichi_hour?this.prescription.anticoagulant_weichi_hour:"0"}}</span>
         </li>
 
         <li
@@ -449,7 +449,7 @@
 
          <li v-if="isShow('葡萄糖')">
           <label>葡萄糖: </label>
-          <span class="content">{{this.prescription.amylaceum}}</span>
+          <span class="content">{{this.prescription.amylaceum?this.prescription.amylaceum:0}}</span>
         </li>
 
         <li v-if="isShow('单超时长')">

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

@@ -475,6 +475,8 @@ export default {
         accepts.way =1
         accepts.posture=1
         accepts.condition =2
+        accepts.consciousness = 1
+        accepts.appetite =1
 
       }
       this.accepts = accepts;

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

@@ -2803,7 +2803,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
@@ -2815,7 +2815,6 @@ mu
           pre.mode_id == 7 ||
           pre.mode_id == 8 ||
           pre.mode_id == 9 ||
-          pre.mode_id == 10 ||
           pre.mode_id == 11 ||
           pre.mode_id == 13 ||
           pre.mode_id == 14 ||
@@ -2852,11 +2851,19 @@ mu
               this.dialysisPrescription.dialysate_flow = 500
             }
 
-            if(this.$store.getters.xt_user.org.id == 10598){
+            if(this.$store.getters.xt_user.org.id == 10598 || this.$store.getters.xt_user.org.id == 10612){
                if(this.dialysisPrescription.dialysis_duration_minute == ""){
                  this.dialysisPrescription.dialysis_duration_minute =0
 
                }
+
+               if(this.dialysisPrescription.anticoagulant_weichi == ""){
+                  this.dialysisPrescription.anticoagulant_weichi = 0
+               }
+
+               if(this.dialysisPrescription.amylaceum == ""){
+                this.dialysisPrescription.amylaceum = 0
+               }
             }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
@@ -3036,7 +3043,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0
@@ -4446,7 +4453,6 @@ mu
         id === 7 ||
         id === 8 ||
         id === 9 ||
-        id === 10 ||
         id === 11 ||
         id === 13 ||
         id === 14 ||

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

@@ -266,7 +266,7 @@
                 org_id == 10599 ||
                 org_id == 10597 ||
                 org_id == 10599 || 
-                org_id == 10610) &&
+                org_id == 10612) &&
                 org_id!=10387
             "
           >
@@ -337,7 +337,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10610)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612)
               || org_id == 10387
             "
           >
@@ -393,7 +393,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10610)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612)
                 && org_id!=10387
             "
           >
@@ -446,7 +446,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10610 ) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 ) ||
               org_id == 10387
             "
           >
@@ -1177,7 +1177,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10610) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612) &&
                 org_id!=10387
             "
           >
@@ -1225,7 +1225,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10610)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612)
               || org_id == 10387
             "
           >
@@ -1289,7 +1289,7 @@
                 org_id == 10551 ||
                 org_id == 10597||
                 org_id == 10599 ||
-                org_id ==10610)
+                org_id ==10612)
                 && org_id!=10387
             "
           >
@@ -1353,7 +1353,7 @@
               org_id!=10551 &&
               org_id!=10597 &&
               org_id!=10599 &&
-              org_id!=10610
+              org_id!=10612
               )
               || org_id == 10387
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -15,10 +15,10 @@
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10610) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10610) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10610) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10610 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612) &&this.$store.getters.xt_user.template_info.org_id!=10387 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612) || this.$store.getters.xt_user.template_info.org_id == 10387"  width="76px"> 超滤量(L) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410) && org_id!=10558" width="92px" > 置换率(ml/min) </th>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -316,34 +316,69 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
-                      v-if="org_id!=10580 && org_id !=0"
+                      v-if="(org_id == 10598 || org_id == 0) &&  predialysis.internal_fistula!=''"
                     >
                       穿刺方式：
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way == ''"
+                        v-if="predialysis&&predialysis.puncture_way == ''"
                       >
                          /
                       </div>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('绳梯') > -1"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
                       >
                         绳梯
                       </div>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('扣眼') > -1"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('扣眼') > -1"
                       >
                         扣眼
                       </div>
                       <div
                         class="under_line"
                         style="width: 100px; text-align: center"
-                        v-if="predialysis.puncture_way.indexOf('区域') > -1"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
+                      >
+                        区域
+                      </div>
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                      v-if="org_id!=10580 && org_id !=0 && org_id!=10598"
+                    >
+                      穿刺方式：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way == ''"
+                      >
+                         /
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
+                      >
+                        绳梯
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('扣眼') > -1"
+                      >
+                        扣眼
+                      </div>
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                        v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
                       >
                         区域
                       </div>
@@ -358,13 +393,37 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                         {{ dialysisOrder.puncture_way }}
+                         {{ dialysisOrder&&dialysisOrder.puncture_way }}
                       </div>
 
                     </div>
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
+                      v-if="(org_id == 10598 || org_id == 0) &&  predialysis.internal_fistula!=''"
+                    >
+                      穿刺针：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                      <span v-if="org_id==10580 || org_id==0">
+                        {{ dialysisOrder.puncture_needle}}
+                      </span>
+                      <span v-if="org_id != 10580 && org_id!=0">
+                        {{
+                          predialysis.puncture_needle
+                            ? predialysis.puncture_needle
+                            : "/"
+                        }}
+                      </span>
+
+                      </div>
+                    </div>
+                    <div
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                      v-if="org_id != 10598"
                     >
                       穿刺针：
                       <div
@@ -750,6 +809,7 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
+                      v-if="org_id==10598 && prescription.mode_id == 2"
                     >
                       置换方式：
                       <div
@@ -761,8 +821,25 @@
                         }}
                       </div>
                     </div>
+
                     <div
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                      v-if="org_id!=10598"
+                    >
+                      置换方式：
+                      <div
+                        class="under_line"
+                        style="width: 100px; text-align: center"
+                      >
+                        {{
+                          getDisplaceLiquiPart(prescription.displace_liqui_part)
+                        }}
+                      </div>
+                    </div>
 
+                    <div
+                      v-if="org_id==10598 && prescription.mode_id == 2"
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
@@ -786,6 +863,32 @@
                       </div>
                       L
                     </div>
+
+                    <div
+                      v-if="org_id!=10598"
+                      class="inline_block"
+                      style="margin-left: 10px; flex: 1"
+                    >
+                      置换量：
+                      <div
+                        class="under_line"
+                        style="width: 70px; text-align: center"
+                      >
+                      <span v-if="org_id ==10206"> {{
+                          prescription.replacement_total
+                            ? prescription.replacement_total
+                            : "/"
+                        }}
+                        </span>
+                        <span v-if="org_id!=10206"> {{
+                          prescription.displace_liqui_value
+                            ? prescription.displace_liqui_value
+                            : "/"
+                        }}
+                        </span>
+                      </div>
+                      L
+                      </div>
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
@@ -863,6 +966,7 @@
                             : ""
                         }}
                       </div>
+
                     </div>
 
                     <div class="inline_block" style="flex: 1" v-if="org_id!=10290">
@@ -985,7 +1089,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                      <span v-if="org_id !=10447 && org_id != 9675">{{
+                      <span v-if="org_id !=10447 && org_id != 9675 && org_id!=10580">{{
                           predialysis.weight_before
                             ? parseFloat(
                                 predialysis.weight_before -
@@ -1004,6 +1108,11 @@
                             : "未称重"
                         }}
                        </span>
+                       <span v-if="org_id ==10580">
+                        {{
+                          predialysis.weight_before? parseFloat(predialysis.weight_before).toFixed(1): "未称重"
+                        }}
+                       </span>
                       </div>
                       kg
                     </div>
@@ -1083,7 +1192,7 @@
                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id !=10598">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id!=10598">
                       碳酸氢根：
                       <div
                         class="under_line"
@@ -1097,7 +1206,7 @@
                       </div>
                       mmol/L
                     </div>
-                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478 && org_id !=10598">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=10478&&org_id!=10598">
                       流量：
                       <div
                         class="under_line"
@@ -1501,6 +1610,7 @@
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 || org_id == 0">碳酸氢钠<br />(ml)</td>
+                        <td width="50" v-if="org_id == 10598 || org_id == 0">护士签名</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 
@@ -1633,6 +1743,35 @@
                         <td width="50" v-if="org_id ==10490 || org_id == 0">
                           {{ monitor.dicarbonate?monitor.dicarbonate:"" }}
                         </td>
+                        <td width="50" v-if="org_id == 10598 || org_id == 0">
+                          <span v-if="monitor.creator == 0">
+                            <span
+                            v-if="setAdminUserES(monitor.modify) == ''"
+                            >{{ getAdminUser(monitor.modify) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(monitor.modify)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                          </span>
+
+                          <span v-if="monitor.creator > 0">
+                            <span
+                            v-if="setAdminUserES(monitor.creator) == ''"
+                            >{{ getAdminUser(monitor.creator) }}</span
+                          >
+                          <img
+                            style="height: 30px"
+                            :src="setAdminUserES(monitor.creator)"
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                          </span>
+                        </td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
                             style="
@@ -1697,6 +1836,7 @@
                         ></td>
                         <td v-if="org_id == 9919||org_id == 9538 || org_id == 9671"></td>
                         <td v-if="org_id == 9538"></td>
+                        <td v-if="org_id == 10598 || org_id == 0"></td>
                         <td v-if="org_id == 10490 || org_id == 0"></td>
                         <td style="line-height: 16px; padding: 0px">
                           <div
@@ -1761,7 +1901,7 @@
                         <td
                           style="font-size: 16px"
                           width="10%"
-                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375 || org_id ==10571 || org_id ==10600"
                         >
                           核对护士
                         </td>
@@ -1857,7 +1997,7 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375 || org_id ==10571 || org_id ==10600">
                           <span v-if="advice!=null && advice.checker>0">
                             <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>
                             <img

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -444,8 +444,9 @@
                 <p style="height:15px;line-height:15px">上次透后体重</p>
               </td>
               <td style="width:8%;">
+              
                  <span v-if="assessmentafter.weight_after == 0">
-                  {{ afterdialysis.last_after_weight ? assessmentafter.last_after_weight : "0" }}kg
+                  {{ afterdialysis.last_after_weight ? afterdialysis.last_after_weight : "0" }}kg
                  </span>
                  <span v-if="assessmentafter.weight_after>0">
                   {{ assessmentafter.weight_after ? assessmentafter.weight_after : "0" }}kg
@@ -460,7 +461,7 @@
                 <span v-if="advice.parent_id > 0">---></span>
                 <span>{{ advice.advice_name }}</span>
                 <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
-                <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
+                <!-- <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span> -->
                 <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
                 <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                 <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
@@ -476,7 +477,15 @@
               <td v-if="advice_index === 0">透前体重</td>
               <td v-if="advice_index === 0">{{ predialysis.weight_before }}kg</td>
               <td v-if="advice_index === 1">体重增加量</td>
-              <td v-if="advice_index === 1">{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg</td>
+              <td v-if="advice_index === 1">
+                <span v-if="assessmentafter.weight_after == 0">
+                  {{ (predialysis.weight_before - afterdialysis.last_after_weight ).toFixed(1) }}kg
+                 </span>
+                 <span v-if="assessmentafter.weight_after>0">
+                   {{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}kg
+                 </span>
+                 
+              </td>
               <td v-if="advice_index === 2">干体重(DW)</td>
               <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
               <td v-if="advice_index === 3">较干体重增加量</td>

src/xt_pages/medicalScheduling/index.vue

@@ -57,7 +57,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周一' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true" >
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop="toClick(scope.row,scope.$index)"   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,1))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -81,7 +81,7 @@
                               <div v-if="name==scope.row.user_name&&column_lie =='周二' ? true:false">
                                 <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                   <el-button type="danger" size="mini" icon="el-icon-close" 
-                                    circle @click.stop=""   
+                                    circle @click.stop="toClick(getClassId(scope.row.user_name,2))"   
                                   ></el-button>
                                 </div>
                               </div>
@@ -106,7 +106,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周三' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,3))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -130,7 +130,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周四' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,4))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -154,7 +154,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周五' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,5))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -178,7 +178,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周六' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,6))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -202,7 +202,7 @@
                                 <div v-if="name==scope.row.user_name&&column_lie =='周日' ? true:false">
                                   <div class="del_table_btns" v-show="scope.row.user_name=='合计'? false : true">
                                     <el-button type="danger" size="mini" icon="el-icon-close" 
-                                      circle @click.stop=""   
+                                      circle @click.stop="toClick(getClassId(scope.row.user_name,0))"   
                                     ></el-button>
                                   </div>
                                 </div>
@@ -916,7 +916,7 @@ export default {
                         sixStr = strSix
                      }
                     }
-
+                   console.log("staffList",staffList)
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) == -1) {
@@ -927,14 +927,14 @@ export default {
                                 user_type:staffList[i].doctor_type,
                                 is_sort:staffList[i].is_sort,
                                 sort:staffList[i].sort,
-                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes}]
+                                list: [{class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributesk,id:staffList[i].id}]
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
                             console.log("staffList",staffList[i].user_name)
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].admin_user_id == staffList[i].admin_user_id) {
-                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
+                                    newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes,id:staffList[i].id})
                                 }
                             }
                         }
@@ -1051,6 +1051,26 @@ export default {
                 return newClass
             }
 
+        },
+        getClassId(name,index){
+           
+            if(name != undefined){
+                let id = '';
+                this.tableData.map(item => {
+                if(item.user_name == name){
+                    if(item.list){
+                        item.list.map(it => {
+                            if(it.schedule_week == index){
+                                id = it.id
+                            }
+                        })
+                    }
+
+                }
+                })
+                return id
+            }
+
         },
         getClassAttributes(name,index){
             if(name != undefined){
@@ -2051,7 +2071,7 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]))
        },
 
-       toClick(row,index){
+       toClick(id,index){
           this.$confirm(
             '是否要清除当前排班? <br>清除后,信息将无法恢复',
             '删除提示',
@@ -2062,8 +2082,9 @@ export default {
                 type: 'warning'
             }
             ).then(()=>{
-
-            DeleteStaffScheduleById(row.id).then(response=>{
+             console.log("rowwoowowow",id)
+           
+            DeleteStaffScheduleById(id).then(response=>{
                 if(response.data.state == 1){
                     var msg =  response.data.data.msg
                     this.$message.success("清除成功")

src/xt_pages/outpatientCharges/components/callUnAssociationPrescription.vue

@@ -151,6 +151,7 @@
         name:"",
         request_record_date:'',
         patient_id:0,
+        his_patient_id:0,
         allPrescription: [],
         isLastOrNextVisible: false,
 
@@ -329,18 +330,17 @@
             };
             prescriptions.push(obj)
           }
-        }
+          this.$emit('call',prescriptions,this.his_patient_id,this.patient_id)
 
-          this.$emit('call',prescriptions)
         }
       },
-      show(name,id,end_time, start_time,prescriptions){
+      show(name,id,end_time, start_time,prescriptions,his_patient_id){
         this.isLastOrNextVisible = true
         this.start_time  = start_time
         this.end_time = end_time;
-
+        this.his_patient_id = his_patient_id
         this.patient_id = id;
-        this.name = '处方调用' + '（'+name +'）';
+        this.name = '新就诊号与未结算处方关联' + '（'+name +'）';
 
         this.allPrescription = prescriptions;
         for (let i = 0; i < this.allPrescription.length; i++){

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -89,7 +89,7 @@
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
 
-          <div v-if="org_id == 10206  || org_id == 0">
+          <div v-if="org_id == 10206  ">
             <el-button  size="small"
                         @click="openZb(1)"
                         v-if=" this.order.id == 0"
@@ -101,7 +101,7 @@
             </el-button>
           </div>
 
-          <div  v-if="org_id != 10206 && org_id != 10340 && org_id != 0">
+          <div  v-if="org_id != 10206 && org_id != 10340 ">
             <!--            <el-button size="small"-->
             <!--                       @click="openZb(1)"-->
             <!--                       type="primary">登记-->
@@ -114,7 +114,7 @@
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
-                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375"
+                       v-if="org_id == 10191 || org_id == 10318 || org_id == 10567  || org_id == 10375 || org_id == 10480"
                        type="primary">登陆
             </el-button>
 
@@ -913,6 +913,8 @@
     <register-dialog ref='register' :doctors="doctors" :departments="department" :sick="sick" :diagnoses="diagnoses"
                      v-on:confirm="confirm" v-on:cancel="cancel"></register-dialog>
 
+    <call-un-association-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-un-association-prescription>
+
     <register-dialog9504 ref='register9504' :doctors="doctors" :departments="department" :sick="sick"
                          :diagnoses="diagnoses"
                          v-on:confirm="registerConfirm" v-on:cancel="registerCancel"></register-dialog9504>
@@ -1012,10 +1014,13 @@ import NewStatementPrintTwo from './newStatementPrintTwo'
 import RegisterDialog9504 from './components/registerDialog9504'
 import cryptoJs from 'crypto-js'
 import NewStatementPrintThree from './newStatementPrintThree.vue'
+import CallUnAssociationPrescription from './components/callUnAssociationPrescription.vue'
+import { associationprescription, checkHISPatient } from '../../api/his/his_tools'
 
 const moment = require('moment')
 export default {
   components: {
+    CallUnAssociationPrescription,
     NewStatementPrintThree,
     RegisterDialog9504,
     NewStatementPrintTwo,
@@ -1162,6 +1167,8 @@ export default {
       info: {},
       curPrescriptions: {},
       prescriptions: [],
+      association_prescriptions: [],
+
       big_prescriptions: [],
       big_prescriptions_two: [],
       check: 11,
@@ -1260,6 +1267,35 @@ export default {
     this.getPatientList()
   },
   methods: {
+    call(val,his_patient_id,patient_id) {
+      this.association_prescriptions = []
+      this.association_prescriptions = val
+      var ids  = []
+      for (let i = 0; i < this.prescriptions.length; i++) {
+        ids.push(this.prescriptions[i].id)
+      }
+      //上传关联数据
+      let params = {
+        'record_date': this.record_date,
+        'his_patient_id':his_patient_id,
+        'patient_id':patient_id,
+        'p_ids': ids.join(","),
+      }
+      associationprescription(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          this.loadingone = false
+          return false
+        } else {
+          this.$message.success("关联成功")
+        }
+      })
+      this.getPatientList()
+      this.$refs.call_prescription.close()
+    },
+    callCancel() {
+      this.$refs.call_prescription.close()
+    },
     comfirmFaPiaoCode(){
       var  that = this
       let params = {
@@ -1723,6 +1759,22 @@ export default {
     registerCancel() {
       this.$refs.register9504.hide()
 
+    },CheckHISPatient(){
+      let params ={
+        record_date:this.record_date,
+        patient_id:this.patientInfo.id
+      }
+      checkHISPatient(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg)
+          this.loadingone = false
+          return false
+        } else {
+          if(response.data.data.status = 1){
+            this.$refs.call_prescription.show(this.patientInfo.name, this.patientInfo.id,  this.record_date, this.record_date,response.data.data.ps,response.data.data.his_patient_id,response.data.data.patient_id)
+          }
+        }
+      })
     },
     registerConfirm(forms) {
       forms['record_time'] = this.record_date
@@ -1745,6 +1797,9 @@ export default {
             this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
             this.$refs.register9504.hide()
             this.loadingone = false
+
+            // this.CheckHISPatient()
+
           }
         })
       } else {
@@ -1776,6 +1831,8 @@ export default {
                   that.changeRadio(1)
                   that.$refs.register9504.hide()
                   that.$message({ message: '挂号成功', type: 'success' })
+                  // that.CheckHISPatient()
+
                 }
               }
             })
@@ -1804,6 +1861,9 @@ export default {
             this.$message({ message: '挂号成功', type: 'success', duration: 5000 })
             this.$refs.register.hide()
             this.loadingone = false
+
+            // this.CheckHISPatient(this.record_date,this.patientInfo.id)
+
           }
         })
       } else {
@@ -3215,7 +3275,7 @@ export default {
         }
 
         if (this.hisPatientInfo.id_card_type == 1) {
-          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210) {
+          if (this.hisPatientInfo.balance_accounts_type != 2 && this.$store.getters.xt_user.org_id != 10510 && this.$store.getters.xt_user.org_id != 10088 && this.$store.getters.xt_user.org_id != 10106 && this.$store.getters.xt_user.org_id != 10188 && this.$store.getters.xt_user.org_id != 10217 && this.$store.getters.xt_user.org_id != 10191 && this.$store.getters.xt_user.org_id !=  10318 && this.$store.getters.xt_user.org_id !=  10210 && this.$store.getters.xt_user.org_id !=  10375 &&  this.$store.getters.xt_user.org_id !=  10480) {
             this.pwdFormVisible = true
             this.pwd = ''
           } else {

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-       <el-button
+       <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">首拼</el-button>
+          @click="toJiaBan">首拼</el-button> -->
 
 
           <!-- <el-button

src/xt_pages/stock/drugs/cancelDrugStockOrderDetail.vue

@@ -64,6 +64,7 @@
           </template>
         </el-table-column>
 
+       
 
       </el-table>
     </el-row>

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

@@ -143,6 +143,11 @@
             {{scope.row.count}}
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.unit}}
+          </template>
+        </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             {{scope.row.total_price}}
@@ -472,10 +477,10 @@ export default {
     exportListOne(){
       // let obj = {'index':'合计','total_price':0}
     
- 
+      console.log("@332322323232332",this.tableList)
        for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
-          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
+          this.tableList[i].unit_one = this.tableList[i].dose + this.tableList[i].dose_unit + "*"+this.tableList[i].min_number + this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
           if(this.tableList[i].drug_type == 1){
              this.tableList[i].drugtype = "西药"
           }
@@ -490,11 +495,13 @@ export default {
 
         }
     
-      console.log("@332322323232332",this.tableList)
+    
+
+  
       
        import('@/vendor/Export2Excel').then(excel => {
-       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','总价']
-       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','total_price']
+       const tHeader = ['序号','单据编号', '药品类型','药品名称', '规格型号','生产厂商','进销商','操作时间','制单人','退货价','数量','单位','总价']
+       const filterVal = ['index','order_number','drugtype','drug_name', 'specification_name','manufacturer_name','dealer_name', 'time','user_name','price','count','unit','total_price']
 
        const data = this.formatJson(filterVal, this.tableList)
 

src/xt_pages/stock/drugs/drugCancelDetailPrint.vue

@@ -21,6 +21,7 @@
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height: 50px" width="80">单位</td>
               <td style="line-height:50px" width="80">单价</td>
               <td style="line-height:50px" width="80">总价</td>
               <td style="line-height: 50px" width="80">备 注</td>
@@ -43,6 +44,10 @@
               <td style="line-height: 50px">
                   {{item.count}}
                
+              </td>
+              <td style="line-height: 50px">
+                  {{item.unit}}
+               
               </td>
               <td style="line-height:50px">
                   {{item.price}}

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -152,6 +152,11 @@
              <span > {{getDrugCount(scope.row.over_count,scope.row.BaseDrugLib.max_unit,scope.row.BaseDrugLib.min_unit,scope.row.BaseDrugLib.min_number)}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
         <!-- <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
              <span>{{scope.row.batch_number}}</span>

src/xt_pages/stock/stockFlow.vue

@@ -154,6 +154,11 @@
              <span > {{scope.row.over_count}}</span>
            </template>
         </el-table-column>
+        <el-table-column prop="remark" label="备注" align="center">
+           <template slot-scope="scope">
+             <span > {{scope.row.remark}}</span>
+           </template>
+        </el-table-column>
        </el-table>
        
       <el-pagination

src/xt_pages/user/Sitemap.vue

@@ -830,14 +830,14 @@ export default{
 
       var fileType = file.type
       const isJPG = fileType.indexOf('image') > -1
-      const isLt2M = file.size / 1024 / 1024 < 5
+      const isLt2M = file.size / 1024 / 1024 < 20
 
       if (!isJPG) {
         this.$message.error('只能上传图片')
         return false
       }
       if (!isLt2M) {
-        this.$message.error('上传头像图片大小不能超过 5MB!')
+        this.$message.error('上传头像图片大小不能超过 20MB!')
         return false
       }