From 2d0cdc5f0e3384ca0d4c2192836ee28905015295 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Tue, 29 Aug 2023 10:57:03 +0800
Subject: [PATCH] report

---
 src/router/index.js                 |  25 +-
 src/views/Home.vue                  |  13 +
 src/views/report/chargeAsbitem.vue  | 449 ++++++++++++++++++++++++++++
 src/views/report/checkStatus.vue    | 449 ++++++++++++++++++++++++++++
 src/views/report/report.vue         | 449 ++++++++++++++++++++++++++++
 src/views/report/unCheckAsbitem.vue | 449 ++++++++++++++++++++++++++++
 6 files changed, 1832 insertions(+), 2 deletions(-)
 create mode 100644 src/views/report/chargeAsbitem.vue
 create mode 100644 src/views/report/checkStatus.vue
 create mode 100644 src/views/report/report.vue
 create mode 100644 src/views/report/unCheckAsbitem.vue

diff --git a/src/router/index.js b/src/router/index.js
index 72aaa05..3448c43 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -276,9 +276,30 @@ const routes = [
         path: "/sumDoctorCheck",
         name: "总检医生诊台",
         component: () => import("../views/doctorCheck/sumDoctorCheck.vue"),
-      },
-      
+      },      
       //----------------------  体   检  end  ----------------------
+      //----------------------  体检查询 start ----------------------
+      {
+        path: "/report",
+        name: "体检报告",
+        component: () => import("../views/report/report.vue"),
+      },
+      {
+        path: "/checkStatus",
+        name: "组合项目检查状态",
+        component: () => import("../views/report/checkStatus.vue"),
+      },
+      {
+        path: "/chargeAsbitem",
+        name: "人员费用组合项目",
+        component: () => import("../views/report/chargeAsbitem.vue"),
+      },  
+      {
+        path: "/unCheckAsbitem",
+        name: "人员未检组合项目",
+        component: () => import("../views/report/unCheckAsbitem.vue"),
+      },        
+      //----------------------  体检查询  end  ----------------------
     ],
   },
 ];
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 2662fd5..c22d5f3 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -113,6 +113,19 @@
               </el-dropdown-menu>
             </el-dropdown>
           </div>
+          <!-- 体检查询 -->
+          <div class="physicalexamination" style="margin-left: 15px">
+            <el-dropdown @command="handleCommand">
+              <span class="el-dropdown-link"> 体检查询 </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="report">体检报告</el-dropdown-item>
+                <el-dropdown-item command="checkStatus">组合项目检查状态</el-dropdown-item>
+                <el-dropdown-item command="chargeAsbitem">人员费用组合项目</el-dropdown-item>
+                <el-dropdown-item command="unCheckAsbitem">人员未检组合项目</el-dropdown-item>
+                <el-dropdown-item command="patientRegisterRecover">回收表格查询</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
           <div class="btn">
             当前用户{{ user }}
             <!-- <i class="el-icon-arrow-down el-icon--right"></i> -->
diff --git a/src/views/report/chargeAsbitem.vue b/src/views/report/chargeAsbitem.vue
new file mode 100644
index 0000000..7b30e62
--- /dev/null
+++ b/src/views/report/chargeAsbitem.vue
@@ -0,0 +1,449 @@
+<template>
+  <div>
+    <el-card>
+      <div style="display: flex">
+        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
+          <div style="display: flex; flex-wrap: wrap; height:80px;">
+            <div class="query">
+              <el-select v-model="query.dateType" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option label="登记日期" value="createDate" />
+                <el-option label="有效日期" value="expiryDate" />
+              </el-select>
+              <el-date-picker v-model="query.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
+                style="width: 240px">
+              </el-date-picker>
+            </div>
+            <div class="query">
+              <span>卡类别：</span>
+              <el-select v-model="query.cardTypeId" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </div>
+            <div class="query">
+              <span>卡号：</span>
+              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 150px" />
+            </div>
+            <div class="query">
+              <span>卡主姓名：</span>
+              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 100px" />
+            </div>
+            <div class="query">
+              <span>身份证号：</span>
+              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 200px" />
+            </div>
+            <div class="query">
+              <span>手机号：</span>
+              <el-input placeholder="手机号" v-model="query.mobileTelephone" size="small" clearable style="width: 150px" />
+            </div>
+          </div>
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+            row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
+            @row-click="rowClick">
+            <el-table-column prop="cardTypeId" label="卡类别" width="100">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.cardType, "id", scope.row.cardTypeId, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="cardNo" label="会员卡号" width="150" />
+            <el-table-column prop="discount" label="折扣率" width="80" />
+            <el-table-column prop="expiryDate" label="有效期限" width="120">
+              <template slot-scope="scope">
+                <div v-if="scope.row.expiryDate">
+                  {{ moment(scope.row.expiryDate).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="customerName" label="卡主姓名" width="80" />
+            <el-table-column prop="idNo" label="卡主身份证号" width="200" />
+            <el-table-column prop="telephone" label="卡主电话" width="150" />
+            <el-table-column prop="mobileTelephone" label="卡主手机号" width="150" />
+            <el-table-column prop="cardFlag" label="启用" width="80">
+              <template slot-scope="scope">
+                <div>{{ scope.row.cardFlag == '0' ? '否' : '是' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" width="200" />
+            <el-table-column prop="creatorId" label="创建人员" width="100" />
+            <el-table-column prop="creationTime" label="创建日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.creationTime">
+                  {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="lastModifierId" label="修改人员" width="100" />
+            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.lastModificationTime">
+                  {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+
+        </div>
+        <div style=" margin-left: 10px;width:110px;">
+          <div class="listBtn">
+            <el-button class="btnClass" @click="btnQuery">查询</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="success" class="btnClass" @click="add">新增</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
+          </div>
+        </div>
+      </div>
+    </el-card>
+    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
+      <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡类别" prop="cardTypeId">
+              <el-select v-model="form.cardTypeId" placeholder="请选择" filterable>
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="会员卡号" prop="cardNo">
+              <el-input v-model="form.cardNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="折扣率" prop="discount">
+              <el-input type="number" v-model="form.discount" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="有效期限" prop="expiryDate">
+              <el-input type="date" v-model="form.expiryDate" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主姓名" prop="customerName">
+              <el-input v-model="form.customerName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主身份证" prop="idNo">
+              <el-input v-model="form.idNo" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡主电话" prop="telephone">
+              <el-input type="tel" v-model="form.telephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主手机号" prop="mobileTelephone">
+              <el-input type="tel" v-model="form.mobileTelephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用" prop="cardFlag">
+              <el-radio v-model="form.cardFlag" label="1">是</el-radio>
+              <el-radio v-model="form.cardFlag" label="0">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="创建人员" label-width="80px">
+              <el-input v-model="form.creatorId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间" label-width="80px">
+              <el-input :value="form.creationTime ? moment(form.creationTime).format('yyyy-MM-DD') : ''"
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改人员" label-width="80px">
+              <el-input v-model="form.lastModifierId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间" label-width="80px">
+              <el-input :value="form.lastModificationTime
+                ? moment(form.lastModificationTime).format('yyyy-MM-DD') : ''" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
+
+
+export default {
+  components: {
+
+  },
+  data() {
+    return {
+      query: {
+        dateType:'createDate',
+        dateType:'createDate',
+      },  //查询条件
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false,
+      form: {
+        id: null,
+        cardTypeId: null,
+        cardNo: '',
+        discount: 100,
+        expiryDate: null,
+        customerName: '',
+        idNo: '',
+        telephone: '',
+        mobileTelephone: '',
+        cardFlag: '0',
+        remark: '',
+      },
+
+      formInit: {},
+
+      rules: {
+        cardTypeId: [
+          { required: true, message: "请填写卡类别", trigger: "blur" },
+        ],
+        cardNo: [
+          { required: true, message: "请填写卡号", trigger: "blur" },
+        ],
+        discount: [
+          { required: true, message: "请填写卡折扣", trigger: "blur" },
+        ],
+        expiryDate: [
+          { required: true, message: "请填写卡有效期", trigger: "blur" },
+        ],
+        customerName: [
+          { required: true, message: "请填写卡主姓名", trigger: "blur" },
+        ],
+        idNo: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        mobileTelephone: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        cardFlag: [
+          { required: true, message: "请填写卡启用状态", trigger: "blur" },
+        ]
+      },
+
+      curChoosedRow: {}, //当前选择的行数据
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  created() {
+    this.formInit = { ...this.form };
+  },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window", "dict"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+    dddw, moment,
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    rowClick(row) {
+      this.curChoosedRow = row;
+    },
+
+    add() {
+      this.form = { ...this.formInit };
+      this.dialogVisible = true;
+    },
+
+    edit() {
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      this.form = { ...this.curChoosedRow };
+      this.dialogVisible = true;
+    },
+
+    del() {
+      let lfind = -1;
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      //执行删除操作
+      lfind = arrayExistObj(this.dataList, 'id', this.curChoosedRow.id);
+      if (lfind > - 1) this.dataList.splice(lfind, 1);
+      this.curChoosedRow.id = null;
+    },
+
+
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+        .then((res) => {
+          if (res.code != -1) {
+            if (res.data) {
+              this.signCore([res.data.id])
+              this.form.patientRegisterNo = ''
+            }
+          }
+        });
+    },
+
+    //提交
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          //console.log('fields',fields,Object.keys(fields));
+          this.$message.error(fields[Object.keys(fields)[0]][0].message);
+          return;
+        }
+        //编辑
+        if (this.form.id) {
+
+        } else {
+          //新增
+        }
+      });
+    },
+
+
+    //查询
+    btnQuery() {
+      let body = {}
+
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else {
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        }
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+
+  },
+};
+</script>
+<style scoped>
+.query {
+  margin-left: 10px;
+}
+
+.listBtn {
+  margin-top: 20px;
+}
+
+.btnClass {
+  width: 110px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 110px;
+}
+</style>
diff --git a/src/views/report/checkStatus.vue b/src/views/report/checkStatus.vue
new file mode 100644
index 0000000..7b30e62
--- /dev/null
+++ b/src/views/report/checkStatus.vue
@@ -0,0 +1,449 @@
+<template>
+  <div>
+    <el-card>
+      <div style="display: flex">
+        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
+          <div style="display: flex; flex-wrap: wrap; height:80px;">
+            <div class="query">
+              <el-select v-model="query.dateType" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option label="登记日期" value="createDate" />
+                <el-option label="有效日期" value="expiryDate" />
+              </el-select>
+              <el-date-picker v-model="query.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
+                style="width: 240px">
+              </el-date-picker>
+            </div>
+            <div class="query">
+              <span>卡类别：</span>
+              <el-select v-model="query.cardTypeId" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </div>
+            <div class="query">
+              <span>卡号：</span>
+              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 150px" />
+            </div>
+            <div class="query">
+              <span>卡主姓名：</span>
+              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 100px" />
+            </div>
+            <div class="query">
+              <span>身份证号：</span>
+              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 200px" />
+            </div>
+            <div class="query">
+              <span>手机号：</span>
+              <el-input placeholder="手机号" v-model="query.mobileTelephone" size="small" clearable style="width: 150px" />
+            </div>
+          </div>
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+            row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
+            @row-click="rowClick">
+            <el-table-column prop="cardTypeId" label="卡类别" width="100">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.cardType, "id", scope.row.cardTypeId, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="cardNo" label="会员卡号" width="150" />
+            <el-table-column prop="discount" label="折扣率" width="80" />
+            <el-table-column prop="expiryDate" label="有效期限" width="120">
+              <template slot-scope="scope">
+                <div v-if="scope.row.expiryDate">
+                  {{ moment(scope.row.expiryDate).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="customerName" label="卡主姓名" width="80" />
+            <el-table-column prop="idNo" label="卡主身份证号" width="200" />
+            <el-table-column prop="telephone" label="卡主电话" width="150" />
+            <el-table-column prop="mobileTelephone" label="卡主手机号" width="150" />
+            <el-table-column prop="cardFlag" label="启用" width="80">
+              <template slot-scope="scope">
+                <div>{{ scope.row.cardFlag == '0' ? '否' : '是' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" width="200" />
+            <el-table-column prop="creatorId" label="创建人员" width="100" />
+            <el-table-column prop="creationTime" label="创建日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.creationTime">
+                  {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="lastModifierId" label="修改人员" width="100" />
+            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.lastModificationTime">
+                  {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+
+        </div>
+        <div style=" margin-left: 10px;width:110px;">
+          <div class="listBtn">
+            <el-button class="btnClass" @click="btnQuery">查询</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="success" class="btnClass" @click="add">新增</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
+          </div>
+        </div>
+      </div>
+    </el-card>
+    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
+      <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡类别" prop="cardTypeId">
+              <el-select v-model="form.cardTypeId" placeholder="请选择" filterable>
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="会员卡号" prop="cardNo">
+              <el-input v-model="form.cardNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="折扣率" prop="discount">
+              <el-input type="number" v-model="form.discount" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="有效期限" prop="expiryDate">
+              <el-input type="date" v-model="form.expiryDate" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主姓名" prop="customerName">
+              <el-input v-model="form.customerName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主身份证" prop="idNo">
+              <el-input v-model="form.idNo" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡主电话" prop="telephone">
+              <el-input type="tel" v-model="form.telephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主手机号" prop="mobileTelephone">
+              <el-input type="tel" v-model="form.mobileTelephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用" prop="cardFlag">
+              <el-radio v-model="form.cardFlag" label="1">是</el-radio>
+              <el-radio v-model="form.cardFlag" label="0">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="创建人员" label-width="80px">
+              <el-input v-model="form.creatorId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间" label-width="80px">
+              <el-input :value="form.creationTime ? moment(form.creationTime).format('yyyy-MM-DD') : ''"
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改人员" label-width="80px">
+              <el-input v-model="form.lastModifierId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间" label-width="80px">
+              <el-input :value="form.lastModificationTime
+                ? moment(form.lastModificationTime).format('yyyy-MM-DD') : ''" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
+
+
+export default {
+  components: {
+
+  },
+  data() {
+    return {
+      query: {
+        dateType:'createDate',
+        dateType:'createDate',
+      },  //查询条件
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false,
+      form: {
+        id: null,
+        cardTypeId: null,
+        cardNo: '',
+        discount: 100,
+        expiryDate: null,
+        customerName: '',
+        idNo: '',
+        telephone: '',
+        mobileTelephone: '',
+        cardFlag: '0',
+        remark: '',
+      },
+
+      formInit: {},
+
+      rules: {
+        cardTypeId: [
+          { required: true, message: "请填写卡类别", trigger: "blur" },
+        ],
+        cardNo: [
+          { required: true, message: "请填写卡号", trigger: "blur" },
+        ],
+        discount: [
+          { required: true, message: "请填写卡折扣", trigger: "blur" },
+        ],
+        expiryDate: [
+          { required: true, message: "请填写卡有效期", trigger: "blur" },
+        ],
+        customerName: [
+          { required: true, message: "请填写卡主姓名", trigger: "blur" },
+        ],
+        idNo: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        mobileTelephone: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        cardFlag: [
+          { required: true, message: "请填写卡启用状态", trigger: "blur" },
+        ]
+      },
+
+      curChoosedRow: {}, //当前选择的行数据
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  created() {
+    this.formInit = { ...this.form };
+  },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window", "dict"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+    dddw, moment,
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    rowClick(row) {
+      this.curChoosedRow = row;
+    },
+
+    add() {
+      this.form = { ...this.formInit };
+      this.dialogVisible = true;
+    },
+
+    edit() {
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      this.form = { ...this.curChoosedRow };
+      this.dialogVisible = true;
+    },
+
+    del() {
+      let lfind = -1;
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      //执行删除操作
+      lfind = arrayExistObj(this.dataList, 'id', this.curChoosedRow.id);
+      if (lfind > - 1) this.dataList.splice(lfind, 1);
+      this.curChoosedRow.id = null;
+    },
+
+
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+        .then((res) => {
+          if (res.code != -1) {
+            if (res.data) {
+              this.signCore([res.data.id])
+              this.form.patientRegisterNo = ''
+            }
+          }
+        });
+    },
+
+    //提交
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          //console.log('fields',fields,Object.keys(fields));
+          this.$message.error(fields[Object.keys(fields)[0]][0].message);
+          return;
+        }
+        //编辑
+        if (this.form.id) {
+
+        } else {
+          //新增
+        }
+      });
+    },
+
+
+    //查询
+    btnQuery() {
+      let body = {}
+
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else {
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        }
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+
+  },
+};
+</script>
+<style scoped>
+.query {
+  margin-left: 10px;
+}
+
+.listBtn {
+  margin-top: 20px;
+}
+
+.btnClass {
+  width: 110px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 110px;
+}
+</style>
diff --git a/src/views/report/report.vue b/src/views/report/report.vue
new file mode 100644
index 0000000..7b30e62
--- /dev/null
+++ b/src/views/report/report.vue
@@ -0,0 +1,449 @@
+<template>
+  <div>
+    <el-card>
+      <div style="display: flex">
+        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
+          <div style="display: flex; flex-wrap: wrap; height:80px;">
+            <div class="query">
+              <el-select v-model="query.dateType" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option label="登记日期" value="createDate" />
+                <el-option label="有效日期" value="expiryDate" />
+              </el-select>
+              <el-date-picker v-model="query.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
+                style="width: 240px">
+              </el-date-picker>
+            </div>
+            <div class="query">
+              <span>卡类别：</span>
+              <el-select v-model="query.cardTypeId" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </div>
+            <div class="query">
+              <span>卡号：</span>
+              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 150px" />
+            </div>
+            <div class="query">
+              <span>卡主姓名：</span>
+              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 100px" />
+            </div>
+            <div class="query">
+              <span>身份证号：</span>
+              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 200px" />
+            </div>
+            <div class="query">
+              <span>手机号：</span>
+              <el-input placeholder="手机号" v-model="query.mobileTelephone" size="small" clearable style="width: 150px" />
+            </div>
+          </div>
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+            row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
+            @row-click="rowClick">
+            <el-table-column prop="cardTypeId" label="卡类别" width="100">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.cardType, "id", scope.row.cardTypeId, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="cardNo" label="会员卡号" width="150" />
+            <el-table-column prop="discount" label="折扣率" width="80" />
+            <el-table-column prop="expiryDate" label="有效期限" width="120">
+              <template slot-scope="scope">
+                <div v-if="scope.row.expiryDate">
+                  {{ moment(scope.row.expiryDate).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="customerName" label="卡主姓名" width="80" />
+            <el-table-column prop="idNo" label="卡主身份证号" width="200" />
+            <el-table-column prop="telephone" label="卡主电话" width="150" />
+            <el-table-column prop="mobileTelephone" label="卡主手机号" width="150" />
+            <el-table-column prop="cardFlag" label="启用" width="80">
+              <template slot-scope="scope">
+                <div>{{ scope.row.cardFlag == '0' ? '否' : '是' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" width="200" />
+            <el-table-column prop="creatorId" label="创建人员" width="100" />
+            <el-table-column prop="creationTime" label="创建日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.creationTime">
+                  {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="lastModifierId" label="修改人员" width="100" />
+            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.lastModificationTime">
+                  {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+
+        </div>
+        <div style=" margin-left: 10px;width:110px;">
+          <div class="listBtn">
+            <el-button class="btnClass" @click="btnQuery">查询</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="success" class="btnClass" @click="add">新增</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
+          </div>
+        </div>
+      </div>
+    </el-card>
+    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
+      <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡类别" prop="cardTypeId">
+              <el-select v-model="form.cardTypeId" placeholder="请选择" filterable>
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="会员卡号" prop="cardNo">
+              <el-input v-model="form.cardNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="折扣率" prop="discount">
+              <el-input type="number" v-model="form.discount" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="有效期限" prop="expiryDate">
+              <el-input type="date" v-model="form.expiryDate" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主姓名" prop="customerName">
+              <el-input v-model="form.customerName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主身份证" prop="idNo">
+              <el-input v-model="form.idNo" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡主电话" prop="telephone">
+              <el-input type="tel" v-model="form.telephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主手机号" prop="mobileTelephone">
+              <el-input type="tel" v-model="form.mobileTelephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用" prop="cardFlag">
+              <el-radio v-model="form.cardFlag" label="1">是</el-radio>
+              <el-radio v-model="form.cardFlag" label="0">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="创建人员" label-width="80px">
+              <el-input v-model="form.creatorId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间" label-width="80px">
+              <el-input :value="form.creationTime ? moment(form.creationTime).format('yyyy-MM-DD') : ''"
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改人员" label-width="80px">
+              <el-input v-model="form.lastModifierId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间" label-width="80px">
+              <el-input :value="form.lastModificationTime
+                ? moment(form.lastModificationTime).format('yyyy-MM-DD') : ''" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
+
+
+export default {
+  components: {
+
+  },
+  data() {
+    return {
+      query: {
+        dateType:'createDate',
+        dateType:'createDate',
+      },  //查询条件
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false,
+      form: {
+        id: null,
+        cardTypeId: null,
+        cardNo: '',
+        discount: 100,
+        expiryDate: null,
+        customerName: '',
+        idNo: '',
+        telephone: '',
+        mobileTelephone: '',
+        cardFlag: '0',
+        remark: '',
+      },
+
+      formInit: {},
+
+      rules: {
+        cardTypeId: [
+          { required: true, message: "请填写卡类别", trigger: "blur" },
+        ],
+        cardNo: [
+          { required: true, message: "请填写卡号", trigger: "blur" },
+        ],
+        discount: [
+          { required: true, message: "请填写卡折扣", trigger: "blur" },
+        ],
+        expiryDate: [
+          { required: true, message: "请填写卡有效期", trigger: "blur" },
+        ],
+        customerName: [
+          { required: true, message: "请填写卡主姓名", trigger: "blur" },
+        ],
+        idNo: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        mobileTelephone: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        cardFlag: [
+          { required: true, message: "请填写卡启用状态", trigger: "blur" },
+        ]
+      },
+
+      curChoosedRow: {}, //当前选择的行数据
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  created() {
+    this.formInit = { ...this.form };
+  },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window", "dict"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+    dddw, moment,
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    rowClick(row) {
+      this.curChoosedRow = row;
+    },
+
+    add() {
+      this.form = { ...this.formInit };
+      this.dialogVisible = true;
+    },
+
+    edit() {
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      this.form = { ...this.curChoosedRow };
+      this.dialogVisible = true;
+    },
+
+    del() {
+      let lfind = -1;
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      //执行删除操作
+      lfind = arrayExistObj(this.dataList, 'id', this.curChoosedRow.id);
+      if (lfind > - 1) this.dataList.splice(lfind, 1);
+      this.curChoosedRow.id = null;
+    },
+
+
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+        .then((res) => {
+          if (res.code != -1) {
+            if (res.data) {
+              this.signCore([res.data.id])
+              this.form.patientRegisterNo = ''
+            }
+          }
+        });
+    },
+
+    //提交
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          //console.log('fields',fields,Object.keys(fields));
+          this.$message.error(fields[Object.keys(fields)[0]][0].message);
+          return;
+        }
+        //编辑
+        if (this.form.id) {
+
+        } else {
+          //新增
+        }
+      });
+    },
+
+
+    //查询
+    btnQuery() {
+      let body = {}
+
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else {
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        }
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+
+  },
+};
+</script>
+<style scoped>
+.query {
+  margin-left: 10px;
+}
+
+.listBtn {
+  margin-top: 20px;
+}
+
+.btnClass {
+  width: 110px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 110px;
+}
+</style>
diff --git a/src/views/report/unCheckAsbitem.vue b/src/views/report/unCheckAsbitem.vue
new file mode 100644
index 0000000..7b30e62
--- /dev/null
+++ b/src/views/report/unCheckAsbitem.vue
@@ -0,0 +1,449 @@
+<template>
+  <div>
+    <el-card>
+      <div style="display: flex">
+        <div :style="'display: block; width:' + (window.pageWidth - 120 - 70) + 'px;'">
+          <div style="display: flex; flex-wrap: wrap; height:80px;">
+            <div class="query">
+              <el-select v-model="query.dateType" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option label="登记日期" value="createDate" />
+                <el-option label="有效日期" value="expiryDate" />
+              </el-select>
+              <el-date-picker v-model="query.dateRange" type="daterange" align="right" unlink-panels range-separator="至"
+                start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" size="small"
+                style="width: 240px">
+              </el-date-picker>
+            </div>
+            <div class="query">
+              <span>卡类别：</span>
+              <el-select v-model="query.cardTypeId" placeholder="请选择" filterable clearable size="small" style="width: 100px">
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </div>
+            <div class="query">
+              <span>卡号：</span>
+              <el-input placeholder="卡号" v-model="query.cardNo" size="small" clearable style="width: 150px" />
+            </div>
+            <div class="query">
+              <span>卡主姓名：</span>
+              <el-input placeholder="卡主姓名" v-model="query.customerName" size="small" clearable style="width: 100px" />
+            </div>
+            <div class="query">
+              <span>身份证号：</span>
+              <el-input placeholder="身份证号" v-model="query.idNo" size="small" clearable style="width: 200px" />
+            </div>
+            <div class="query">
+              <span>手机号：</span>
+              <el-input placeholder="手机号" v-model="query.mobileTelephone" size="small" clearable style="width: 150px" />
+            </div>
+          </div>
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+            row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
+            @row-click="rowClick">
+            <el-table-column prop="cardTypeId" label="卡类别" width="100">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.cardType, "id", scope.row.cardTypeId, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="cardNo" label="会员卡号" width="150" />
+            <el-table-column prop="discount" label="折扣率" width="80" />
+            <el-table-column prop="expiryDate" label="有效期限" width="120">
+              <template slot-scope="scope">
+                <div v-if="scope.row.expiryDate">
+                  {{ moment(scope.row.expiryDate).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="customerName" label="卡主姓名" width="80" />
+            <el-table-column prop="idNo" label="卡主身份证号" width="200" />
+            <el-table-column prop="telephone" label="卡主电话" width="150" />
+            <el-table-column prop="mobileTelephone" label="卡主手机号" width="150" />
+            <el-table-column prop="cardFlag" label="启用" width="80">
+              <template slot-scope="scope">
+                <div>{{ scope.row.cardFlag == '0' ? '否' : '是' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="remark" label="备注" width="200" />
+            <el-table-column prop="creatorId" label="创建人员" width="100" />
+            <el-table-column prop="creationTime" label="创建日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.creationTime">
+                  {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="lastModifierId" label="修改人员" width="100" />
+            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.lastModificationTime">
+                  {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+
+        </div>
+        <div style=" margin-left: 10px;width:110px;">
+          <div class="listBtn">
+            <el-button class="btnClass" @click="btnQuery">查询</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="success" class="btnClass" @click="add">新增</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+          </div>
+          <div class="listBtn">
+            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
+          </div>
+        </div>
+      </div>
+    </el-card>
+    <el-dialog :title="form.id ? '编辑' : '新增'" :visible.sync="dialogVisible" width="800px" :close-on-click-modal="false">
+      <el-form ref="form" :model="form" label-width="100px" :rules="rules" size="small">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡类别" prop="cardTypeId">
+              <el-select v-model="form.cardTypeId" placeholder="请选择" filterable>
+                <el-option v-for="item in dict.cardType" :key="item.id" :label="item.displayName" :value="item.id" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="会员卡号" prop="cardNo">
+              <el-input v-model="form.cardNo" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="折扣率" prop="discount">
+              <el-input type="number" v-model="form.discount" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="有效期限" prop="expiryDate">
+              <el-input type="date" v-model="form.expiryDate" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主姓名" prop="customerName">
+              <el-input v-model="form.customerName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主身份证" prop="idNo">
+              <el-input v-model="form.idNo" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="卡主电话" prop="telephone">
+              <el-input type="tel" v-model="form.telephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="卡主手机号" prop="mobileTelephone">
+              <el-input type="tel" v-model="form.mobileTelephone" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用" prop="cardFlag">
+              <el-radio v-model="form.cardFlag" label="1">是</el-radio>
+              <el-radio v-model="form.cardFlag" label="0">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="创建人员" label-width="80px">
+              <el-input v-model="form.creatorId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间" label-width="80px">
+              <el-input :value="form.creationTime ? moment(form.creationTime).format('yyyy-MM-DD') : ''"
+                disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改人员" label-width="80px">
+              <el-input v-model="form.lastModifierId" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="修改时间" label-width="80px">
+              <el-input :value="form.lastModificationTime
+                ? moment(form.lastModificationTime).format('yyyy-MM-DD') : ''" disabled></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="onSubmit('form')">确定</el-button>
+        <el-button @click="dialogVisible = false">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import moment from "moment";
+import { mapState, mapActions } from "vuex";
+import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { dddw, objCopy, arrayReduce, arrayExistObj } from "@/utlis/proFunc";
+
+
+export default {
+  components: {
+
+  },
+  data() {
+    return {
+      query: {
+        dateType:'createDate',
+        dateType:'createDate',
+      },  //查询条件
+      dataList: [], //列表数据
+      multipleSelection: [], //选中的数据列表
+      dialogVisible: false,
+      form: {
+        id: null,
+        cardTypeId: null,
+        cardNo: '',
+        discount: 100,
+        expiryDate: null,
+        customerName: '',
+        idNo: '',
+        telephone: '',
+        mobileTelephone: '',
+        cardFlag: '0',
+        remark: '',
+      },
+
+      formInit: {},
+
+      rules: {
+        cardTypeId: [
+          { required: true, message: "请填写卡类别", trigger: "blur" },
+        ],
+        cardNo: [
+          { required: true, message: "请填写卡号", trigger: "blur" },
+        ],
+        discount: [
+          { required: true, message: "请填写卡折扣", trigger: "blur" },
+        ],
+        expiryDate: [
+          { required: true, message: "请填写卡有效期", trigger: "blur" },
+        ],
+        customerName: [
+          { required: true, message: "请填写卡主姓名", trigger: "blur" },
+        ],
+        idNo: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        mobileTelephone: [
+          { required: true, message: "请填写卡主身份证", trigger: "blur" },
+        ],
+        cardFlag: [
+          { required: true, message: "请填写卡启用状态", trigger: "blur" },
+        ]
+      },
+
+      curChoosedRow: {}, //当前选择的行数据
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+
+  created() {
+    this.formInit = { ...this.form };
+  },
+
+  //挂载完成
+  mounted() { },
+  computed: {
+    ...mapState(["window", "dict"]),
+  },
+  methods: {
+    ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]),
+    dddw, moment,
+
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+
+    rowClick(row) {
+      this.curChoosedRow = row;
+    },
+
+    add() {
+      this.form = { ...this.formInit };
+      this.dialogVisible = true;
+    },
+
+    edit() {
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      this.form = { ...this.curChoosedRow };
+      this.dialogVisible = true;
+    },
+
+    del() {
+      let lfind = -1;
+      if (!this.curChoosedRow.id) {
+        this.$message.warning("请先选择要操作的数据！");
+        return;
+      }
+      //执行删除操作
+      lfind = arrayExistObj(this.dataList, 'id', this.curChoosedRow.id);
+      if (lfind > - 1) this.dataList.splice(lfind, 1);
+      this.curChoosedRow.id = null;
+    },
+
+
+
+    //按条码号查个人数据
+    signByPatientRegisterNo() {
+      let val = this.form.patientRegisterNo
+      console.log(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+      getapi(`/api/app/patient-register/patient-register-or-patient?SType=1&PatientRegisterNo=${val}`)
+        .then((res) => {
+          if (res.code != -1) {
+            if (res.data) {
+              this.signCore([res.data.id])
+              this.form.patientRegisterNo = ''
+            }
+          }
+        });
+    },
+
+    //提交
+    onSubmit(formName) {
+      this.$refs[formName].validate((valid, fields) => {
+        if (!valid) {
+          //console.log('fields',fields,Object.keys(fields));
+          this.$message.error(fields[Object.keys(fields)[0]][0].message);
+          return;
+        }
+        //编辑
+        if (this.form.id) {
+
+        } else {
+          //新增
+        }
+      });
+    },
+
+
+    //查询
+    btnQuery() {
+      let body = {}
+
+      console.log(`this.patientRegister.query`, this.patientRegister.query)
+      if (this.patientRegister.query.customerOrgFlag) {
+        if (this.patientRegister.query.CustomerOrgParentId) {
+          body.customerOrgId = this.patientRegister.query.CustomerOrgParentId
+        } else {
+          if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId
+        }
+      }
+
+      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+
+      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+
+      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+
+      //StartDate EndDate
+      if (this.patientRegister.query.dateRange) {
+        body.startDate = moment(new Date(this.patientRegister.query.dateRange[0])).format("yyyy-MM-DD")
+        body.endDate = moment(new Date(this.patientRegister.query.dateRange[1])).format("yyyy-MM-DD")
+      }
+
+
+      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+
+      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+
+      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+
+
+      console.log('/api/app/patientregister/getlistinfilter', body)
+      postapi('/api/app/patientregister/getlistinfilter', body)
+        .then((res) => {
+          this.dataList = res.data;
+        });
+    },
+  },
+
+  //监听事件
+  watch: {
+    //触发查询事件
+    "patientRegister.query.times"(newVal, oldVal) {
+      if (newVal != oldVal) {
+        //alert('触发查询事件')
+        this.query();
+      }
+    },
+
+  },
+};
+</script>
+<style scoped>
+.query {
+  margin-left: 10px;
+}
+
+.listBtn {
+  margin-top: 20px;
+}
+
+.btnClass {
+  width: 110px;
+  text-align: center;
+}
+
+.btnClass {
+  width: 110px;
+}
+</style>