diff --git a/src/store/index.js b/src/store/index.js
index 0f50559..5feb7e0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -107,6 +107,7 @@ export default new Vuex.Store({
       medicalPackageChange: 0,     //控制体检列表记录切换时，0 无需触发更换套餐操作
       query: {
         dateType:'creationTime',  //登记日期
+        containRefuse:true,       //包含弃检项目
         dateRange:null,   //日期范围
         times: 0, //触发查询次数
         customerOrgId: "", //体检单位ID
diff --git a/src/views/report/chargeAsbitem.vue b/src/views/report/chargeAsbitem.vue
index 3a04e7a..f607668 100644
--- a/src/views/report/chargeAsbitem.vue
+++ b/src/views/report/chargeAsbitem.vue
@@ -1,436 +1,260 @@
 <template>
   <div>
-    <el-card>
+    <el-card>      
       <div class="publiccss">人员费用组合项目</div>
-      <div style="display: flex;margin-top:20px">
-        <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 :style="'display: block; width:' + (window.pageWidth - 80) + 'px;margin-top:20px'">
+        <div style="display: flex; flex-wrap: wrap; height:35px;">
+          <div class="query">
+            <span>体检单位：</span>
+            <el-input placeholder="请选择单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small" disabled>          
+              <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"></el-button>
+            </el-input>
+          </div>        
+          <div class="query">
+            <span>组合项目：</span>
+            <el-select v-model="patientRegister.query.checkAsbs" multiple collapse-tags filterable clearable placeholder="请选择"
+              size="small" >
+              <el-option v-for="item in dict.asbItemAll" :key="item.value" :label="item.displayName" :value="item.id"/>
+            </el-select>
+          </div>     
+          <div class="query">
+            <span>收费状态：</span>
+            <el-select v-model="patientRegister.query.isCharge" placeholder="请选择" clearable style="width: 80px"
+              size="small">
+              <el-option label="未收费" value="N" />
+              <el-option label="已收费" value="Y" />
+            </el-select>
           </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 class="query">
+            <el-button type="primary" @click="btnQuery" size="small">查询</el-button>
           </div>
-        </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" >
+          <el-table-column prop="asbitemName" label="组合项目名称" width="120"/>          
+          <el-table-column prop="checkCompleteFlag" label="检查状态" width="70" >
+            <template slot-scope="scope">
+              <div>{{ dddw(dict.checkCompleteFlag, 'id', scope.row.checkCompleteFlag, 'displayName') }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isCharge" label="收费状态" width="70" >
+            <template slot-scope="scope">
+              <div>{{ scope.row.checkCompleteFlag == 'Y' ? '已收费':'未收费' }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="standardPrice" label="标准价格" width="70"/> 
+          <el-table-column prop="chargePrice" label="应收价格" width="70"/> 
+          <el-table-column prop="patientRegisterNo" label="人员条码号" width="130"/> 
+          <el-table-column prop="patientNo" label="档案号" width="130"/>
+          <el-table-column prop="medicalTimes" label="体检次数" width="70"/>
+          <el-table-column prop="customerOrgParentName" label="单位" width="180">
+            <template slot-scope="scope">
+              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="customerOrgName" label="部门" width="180">
+            <template slot-scope="scope">
+              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="分组/套餐" width="150">
+            <template slot-scope="scope">
+              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+                {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+              </div>
+              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+                {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="patientName" label="姓名" width="80"/>
+          <el-table-column prop="sexId" label="性别">
+            <template slot-scope="scope">
+              <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="age" label="年龄" />
+          <el-table-column prop="mobileTelephone" label="手机" width="100" />
+          <el-table-column prop="telephone" label="电话" width="100" />          
+        </el-table>
       </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>
+    <!--通用选单位、体检次数、分组的控件-->
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
+      :close-on-click-modal="false" width="840px" height="600px">
+      <CusOrgOCX/>
+    </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";
-
-
+import { dddw, objCopy, arrayReduce, arrayExistObj,tcdate } from "@/utlis/proFunc";
+import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
 export default {
   components: {
-
+    CusOrgOCX,
   },
   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]);
-            },
-          },
-        ],
-      },
+    return {      
+      dataList: [], //列表数据 
     };
   },
 
   created() {
-    this.formInit = { ...this.form };
+    this.dictInit();
   },
 
   //挂载完成
-  mounted() { },
+  mounted() {
+    this.btnQuery();
+  },
+  
   computed: {
-    ...mapState(["window", "dict"]),
+    ...mapState(["window", "dict","patientRegister","report"]),
   },
-  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;
-    },
-
 
+  methods: {
+    moment,dddw,
+    //数据初始化
+    dictInit() {
+      //性别
+      getapi("/api/app/sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.sex = res.data;
+        }
+      });
 
-    //按条码号查个人数据
-    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 = ''
-            }
+      //体检中心
+      getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
+        (res) => {
+          if (res.code == 1) {
+            this.dict.organization = res.data;
           }
-        });
-    },
+        }
+      );
 
-    //提交
-    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;
+      //体检单位树
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
+        if (res.code == 1) {
+          this.patientRegister.customerOrgTreeAll = res.data;
+          tcdate(this.patientRegister.customerOrgTreeAll);
         }
-        //编辑
-        if (this.form.id) {
+      });
 
-        } else {
-          //新增
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalType = res.data.items;
         }
       });
-    },
 
+      //人员类别
+      getapi("/api/app/personnel-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.personnelType = res.data.items;
+        }
+      });
 
-    //查询
-    btnQuery() {
-      let body = {}
+      //婚姻状况
+      getapi("/api/app/marital-statuses").then((res) => {
+        if (res.code == 1) {
+          this.dict.maritalStatus = res.data.items;
+        }
+      });
 
-      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
+      //性激素期
+      getapi("/api/app/sex-hormone-term/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.sexHormoneTerm = res.data.items;
         }
-      }
+      });
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+      //民族
+      getapi("/api/app/nation/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.nation = res.data.items;
+        }
+      });
 
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+      //籍惯 ，出生地
+      getapi("/api/app/birth-place/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.birthPlace = res.data.items;
+        }
+      });
 
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      //套餐
+      getapi("/api/app/medical-package/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalPackage = res.data.items;
+        }
+      });
 
-      //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")
-      }
+      //分组，所有分组，不限单位，不限次数
+      getapi("/api/app/customer-org-group").then((res) => {
+        if (res.code == 1) {
+          this.dict.customerOrgGroupAll = res.data.items;
+        }
+      });
 
+      //支付方式
+      getapi("/api/app/pay-mode").then((res) => {
+        if (res.code == 1) {
+          this.dict.payMode = res.data;
+        }
+      });
 
-      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code == 1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
+      });
 
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+      getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.asbItemAll = res.data.items;
+        }
+      });
 
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+      console.log("dict", this.dict);
+    },
 
+    //查询
+    btnQuery(){
+      console.log('query');
+      let body = {};
 
-      console.log('/api/app/patientregister/getlistinfilter', body)
-      postapi('/api/app/patientregister/getlistinfilter', body)
-        .then((res) => {
+      postapi('/api',body).then(res =>{
+        if(res.code != -1 ){
           this.dataList = res.data;
-        });
+        }
+      })
     },
   },
 
   //监听事件
   watch: {
     //触发查询事件
-    "patientRegister.query.times"(newVal, oldVal) {
-      if (newVal != oldVal) {
-        //alert('触发查询事件')
-        this.query();
-      }
-    },
+    // "patientRegister.query.times"(newVal, oldVal) {
+    //   if (newVal != oldVal) {
+    //     //alert('触发查询事件')
+    //     this.query();
+    //   }
+    // },
 
   },
 };
 </script>
 <style scoped>
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 25px;
+}
 .query {
   margin-left: 10px;
 }
diff --git a/src/views/report/checkStatus.vue b/src/views/report/checkStatus.vue
index 9b4daa8..f359e33 100644
--- a/src/views/report/checkStatus.vue
+++ b/src/views/report/checkStatus.vue
@@ -18,7 +18,7 @@
             </el-select>
           </div>     
           <div class="query">
-            <span>状态：</span>
+            <span>检查状态：</span>
             <el-select v-model="patientRegister.query.checkCompleteFlag" placeholder="请选择" clearable style="width: 80px"
               size="small">
               <el-option v-for="item in dict.checkCompleteFlag" :key="item.id" :label="item.displayName" :value="item.id">
@@ -78,7 +78,12 @@
           <el-table-column prop="telephone" label="电话" width="100" />          
         </el-table>
       </div>
-    </el-card>    
+    </el-card> 
+    <!--通用选单位、体检次数、分组的控件-->
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
+      :close-on-click-modal="false" width="840px" height="600px">
+      <CusOrgOCX/>
+    </el-dialog>   
   </div>
 </template>
 <script>
@@ -86,10 +91,10 @@ import moment from "moment";
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { dddw, objCopy, arrayReduce, arrayExistObj,tcdate } from "@/utlis/proFunc";
-
+import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
 export default {
   components: {
-    
+    CusOrgOCX,
   },
   data() {
     return {      
@@ -107,7 +112,7 @@ export default {
   },
   
   computed: {
-    ...mapState(["window", "dict","patientRegister"]),
+    ...mapState(["window", "dict","patientRegister","report"]),
   },
 
   methods: {
diff --git a/src/views/report/unCheckAsbitem.vue b/src/views/report/unCheckAsbitem.vue
index a21ba32..6ba6540 100644
--- a/src/views/report/unCheckAsbitem.vue
+++ b/src/views/report/unCheckAsbitem.vue
@@ -1,436 +1,245 @@
 <template>
   <div>
-    <el-card>
+    <el-card>      
       <div class="publiccss">人员未检组合项目</div>
-      <div style="display: flex;margin-top:20px">
-        <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 :style="'display: block; width:' + (window.pageWidth - 80) + 'px;margin-top:20px'">
+        <div style="display: flex; flex-wrap: wrap; height:35px;">
+          <div class="query">
+            <span>体检单位：</span>
+            <el-input placeholder="请选择单位" v-model="patientRegister.query.cusOrgOCX" style="width:342px;" size="small" disabled>          
+              <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"></el-button>
+            </el-input>
           </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 class="query">
+            <span>检查状态：</span>
+            <el-select v-model="patientRegister.query.completeFlag" placeholder="请选择" clearable style="width: 80px"
+              size="small">
+              <el-option v-for="item in dict.completeFlag" :key="item.id" :label="item.displayName" :value="item.id">
+              </el-option>
+            </el-select>            
           </div>
-          <div class="listBtn">
-            <el-button type="primary" class="btnClass" @click="edit">编辑</el-button>
+          <div class="query" style="margin-top: 3px;">
+            <el-checkbox v-model="patientRegister.query.containRefuse" >包含弃检</el-checkbox>
           </div>
-          <div class="listBtn">
-            <el-button type="danger" class="btnClass" @click="edit">删除</el-button>
+          <div class="query">
+            <el-button type="primary" @click="btnQuery" size="small">查询</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-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+          row-key="id" size="small" highlight-current-row ref="dataList" >
+          <el-table-column prop="asbitemName" label="未检项目" width="300"/>
+          <el-table-column prop="patientRegisterNo" label="人员条码号" width="130"/> 
+          <el-table-column prop="patientNo" label="档案号" width="130"/>
+          <el-table-column prop="medicalTimes" label="体检次数" width="70"/>
+          <el-table-column prop="customerOrgParentName" label="单位" width="180">
+            <template slot-scope="scope">
+              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgParentName : scope.row.customerOrgName }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="customerOrgName" label="部门" width="180">
+            <template slot-scope="scope">
+              <div>{{ scope.row.customerOrgParentName ? scope.row.customerOrgName : "" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column label="分组/套餐" width="150">
+            <template slot-scope="scope">
+              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId === dict.personOrgId">
+                {{ dddw(dict.medicalPackage, "id", scope.row.medicalPackageId, "displayName") }}
+              </div>
+              <div v-if="scope.row.medicalPackageId !== dict.personOrgId && scope.row.customerOrgId !== dict.personOrgId">
+                {{ dddw(dict.customerOrgGroupAll, "id", scope.row.customerOrgGroupId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="patientName" label="姓名" width="80"/>
+          <el-table-column prop="sexId" label="性别">
+            <template slot-scope="scope">
+              <div>{{ dddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="age" label="年龄" />
+          <el-table-column prop="mobileTelephone" label="手机" width="100" />
+          <el-table-column prop="telephone" label="电话" width="100" />          
+        </el-table>
       </div>
-    </el-dialog>
+    </el-card>  
+    <!--通用选单位、体检次数、分组的控件-->
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
+      :close-on-click-modal="false" width="840px" height="600px">
+      <CusOrgOCX/>
+    </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";
-
-
+import { dddw, objCopy, arrayReduce, arrayExistObj,tcdate } from "@/utlis/proFunc";
+import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
 export default {
   components: {
-
+    CusOrgOCX,
   },
   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]);
-            },
-          },
-        ],
-      },
+    return {      
+      dataList: [], //列表数据 
     };
   },
 
   created() {
-    this.formInit = { ...this.form };
+    this.patientRegister.query.containRefuse = true;
+    this.dictInit();
   },
 
   //挂载完成
-  mounted() { },
+  mounted() {
+    this.btnQuery();
+  },
+  
   computed: {
-    ...mapState(["window", "dict"]),
+    ...mapState(["window", "dict","patientRegister","report"]),
   },
-  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;
-    },
-
 
+  methods: {
+    moment,dddw,
+    //数据初始化
+    dictInit() {
+      //性别
+      getapi("/api/app/sex").then((res) => {
+        if (res.code == 1) {
+          this.dict.sex = res.data;
+        }
+      });
 
-    //按条码号查个人数据
-    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 = ''
-            }
+      //体检中心
+      getapi("/api/app/organization-units/organization-unit-by-is-peis").then(
+        (res) => {
+          if (res.code == 1) {
+            this.dict.organization = res.data;
           }
-        });
-    },
+        }
+      );
 
-    //提交
-    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;
+      //体检单位树
+      getapi("/api/app/customerorg/getbycodeall").then((res) => {
+        if (res.code == 1) {
+          this.patientRegister.customerOrgTreeAll = res.data;
+          tcdate(this.patientRegister.customerOrgTreeAll);
         }
-        //编辑
-        if (this.form.id) {
+      });
 
-        } else {
-          //新增
+      //体检类别
+      getapi("/api/app/medical-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalType = res.data.items;
         }
       });
-    },
 
+      //人员类别
+      getapi("/api/app/personnel-type/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.personnelType = res.data.items;
+        }
+      });
 
-    //查询
-    btnQuery() {
-      let body = {}
+      //婚姻状况
+      getapi("/api/app/marital-statuses").then((res) => {
+        if (res.code == 1) {
+          this.dict.maritalStatus = res.data.items;
+        }
+      });
 
-      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
+      //性激素期
+      getapi("/api/app/sex-hormone-term/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.sexHormoneTerm = res.data.items;
         }
-      }
+      });
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+      //民族
+      getapi("/api/app/nation/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.nation = res.data.items;
+        }
+      });
 
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+      //籍惯 ，出生地
+      getapi("/api/app/birth-place/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.birthPlace = res.data.items;
+        }
+      });
 
-      if (this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      //套餐
+      getapi("/api/app/medical-package/in-filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.medicalPackage = res.data.items;
+        }
+      });
 
-      //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")
-      }
+      //分组，所有分组，不限单位，不限次数
+      getapi("/api/app/customer-org-group").then((res) => {
+        if (res.code == 1) {
+          this.dict.customerOrgGroupAll = res.data.items;
+        }
+      });
 
+      //支付方式
+      getapi("/api/app/pay-mode").then((res) => {
+        if (res.code == 1) {
+          this.dict.payMode = res.data;
+        }
+      });
 
-      if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
+      //体检类别 树结构
+      getapi("/api/app/item-type/by-code-all").then((res) => {
+        if (res.code == 1) {
+          this.dict.itemTypeTree = res.data;
+          tcdate(this.dict.itemTypeTree);
+        }
+      });
 
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
+      getapi("/api/app/asbitem/in-filter?Filter").then((res) => {
+        if (res.code == 1) {
+          this.dict.asbItemAll = res.data.items;
+        }
+      });
 
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
+      console.log("dict", this.dict);
+    },
 
+    //查询
+    btnQuery(){
+      console.log('query');
+      let body = {};
 
-      console.log('/api/app/patientregister/getlistinfilter', body)
-      postapi('/api/app/patientregister/getlistinfilter', body)
-        .then((res) => {
+      postapi('/api',body).then(res =>{
+        if(res.code != -1 ){
           this.dataList = res.data;
-        });
+        }
+      })
     },
   },
 
   //监听事件
   watch: {
     //触发查询事件
-    "patientRegister.query.times"(newVal, oldVal) {
-      if (newVal != oldVal) {
-        //alert('触发查询事件')
-        this.query();
-      }
-    },
+    // "patientRegister.query.times"(newVal, oldVal) {
+    //   if (newVal != oldVal) {
+    //     //alert('触发查询事件')
+    //     this.query();
+    //   }
+    // },
 
   },
 };
 </script>
 <style scoped>
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 5px;
+  padding-right: 25px;
+}
 .query {
   margin-left: 10px;
 }