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

package-lock.json

@@ -4759,8 +4759,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4783,15 +4782,13 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4807,22 +4804,19 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4952,8 +4946,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4967,7 +4960,6 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4984,7 +4976,6 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4992,15 +4983,13 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5021,7 +5010,6 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5109,8 +5097,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5124,7 +5111,6 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5219,8 +5205,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5262,7 +5247,6 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5284,7 +5268,6 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5332,15 +5315,13 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

package.json

@@ -5,7 +5,8 @@
   "author": "Pan <panfree23@gmail.com>",
   "license": "MIT",
   "scripts": {
-    "dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+
+    "dev": "cross-env BABEL_ENV=development webpack-dev-server  --inline --progress --config build/webpack.dev.conf.js ",
     "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
     "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
     "build-cdn": "node build/build-cdn.js",

src/api/qcd.js

@@ -125,6 +125,15 @@ export function GetPersonQCStatistisData(params) {
   })
 }
 
+export function GetAllQCStatistisData(params) {
+  return request({
+    url: '/api/qc/patientstatistiscall/get',
+    method: 'get',
+    params: params
+  })
+}
+
+
 
 
 

src/xt_pages/Dialysisanalysis/albumin/albuminall.vue

@@ -1,254 +1,675 @@
 <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">
+  <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
+        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-date-picker
-            v-model="time_month"
-            type="month"
-            placeholder="选择月">
-            </el-date-picker>
+            <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="8">
+        <el-col :span="10">
           <div>
             <el-date-picker
-            v-model="stat_time"
-            type="date"
-            placeholder="选择日期">
+              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
-            v-model="end_time"
-            type="date"
-            placeholder="选择日期">
+              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="3">
-          <div style="width: 200px;">
-            <el-input v-model="input" placeholder="请输入内容"></el-input>
+
+        <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">
-            <el-button type="primary">查询</el-button>
+          <div>
+            <el-button @click="exportAction()">导出</el-button>
+          </div>
         </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
-            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>
+<!--        <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";
-export default{
-    props: {
+import * as echarts from 'echarts'
+import { GetQCStatistisData,GetAllQCStatistisData } from '../../../api/qcd'
+
+const moment = require('moment')
+
+export default {
+  props: {
 
     width: {
       type: String,
-      default: "100%"
+      default: '100%'
     },
     height: {
       type: String,
-      default: "400px"
-    },
+      default: '400px'
+    }
 
   },
-    data() {
-        return {
-            time_month:'',
-            stat_time:'',
-            end_time:'',
-            input:'',
-            myChart: {},
-            pieData : [
-            {
-          value: 463,
-          name: "不达标值患者"
-        },
-        {
-          value: 395,
-          name: "未检查患者"
-        },
-        {
-          value: 157,
-          name: "达标值患者"
-        },
-
-            ],
-            pieName: [],
-            // myChartStyle:{float: "right", width: "100%", height: "400px"},
-            tableData:[],
+  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: '自定义' }
+
+      ],
+      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: [],
+      reference:{},
+      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
+        })
+      })
     },
-    mounted() {
-    this.initDate(); //数据初始化
-    this.initEcharts();
+    formatJson(filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]))
   },
-  methods: {
-    initDate() {
-      for (let i = 0; i < this.pieData.length; i++) {
-        this.pieName[i] = this.pieData[i].name;
+    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: 2,
+        item_id: 35,
+        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)
+        }
+      })
+
     },
-    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})"
+    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: 2,
+        item_id: 35
+      }
+      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 / response.data.data.patient_count,
+            name: '不达标值患者',
+            count:response.data.data.unusual_total,
+          }
+          this.pieData.push(objone)
+          this.tableData.push(objone)
+
+          let objtwo = {
+            value:   response.data.data.normal_total / response.data.data.patient_count,
+            name: '达标值患者',
+            count:response.data.data.normal_total,
+
+          }
+          this.pieData.push(objtwo)
+          this.tableData.push(objtwo)
+
+          let objthree = {
+            value: response.data.data.patient_count / 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'
             },
-            radius: "65%", //饼图半径
-            data: this.pieData,
-            itemStyle : {
-              emphasis: {
-                  shadowBlur: 10,
-                  shadowOffsetX: 0,
-                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+            color: ['#ff7f9f', '#fff67f', '#1e5feb'],
+            title: {
+              // 设置饼图标题，位置设为顶部居中
+              //   text: "国内院士前五省份图示",
+              top: '0%',
+              left: 'center'
+            },
+            series: [
+              {
+                type: 'pie',
+                label: {
+                  show: true,
+                  formatter: '{b} : {d}% ({c})'
+                  // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
+                },
+                radius: '65%', //饼图半径
+                data: this.pieData
               }
-            }
+            ]
           }
-        ]
-      };
-    //   console.log(this.seriesData);
-      const optionFree = {
-        series: [
-          {
-            data: this.seriesData,
-            type: "line",
-            smooth: true
+          //   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();
-      });
+          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
+      }
     },
+    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
+      }
+    },
+
     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';
-          }
-        });
+      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;
+      return sums
     },
-    handleClick(id){
-        console.log(id);
+    handleClick(row) {
+      console.log(row)
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
+      // console.log(id)
     }
   }
 
 }
 </script>
 <style lang="scss" scoped>
-.content_top{
-    display: flex;
-    justify-content: space-around;
-    color: #1e5feb;
+.content_top {
+  display: flex;
+  justify-content: space-around;
+  color: #1e5feb;
 }
 </style>

src/xt_pages/Dialysisanalysis/albumin/albuminalone.vue

@@ -354,7 +354,8 @@ export default {
         path: "/Dialysisanalysis/qualitycontrol/print?patient_id=" + this.query.patient_id+"&project_id="+this.query.project_id+"&item_id="+this.query.item_id+"&start_time="+this.query.start_time+"&end_time="+this.query.end_time
       });
 
-    },exportAction(){
+    },
+    exportAction(){
       let list = []
       for (let i = 0; i < this.tableData.length; i++) {
         let order = this.tableData[i]

src/xt_pages/Dialysisanalysis/bloodPhosphorus/phosphorusall.vue

@@ -68,23 +68,163 @@
           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-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 { GetQCStatistisData } from '../../../api/qcd'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
 
 const moment = require('moment')
 
@@ -103,6 +243,18 @@ export default {
   },
   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_two:1,
       time_type: 1,
       times: [
         { value: 1, label: '本月' },
@@ -119,6 +271,11 @@ export default {
       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: [],
@@ -126,12 +283,153 @@ export default {
       // myChartStyle:{float: "right", width: "100%", height: "400px"},
       tableData: [],
       reference:{},
+      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]))
+    },
+    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: 4,
+        item_id: 169,
+        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)
+        }
+      })
+
+    },
+    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
+      }
+    },
+
     getData() {
       if(this.start_time.length == 0){
         this.$message.error("请选择开始时间")
@@ -353,8 +651,16 @@ export default {
 
       return sums
     },
-    handleClick(id) {
-      console.log(id)
+    handleClick(row) {
+      console.log(row)
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
     }
   }
 

src/xt_pages/Dialysisanalysis/bloodPotassium/potassiumall.vue

@@ -67,23 +67,163 @@
           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-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 { GetQCStatistisData } from '../../../api/qcd'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
 
 const moment = require('moment')
 
@@ -102,7 +242,19 @@ export default {
   },
   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: '上月' },
@@ -118,6 +270,11 @@ export default {
       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: [],
@@ -125,12 +282,74 @@ export default {
       // myChartStyle:{float: "right", width: "100%", height: "400px"},
       tableData: [],
       reference:{},
+      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]))
+    },
+    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: 4,
+        item_id: 48,
+        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("请选择开始时间")
@@ -142,7 +361,7 @@ export default {
         start_date: this.start_time,
         end_date: this.end_time,
         project_id: 4,
-        item_id: 48
+        item_id: 48,
       }
       this.pieData = []
       this.tableData = []
@@ -324,6 +543,85 @@ export default {
           break
       }
     },
+    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
+      }
+    },
 
 
     getSummaries(param) {
@@ -352,8 +650,16 @@ export default {
 
       return sums
     },
-    handleClick(id) {
-      console.log(id)
+    handleClick(row) {
+      console.log(row)
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
     }
   }
 

src/xt_pages/Dialysisanalysis/calcium/calciumall.vue

@@ -67,23 +67,163 @@
           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-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 { GetQCStatistisData } from '../../../api/qcd'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
 
 const moment = require('moment')
 
@@ -102,7 +242,19 @@ export default {
   },
   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: '上月' },
@@ -118,6 +270,11 @@ export default {
       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: [],
@@ -125,12 +282,74 @@ export default {
       // myChartStyle:{float: "right", width: "100%", height: "400px"},
       tableData: [],
       reference:{},
+      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]))
+    },
+    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: 4,
+        item_id: 289,
+        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("请选择开始时间")
@@ -325,6 +544,86 @@ export default {
           break
       }
     },
+    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
+      }
+    },
+
 
 
     getSummaries(param) {
@@ -353,8 +652,16 @@ export default {
 
       return sums
     },
-    handleClick(id) {
-      console.log(id)
+    handleClick(row) {
+      console.log(row)
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
     }
   }
 

src/xt_pages/Dialysisanalysis/hemoglobin/hemoglobinall.vue

@@ -69,23 +69,23 @@
           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-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'
-import { GetQCStatistisData } from '../../../api/qcd'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
 
 const moment = require('moment')
 
@@ -104,7 +104,19 @@ export default {
   },
   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: '上月' },
@@ -121,18 +133,163 @@ export default {
       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: []
+      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: 1,
+        item_id: 17,
+        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("请选择开始时间")
@@ -354,8 +511,16 @@ export default {
 
       return sums
     },
-    handleClick(id) {
-      console.log(id)
+    handleClick(row) {
+      console.log(row)
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
     }
   }
 

src/xt_pages/Dialysisanalysis/platelets/plateletsall.vue

@@ -68,23 +68,163 @@
           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-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 { GetQCStatistisData } from '../../../api/qcd'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
 
 const moment = require('moment')
 
@@ -103,7 +243,19 @@ export default {
   },
   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: '上月' },
@@ -119,19 +271,84 @@ export default {
       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: [],
       reference:{},
       // myChartStyle:{float: "right", width: "100%", height: "400px"},
-      tableData: []
+      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]))
+    },
+    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: 1,
+        item_id: 166,
+        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("请选择开始时间")
@@ -325,6 +542,85 @@ export default {
           break
       }
     },
+    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
+      }
+    },
 
 
     getSummaries(param) {
@@ -353,8 +649,16 @@ export default {
 
       return sums
     },
-    handleClick(id) {
-      console.log(id)
+    handleClick(row) {
+      console.log(row)
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
     }
   }
 

src/xt_pages/Dialysisanalysis/qualitycontrol/totalSstatistics.vue

@@ -67,124 +67,163 @@
           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-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 class="centerDialog"-->
-<!--               title="打印"-->
-<!--              >-->
-<!--      <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">-->
-<!--          <el-select-->
-<!--            placeholder="请选择类型"-->
-<!--            style="width:95%"-->
-<!--          >-->
-<!--            <el-option label="不达标患者" value="1"></el-option>-->
-<!--            <el-option label="未检查患者" value="2"></el-option>-->
-<!--            <el-option label="达标患者" value="3"></el-option>-->
-<!--            <el-option label="不限" value="0"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-col>-->
-<!--        <el-col :span="5">-->
-<!--          <el-select-->
-<!--            placeholder="请选择排序"-->
-<!--            style="width:95%"-->
-<!--          >-->
-<!--            <el-option label="按时间" value="1"></el-option>-->
-<!--            <el-option label="按患者" value="2"></el-option>-->
-<!--            <el-option label="不限" value="0"></el-option>-->
-<!--          </el-select>-->
-<!--        </el-col>-->
-<!--        <el-col :span="3">-->
-<!--          <el-button type="primary" @click="getData()">查询</el-button>-->
-<!--          <el-button type="primary" @click="getData()">打印</el-button>-->
-<!--          <el-button type="primary" @click="getData()">导出</el-button>-->
-
-<!--        </el-col>-->
-<!--      </el-row>-->
-<!--      <div style="width: 80%;margin: auto;">-->
-<!--        <el-table-->
-<!--          :data="tableData"-->
-<!--          border-->
-<!--          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="检查日期">-->
-
-<!--          </el-table-column>-->
-<!--          <el-table-column-->
-<!--            prop="address"-->
-<!--            align="center"-->
-<!--            label="结果">-->
-
-<!--          </el-table-column>-->
-<!--        </el-table>-->
-<!--      </div>-->
-
-<!--    </el-dialog>-->
+    <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 { GetQCStatistisData } from '../../../api/qcd'
+import { GetAllQCStatistisData, GetQCStatistisData } from '../../../api/qcd'
 
 const moment = require('moment')
 
@@ -203,7 +242,19 @@ export default {
   },
   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: '上月' },
@@ -219,6 +270,11 @@ export default {
       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: [],
@@ -226,12 +282,74 @@ export default {
       // myChartStyle:{float: "right", width: "100%", height: "400px"},
       tableData: [],
       reference:{},
+      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]))
+    },
+    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: 20,
+        item_id: 171,
+        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("请选择开始时间")
@@ -425,6 +543,85 @@ export default {
           break
       }
     },
+    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
+      }
+    },
 
 
     getSummaries(param) {
@@ -453,8 +650,15 @@ export default {
 
       return sums
     },
-    handleClick(id) {
-      console.log(id)
+    handleClick(row) {
+      if(row.name == "不达标值患者"){
+        this.statistics_type = 1
+      }else if(row.name == "达标值患者"){
+        this.statistics_type = 3
+      }else {
+        this.statistics_type = 2
+      }
+      this.getDataTwo()
     }
   }
 

src/xt_pages/dialysis/batch_print/batch_print_order_thirteen.vue

@@ -438,9 +438,9 @@
                 <div class="row">
                   上机医生
                   <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-                    <span v-if="setAdminUserES(record.prescription, 'prescription_doctor') == ''">{{getAdminUser(record.prescription, 'prescription_doctor')}}</span>
+                    <span v-if="setAdminUserES(record.prescription, 'creater') == ''">{{getAdminUser(record.prescription, 'creater')}}</span>
                     <span v-else>
-                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'prescription_doctor')" />
+                      <img class="es-img" style="height:30px;" :src="setAdminUserES(record.prescription, 'creater')" />
                     </span>
                   </div>
                   冲管护士

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

@@ -1,5 +1,6 @@
 <template>
- <div>
+  <div>
+  <div>
   <el-dialog
     title="接诊评估"
     class="newDialog"
@@ -222,6 +223,10 @@
           v-if="isShow('跌倒风险预防措施')"
           style="display: inline-block;"
         >
+          <!--v-if="isShow('跌倒风险预防措施')" isFalldown prop="precautionTwo" @change="precautionchange" isCheckmust('跌倒风险预防措施')
+            :prop="isName('跌倒风险预防措施')" :rules="isCheckmust('跌倒风险预防措施')"
+            [{required: true, message: '请选择跌倒风险预防措施', trigger: 'change'}]-->
+
           <el-checkbox-group v-model="precautionTwo" @change="precautionchange" >
             <el-checkbox
               v-for="item in precaution_arr"
@@ -232,7 +237,6 @@
           </el-checkbox-group>
         </el-form-item>
       </div>
-
       <el-form-item
         label-width="200px"
         label="其他跌倒风险预防措施 : "
@@ -338,50 +342,48 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <!--v-if="hasPermission" -->
-      <el-button type="primary"  @click="handleComfirm('receiveTreatmentAsses')"
+      <!-- v-if="hasPermission"-->
+      <el-button type="primary"   @click="handleComfirm('receiveTreatmentAsses')"
         >保 存</el-button
       >
     </div>
   </el-dialog>
 
 
- <el-dialog
-          title="提示"
-          :visible.sync="infoDialogVisible"
-          width="30%">
-          <span>
-           <el-form>
-             <el-row>
-               <span>申请日期:</span>
-                <span>
-                    <el-date-picker
-                      type="datetime"
-                      format="yyyy-MM-dd HH:mm"
-                      value-format="yyyy-MM-dd HH:mm"
-                      placeholder="选择时间"
-                      v-model="selected_date"
-                  ></el-date-picker>
-                </span>
-             </el-row>
-             <el-row>
-               <span>备注:</span>
-                <span>
-                   <el-input v-model="remark" style="width:200px"></el-input>
-                </span>
-             </el-row>
-           </el-form>
-
-          </span>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="infoDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="saveInformation">确 定</el-button>
-          </span>
-        </el-dialog>
-
-  </div>
-
-
+  <el-dialog
+      title="提示"
+      :visible.sync="infoDialogVisible"
+      width="30%">
+      <span>
+        <el-form>
+          <el-row>
+            <span>申请日期:</span>
+            <span>
+                <el-date-picker
+                  type="datetime"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                  placeholder="选择时间"
+                  v-model="selected_date"
+              ></el-date-picker>
+            </span>
+          </el-row>
+          <el-row>
+            <span>备注:</span>
+            <span>
+                <el-input v-model="remark" style="width:200px"></el-input>
+            </span>
+          </el-row>
+        </el-form>
+
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="infoDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="saveInformation">确 定</el-button>
+      </span>
+    </el-dialog>
+   </div>
+ </div>
 </template>
 
 <script>
@@ -431,12 +433,13 @@ export default {
         tumble: "",
         his_department: "",
         his_bed: "",
+        falldown:[],
       },
       precautionTwo: [],
+      arr:[],
       infoDialogVisible:false,
       selected_date:"",
-      remark:"",
-      arr:[],
+      remark:""
     };
   },
   methods: {
@@ -455,27 +458,40 @@ export default {
     },
     show(accepts) {
       console.log("accepts333333", accepts);
+    
+      console.log("入库时方式",this.way_arr)
+     
+      console.log("体委",this.posture_arr)
       if (accepts.id > 0) {
         accepts.tumble = accepts.tumble.toString();
+      }else{
+        console.log("hh2h3h2h3h32h23h23h32h23h")
+        // this.receiveTreatmentAsses.way = "1"
+        // this.receiveTreatmentAsses.posture ="1"
+        // this.receiveTreatmentAsses.condition = "2"
+
+        accepts.way =1
+        accepts.posture=1
+        accepts.condition =2
+
       }
       this.accepts = accepts;
-      // console.log("accepts", accepts);
-      var arr = [];
-      if (this.accepts.precaution) {
-        var precaution = this.accepts.precaution.split(",");
-        // console.log("precaution", precaution);
-        // console.log("hhh", this.precaution_arr);
-        for (let i = 0; i < precaution.length; i++) {
-          for (let j = 0; j < this.precaution_arr.length; j++) {
-            if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
-              // console.log("aaaa");
-              arr.push(this.precaution_arr[j].name);
-            }
-          }
-        }
-        this.precautionTwo = arr;
-        // console.log("arr", arr);
-      }
+     console.log("accepts", accepts);
+      // var arr = [];
+      // if (this.accepts.precaution) {
+      //   var precaution = this.accepts.precaution.split(",");
+      //   // console.log("precaution", precaution);
+      //   // console.log("hhh", this.precaution_arr);
+      //   for (let i = 0; i < precaution.length; i++) {
+      //     for (let j = 0; j < this.precaution_arr.length; j++) {
+      //       if (parseInt(precaution[i]) == this.precaution_arr[j].id) {
+      //         // console.log("aaaa");
+      //         this.arr.push(this.precaution_arr[j].name);
+      //       }
+      //     }
+      //   }
+      //   this.precautionTwo = this.arr;
+      // }
 
       this.getPermission();
       for (var index in this.receiveTreatmentAsses) {
@@ -509,19 +525,16 @@ export default {
 
     handleComfirm: function (formName) {
       // var arr = [];
-        if(this.precaution_arr!=null && this.precaution_arr.length >0){
-        for (let i = 0; i < this.precaution_arr.length; i++) {
-          for (let j = 0; j < this.precautionTwo.length; j++) {
-            if (this.precaution_arr[i].name == this.precautionTwo[j]) {
-              this.arr.push(this.precaution_arr[i].id);
-            }
+      for (let i = 0; i < this.precaution_arr.length; i++) {
+        for (let j = 0; j < this.precautionTwo.length; j++) {
+          if (this.precaution_arr[i].name == this.precautionTwo[j]) {
+            this.arr.push(this.precaution_arr[i].id);
           }
         }
-        var obj = this.arr.join(",");
       }
-
+      // this.precautionchange()
+      var obj = this.arr.join(",");
       this.receiveTreatmentAsses.precaution = obj;
-
       let ParamsQuery = this.receiveTreatmentAsses;
 
       console.log("ParamsQuery", ParamsQuery);
@@ -544,6 +557,9 @@ export default {
           postAccepts(ParamsQuery).then((response) => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
+               if(response.data.code == 600000008){
+                 this.infoDialogVisible = true
+               }
               return false;
             } else {
               this.$notify({
@@ -696,7 +712,7 @@ export default {
         saveInformation(params).then(response=>{
            if(response.data.state == 1){
              var information = response.data.data.information
-             this.$message.success("审核成功!")
+             this.$message.success("提交成功!")
              this.infoDialogVisible = false
            }
         })

src/xt_pages/dialysis/dialysisFlow.vue

@@ -568,10 +568,10 @@
         });
       },
       clickCurrent(val) {
-        console.log(val);
+        console.log("val23323223",val);
         this.$router.push({
           path: "/dialysis/details",
-          query: { patient_id: val.patient_id, date: val.sch_time_int,mode_id:val.mode_id }
+          query: { patient_id: val.patient_id, date: val.schedule_date,mode_id:val.mode_id }
         });
       },
       handleSelectionChange(val) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -351,8 +351,8 @@
         <div class="row">
           上机医生
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">
-            <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
+            <span v-if="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.creater?prescription.creater:'')) }} </span>
+            <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.creater?prescription.creater:''))" alt="" srcset="" v-else />
           </div>
           冲管护士
           <div class="inline_block under_line" style="width:150px;text-align: center;margin-right:30px;">

src/xt_pages/outpatientCharges/settlementTemplate/printOne.vue

@@ -336,6 +336,7 @@
                                         <td style="width:10%;">麻醉医师代码</td>
                                     </tr>
                                     <tr>
+
                                         <td style="text-align:left;">&nbsp;主要：</td>
                                         <td>&nbsp;</td>
                                         <td>&nbsp;</td>

src/xt_pages/outpatientCharges/summary.vue

@@ -738,6 +738,59 @@ export default {
           })
           .catch(function (error) {
           });
+    },export_detail_zzzz(){
+      handleTeamData({}).then((response) => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          let list = [];
+          for (let i = 0; i < response.data.data.ps.length; i++) {
+            let order = response.data.data.ps[i];
+            let obj = {
+              id:order.team_id,
+              name:order.pn,
+              sub_id:order.project.id,
+              sub_name:order.project.project_name
+            }
+            list.push(obj)
+          }
+
+          var tarList = [];
+          for (let i = 0; i < list.length; i++) {
+            let obj = {
+              "大项id": list[i].id,
+              "大项名称": list[i].name,
+              "子项id": list[i].sub_id,
+              "子项名称": list[i].sub_name,
+            }
+            tarList.push(obj)
+          }
+
+          import("@/vendor/Export2Excel").then((excel) => {
+            const tHeader = [
+              "大项id",
+              "大项名称",
+              "子项id",
+              "子项名称",
+            ];
+            const filterVal = [
+              "大项id",
+              "大项名称",
+              "子项id",
+              "子项名称",
+            ];
+            const data = this.formatJson(filterVal, tarList);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data,
+              filename: "消费明细",
+            });
+          });
+        }
+      });
+
+
     },
     queryData(row){
       var that = this;

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2416,6 +2416,7 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
+                console.log("2o23o23o23o2o23",this.prescriptions[i].advices[b])
                 if(this.prescriptions[i].advices[b].day == NaN){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}天数未填写`)
                   this.$emit('editKeepLoad', false)
@@ -2426,6 +2427,8 @@ export default {
                   this.$emit('editKeepLoad', false)
                   return
                 }
+          
+
                 if(this.prescriptions[i].advices[b].prescribing_number == ""){
                   this.$message.error(`处方${i+1}的${this.prescriptions[i].advices[b].drug_name}总量未填写`)
                   this.$emit('editKeepLoad', false)

src/xt_pages/outpatientTool/components/settle.vue

@@ -93,6 +93,8 @@
               <template slot-scope="scope">
                   <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
                   <div v-if="scope.row.med_type == '11'">普通门诊</div>
+                  <div v-if="scope.row.med_type == '1112'">普通门诊</div>
+                
               </template>
           </el-table-column>
           <el-table-column align="center" prop="item_name" label="医疗费总额">

src/xt_pages/outpatientTool/labelPrint.vue

@@ -47,11 +47,16 @@
 
                   <el-checkbox v-model="is_combination_print">是否组合打印</el-checkbox>
 
+<!--                  <el-checkbox v-model="is_combination_print">是否组合打印</el-checkbox>-->
+                  <el-button v-if="!is_combination_print" @click="printTwo()">组合打印</el-button>
+
                 </div>
             </div>
             <el-table :data="isShow?tableData:tableDataTwo" border :row-style="{ color: '#303133' }" ref="table"
                       :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                      @selection-change="handleSelectionChange"
                       highlight-current-row>
+              <el-table-column align="center" type="selection" width="55"></el-table-column>
 
                 <el-table-column align="center" prop="name" label="患者名字">
                     <template slot-scope="scope">{{ scope.row.patient_name }}</template>
@@ -216,7 +221,7 @@
         current_number: '',
         current_project_name: '',
         current_name: '',
-
+        selecting_schs:[],
         labelVisible: false,
         crumbs: [
           { path: false, name: 'HIS工具' },
@@ -244,6 +249,182 @@
       }
     },
     methods: {
+      printTwo(){
+        let patient_ids = []
+        for(let i = 0; i < this.selecting_schs.length; i++){
+          patient_ids.push(this.selecting_schs[i].patient_id)
+        }
+        patient_ids =  this.uniqueTwo(patient_ids)
+        if(patient_ids.length != 0 && patient_ids.length > 1){
+          this.$message.error("请选择同一患者打印")
+          return
+        }else{
+          let ids = []
+          var name = ""
+          var patient_name = ""
+          var team_ids = ""
+          var project_ids = ""
+
+
+          for(let i = 0; i < this.selecting_schs.length; i++){
+            ids.push(this.selecting_schs[i].id)
+            patient_name = this.selecting_schs[0].patient_name
+            if(name.length == 0){
+              name = this.selecting_schs[i].project_name
+            }else{
+              name = name + "," + this.selecting_schs[i].project_name
+
+            }
+
+            if(team_ids.length == 0){
+              if(this.selecting_schs[i].team_id > 0) {
+                team_ids = this.selecting_schs[i].team_id
+              }
+            }else{
+              if(this.selecting_schs[i].team_id > 0) {
+                team_ids = team_ids + "," + this.selecting_schs[i].team_id
+              }
+            }
+
+            if(project_ids.length == 0){
+              if(this.selecting_schs[i].team_id > 0) {
+                project_ids = this.selecting_schs[i].project_ids
+              }
+            }else{
+              if(this.selecting_schs[i].team_id > 0) {
+                project_ids = project_ids + "," + this.selecting_schs[i].project_ids
+              }
+            }
+          }
+          let params = {
+            patient_id: patient_ids[0],
+            ids: ids,
+            record_date:this.chargeDate,
+          }
+          getPrintLable(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.labelVisible = true
+              if(response.data.data.labels.id > 0){
+                this.current_ctime = response.data.data.labels.ctime
+                this.current_number = ""
+                this.current_project_name =name
+                this.current_name = patient_name
+                this.$nextTick(() => {
+                  JsBarcode('#barcode',response.data.data.labels.id, {
+                    format: 'CODE39',
+                    lineColor: '#000',
+                    background: '#EBEEF5',
+                    width: 3,
+                    height: 200,
+                    displayValue: false,
+                    fontOptions:"bold italic",//使文字加粗体或变斜体
+                    font:"fantasy",//设置文本的字体
+                    textAlign:"left",//设置文本的水平对齐方式
+                    textPosition:"top",//设置文本的垂直位置
+                    textMargin:5,//设置条形码和文本之间的间距
+                    fontSize:15,//设置文本的大小
+                    margin:15//设置条形码周围的空白边距
+                  })
+                });
+
+              }else{
+                let params = {
+                  is_combination_print:this.is_combination_print,
+                  patient_id: patient_ids[0],
+                  ids:ids,
+                  team_ids:team_ids,
+                  project_ids:project_ids,
+                  doctor_id:0,
+                  is_team:0,
+                  record_date:this.chargeDate,
+                }
+                this.current_params = params
+                console.log(this.current_params)
+                if(!this.current_params.is_combination_print){
+                  if(this.current_params.project_ids.toString().length > 0 && this.current_params.team_ids.toString().length == 0){
+                    this.current_params.is_team = 0
+                  }else if(this.current_params.project_ids.toString().length == 0 && this.current_params.team_ids.toString().length > 0){
+                    this.current_params.is_team= 1
+                  }
+                }else{
+                  this.current_params.is_team = 0
+
+                }
+
+
+                if(!this.isShow){
+                  createPrintLable(this.current_params).then(response => {
+                    if (response.data.state == 0) {
+                      this.$message.error(response.data.msg)
+                      return false
+                    } else {
+                      this.current_ctime = row.ctime
+                      this.current_number = row.number
+                      this.current_project_name = row.project_name
+                      this.current_name = row.patient_name
+                      this.$nextTick(() => {
+                        JsBarcode('#barcode',response.data.data.hlpsi.id, {
+                          format: 'CODE39',
+                          lineColor: '#000',
+                          background: '#EBEEF5',
+                          width: 3,
+                          height: 200,
+                          displayValue: false,
+                          fontOptions:"bold italic",//使文字加粗体或变斜体
+                          font:"fantasy",//设置文本的字体
+                          textAlign:"left",//设置文本的水平对齐方式
+                          textPosition:"top",//设置文本的垂直位置
+                          textMargin:5,//设置条形码和文本之间的间距
+                          fontSize:15,//设置文本的大小
+                          margin:15//设置条形码周围的空白边距
+                        })
+
+                      });
+                    }
+                  })
+
+                }else{
+                  createPrintLable(this.current_params).then(response => {
+                    if (response.data.state == 0) {
+                      this.$message.error(response.data.msg)
+                      return false
+                    } else {
+                      this.current_ctime = row.ctime
+                      this.current_number = row.number
+                      this.current_project_name = row.project_name
+                      this.current_name = row.patient_name
+                      this.$nextTick(() => {
+                        JsBarcode('#barcode',response.data.data.hlpsi.id, {
+                          format: 'CODE39',
+                          lineColor: '#000',
+                          background: '#EBEEF5',
+                          width: 5,
+                          height: 300,
+                          displayValue: false,
+                          fontOptions:"bold italic",//使文字加粗体或变斜体
+                          font:"fantasy",//设置文本的字体
+                          textAlign:"left",//设置文本的水平对齐方式
+                          textPosition:"top",//设置文本的垂直位置
+                          textMargin:5,//设置条形码和文本之间的间距
+                          fontSize:15,//设置文本的大小
+                          margin:15//设置条形码周围的空白边距
+                        })
+                      });
+                    }
+                  })
+                }
+              }
+            }
+          })
+        }
+      },
+      handleSelectionChange(val) {
+        this.selecting_schs = val
+        console.log(this.selecting_schs)
+      },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
 
@@ -504,6 +685,21 @@
           }
         }
         return res
+      },uniqueTwo(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i] === res[j]) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
       },
       getListTwo() {
         let params = {

src/xt_pages/user/components/PatientDetail.vue

@@ -347,6 +347,39 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者去向 : "
+                >
+                  <el-radio-group v-model="form.patient_source">
+                    <el-radio
+                     disabled
+                      v-for="item in patientSourceList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+                <el-col :span="8" style="margin-bottom: 20px;">
+                <el-form-item
+                  label="备注 : "
+                  prop="sch_remark">
+                  <el-input
+                   disabled
+                    type="textarea"
+                    :rows="3"
+                    v-model="form.sch_remark"
+                    resize="none"
+                    placeholder
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+
             <el-col :span="8" style="height: 59px">
               <el-form-item
                 label="治疗状态(转归) : "
@@ -1027,7 +1060,8 @@
                 </tr>
                 <tr>
                   <td>
-                    <div class="td_proj_title">传<br />染<br />病</div>
+                    <div class="td_proj_title" v-if="org_id !=10278 && org_id!=10138 && org_id!=0">传<br />染<br />病</div>
+                    <div class="td_proj_title" v-if="org_id==10138 || org_id == 10278 || org_id == 0">过<br />敏<br />史</div>
                   </td>
                   <td colspan="7">
                     <div class="td_proj_content td_align_left">
@@ -1093,7 +1127,7 @@
               <div class="proj">
                 <span class="proj_title">日期：</span>
                 <!-- {{ getTime(patientPrint.created_time) }} -->
-                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 10138|| org_id == 9675 || org_id == 10394">{{
+                <span v-if="org_id == 3907 || org_id == 9671|| org_id == 9675 || org_id == 10394">{{
                   getTime(patientPrint.created_time)
                 }}</span>
                 <span v-else>{{ printDate }}</span>
@@ -1237,6 +1271,7 @@ const defaultForm = {
   treatment_plan: "",
   doctor:"",
   record_number:"",
+  patient_source:"",
 };
 
 export default {
@@ -1254,7 +1289,12 @@ export default {
         { id: 6, name: "军队医疗" },
         { id: 7, name: "其他" },
       ],
-
+      patientSourceList:[
+        {value:1,label:"门诊"},
+        {value:2,label:"住院"},
+        {value:3,label:"请假"},
+        {value:4,label:"备注"}
+      ],
       generic_info_fold: true,
       treat_info_fold: true,
       dialogFormVisible: false,
@@ -1573,6 +1613,8 @@ export default {
               patietInfo.first_treatment_date,
               "{y}-{m}-{d}"
             );
+            
+            this.form.patient_source = patietInfo.patient_source
 
             // this.form.initial = patietInfo.initial_dialysis + "";
             // this.form.dialysisTotal = patietInfo.total_dialysis + "";
@@ -1861,7 +1903,7 @@ export default {
               }
               this.patientPrint.contagions = printContagions.join("、");
             } else {
-              this.patientPrint.contagions = "无";
+              this.patientPrint.contagions = "阴性";
             }
 
             if (diseasesArr.length > 0) {
@@ -1907,6 +1949,8 @@ export default {
               this.patientPrint.hospital_first_dialysis_date = "";
             }
 
+          
+
             this.checkIdCardNo();
           } else {
             console.log("patient get err state");

src/xt_pages/user/components/PatientForm.vue

@@ -394,7 +394,23 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8" style="margin-bottom: 20px;">
+              <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item
+                  label="患者去向 : "
+                >
+                  <el-radio-group v-model="form.patient_source">
+                    <el-radio
+                      v-for="item in patientSourceList"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                      >{{ item.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="8" style="margin-bottom: 20px;" :style="isEdit ? 'width:360px' : ''">
                 <el-form-item
                   label="备注 : "
                   prop="sch_remark">
@@ -1061,6 +1077,7 @@ const defaultForm = {
   troble_shoot:2,
   zb_patient_id:"",
   doctor:"",
+  patient_source:0,
   formItem: [
     {
       id: 0,
@@ -1307,6 +1324,12 @@ export default {
       // typeOptions: null,
       // styleOptions: null,
       sourceOptions: [{ value: 1, label: "门诊" }, { value: 2, label: "住院" }],
+      patientSourceList:[
+        {value:1,label:"门诊"},
+        {value:2,label:"住院"},
+        {value:3,label:"请假"},
+        {value:4,label:"备注"}
+      ],
       lapsetoOptions: [
         { value: 1, label: "留治" },
         { value: 2, label: "转出" }
@@ -1541,6 +1564,18 @@ export default {
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            if(this.form.patient_source >0){
+              this.form.patient_source = parseInt(this.form.patient_source)
+            }else{
+              this.form.patient_source = 4
+            }
+
+            if(this.form.patient_source == "NaN"){
+              this.form.patient_source = 4
+            }
+            
+          
+            
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
                this.form.avatar = this.form.avatar
             }else{
@@ -1580,6 +1615,15 @@ export default {
             this.form.age = parseInt(this.form.age);
             this.form.troble_shoot = parseInt(this.form.troble_shoot)
             this.form.doctor = parseInt(this.form.doctor)
+            if(this.form.patient_source >0){
+              this.form.patient_source = parseInt(this.form.patient_source)
+            }else{
+              this.form.patient_source = 4
+            }
+
+            if(this.form.patient_source == "NaN"){
+              this.form.patient_source = 4
+            }
             console.log("form233322332w",this.form)
 
             createPatient(this.form)
@@ -1911,6 +1955,10 @@ export default {
             if(this.form.doctor == 0){
               this.form.doctor = ""
             }
+
+         
+            this.form.patient_source = patietInfo.patient_source
+            
             this.checkIdCardNo();
           } else {
             this.$notify.error({

src/xt_pages/user/courseOfDisease.vue

@@ -852,7 +852,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear() -1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =

src/xt_pages/user/firstDisease.vue

@@ -674,12 +674,13 @@
        tableList:[],
        projectList:[],
        inspectionList:[],
+       org_id:0
       }
     },
     created() {
 
       this.patient_id = this.$route.params && this.$route.params.id
-
+      
 
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
@@ -696,7 +697,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear()-1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =

src/xt_pages/user/hospitalSummary.vue

@@ -633,7 +633,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear()-1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =

src/xt_pages/user/patients.vue

@@ -253,6 +253,21 @@
           </ul>
         </div>
       </div>
+      <div class="cell clearfix">
+        <label class="title"><span class="name">患者去向</span> : </label>
+        <div class="time ">
+          <ul class="">
+            <li
+              :class="item.source == patientSoureType ? 'active' : ''"
+              @click="selectPatientSource(item.source)"
+              v-for="item in patientSourceList"
+              :key="item.value"
+            >
+              {{ item.label }}
+            </li>
+          </ul>
+        </div>
+      </div>
       <div class="cell clearfix">
         <label class="title"><span class="name">其它查询</span> : </label>
         <el-select
@@ -686,6 +701,7 @@
           { value: 2, label: '未绑定' }
         ],
         sourceType: 0,
+        patientSoureType:0,
         sourceID: 0,
         lapsetoType: 1,
         sourceArr: [
@@ -695,6 +711,13 @@
           { value: 3, label: '门诊', source: 1, lapseto: 1 },
           { value: 4, label: '住院', source: 2, lapseto: 1 }
         ],
+        patientSourceList:[
+          {value:0,label:"全部",source:0,lapeseto:0},
+          {value:1,label:"门诊",source:1,lapeseto:1},
+          {value:2,label:"住院",source:2,lapeseto:2},
+          {value:3,label:"请假",source:3,lapeseto:3},
+          {value:4,label:"备注",source:4,lapeseto:4}
+       ],
         lapsetoArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           { value: 1, label: '转出', source: 0, lapseto: 2 },
@@ -744,7 +767,8 @@
           contagion: '',
           reimbursement_way: '',
           isscheduling: '',
-          isprescription: ''
+          isprescription: '',
+          patientSoureType:'',
         },
         multipleSelection: [],
         bindWechatDialog: false,
@@ -1316,6 +1340,11 @@
         this.listQuery.source = source
         this.getList()
       },
+      selectPatientSource(source){
+        this.patientSoureType = source
+        this.listQuery.patientSoureType = source
+        this.getList()
+      },
       changeTimeOne(val) {
         var time = this.getTimestamp(val) - this.end_time
         if (time > 0) {
@@ -1349,7 +1378,7 @@
         this.getList()
       },
       getList() {
-
+         console.log("query23323223wo",this.listQuery)
         fetchList(this.listQuery).then(response => {
           if (response.data.state === 0) {
             this.$message.error(response.data.msg)

src/xt_pages/user/rescueRecord.vue

@@ -209,7 +209,7 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
-    nowYear = nowDate.getFullYear();
+    nowYear = nowDate.getFullYear()-1;
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
     this.start_time =

src/xt_pages/user/templateSummary.vue

@@ -987,7 +987,7 @@
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
       nowDate.setMonth(nowDate.getMonth() - 1)
-      nowYear = nowDate.getFullYear()
+      nowYear = nowDate.getFullYear()-1
       nowMonth = nowDate.getMonth() + 1
       nowDay = nowDate.getDate()
       this.start_time =