diff --git a/src/components/patientRegister/MergeAsbitem.vue b/src/components/patientRegister/MergeAsbitem.vue
index 5c97990..fa7ae36 100644
--- a/src/components/patientRegister/MergeAsbitem.vue
+++ b/src/components/patientRegister/MergeAsbitem.vue
@@ -191,7 +191,7 @@ export default {
       } else {
         this.tableData = [];
         this.tableDataAll.forEach(e => {
-          if (itemTypeIdsChild.indexOf(e.itemTypeId) < 0) {
+          if (itemTypeIdsChild.indexOf(e.itemTypeId) > -1 ) {
             this.tableData.push(e);
           }
         });
@@ -234,7 +234,7 @@ export default {
 
       this.getFinalSelected();
       this.finalSelected.forEach(e => {
-        if(itemTypes.indexOf(e.itemTypeName) < 0) itemTypes.push(e.itemTypeName);
+        if(itemTypes.indexOf(e.itemTypeId) < 0) itemTypes.push(e.itemTypeId);
         registerAsbitemIds.push(e.registerAsbitemId);
       });
 
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 8631dea..f00b9f9 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -586,12 +586,7 @@ export default {
     //查询
     async query() {
       this.patientRegister.prList = [];
-      const loading = this.$loading({
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      });
+      
 
       let body = {}
 
@@ -611,9 +606,13 @@ export default {
       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.startDate && this.patientRegister.query.endDate) {
+        body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
+        body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
+        if(body.startDate > body.endDate){
+          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
+          return
+        }
       }
 
 
@@ -625,6 +624,13 @@ export default {
 
 
       console.log('/api/app/patientregister/getlistinfilter', body)
+      
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
           if (res.code != -1) {
diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index 9744d5e..96b5150 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -251,9 +251,13 @@ export default {
       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.startDate && this.patientRegister.query.endDate) {
+        body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
+        body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
+        if(body.startDate > body.endDate){
+          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
+          return
+        }
       }
 
 
@@ -265,11 +269,21 @@ export default {
 
 
       console.log('/api/app/patientregister/getlistinfilter', body)
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
           if(res.code != - 1){
             this.dataList = res.data.items;
           }
+          loading.close();
+        })
+        .catch((err) => {
+          loading.close();
         });
     },
   },
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index be93b18..aa63d9f 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -374,9 +374,13 @@ export default {
       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.startDate && this.patientRegister.query.endDate) {
+        body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
+        body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
+        if(body.startDate > body.endDate){
+          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
+          return
+        }
       }
 
 
@@ -388,11 +392,21 @@ export default {
 
 
       console.log('/api/app/patientregister/getlistinfilter', body)
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
           if(res.code != - 1){
             this.dataList = res.data.items;
           }
+          loading.close();
+        })
+        .catch((err) => {
+          loading.close();
         });
     },
   },
diff --git a/src/components/patientRegister/PatientRegisterSignList.vue b/src/components/patientRegister/PatientRegisterSignList.vue
index 020c5d9..db1d3f2 100644
--- a/src/components/patientRegister/PatientRegisterSignList.vue
+++ b/src/components/patientRegister/PatientRegisterSignList.vue
@@ -256,9 +256,13 @@ export default {
       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.startDate && this.patientRegister.query.endDate) {
+        body.startDate = moment(this.patientRegister.query.startDate).format("yyyy-MM-DD")
+        body.endDate = moment(this.patientRegister.query.endDate).format("yyyy-MM-DD")
+        if(body.startDate > body.endDate){
+          this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
+          return
+        }
       }
 
 
@@ -270,11 +274,21 @@ export default {
 
 
       console.log('/api/app/patientregister/getlistinfilter', body)
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
           if(res.code != - 1){
             this.dataList = res.data.items;
           }
+          loading.close();
+        })
+        .catch((err) => {
+          loading.close();
         });
     },
   },
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 1f521c1..3afe9d7 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -5,10 +5,9 @@
     <div :style="'display: flex; flex-wrap: wrap; height:100px;width:' + (window.pageWidth - (orgEnable=='Y' ? 0:200) - 120 - 80) + 'px;'">
       <div class="query">
         <span>登记日期：</span>
-        <el-date-picker v-model="patientRegister.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>
+        <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"/>
+        <span>至</span>
+        <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"/>
       </div>
       <div class="query">
         <span>条码号：</span>
@@ -75,42 +74,14 @@ export default {
   data() {
     return {
       dialogVisible: false,
-
-      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() { },
+  created() { 
+    let ldate = new Date();
+    this.patientRegister.query.startDate = ldate;
+    this.patientRegister.query.endDate = ldate;
+  },
 
   //挂载完成
   mounted() { },
@@ -134,6 +105,19 @@ export default {
 </script>
 <style scoped>
 
+::v-deep .el-input__inner {
+  /*text-align: center;*/
+  padding-left: 2px;  /* 控件默认 15 */
+  padding-right: 15px; /* 控件默认 25 */
+}
+::v-deep .el-icon-date:before {
+  content: ""; /* 去掉日期控件前面的图标 */
+}
+
+::v-deep .el-input__icon{
+  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
 .query {
   margin-left: 10px;
 }
diff --git a/src/components/report/PatientRegisterQueryNobtn.vue b/src/components/report/PatientRegisterQueryNobtn.vue
index 3d3f6f0..bafd8f7 100644
--- a/src/components/report/PatientRegisterQueryNobtn.vue
+++ b/src/components/report/PatientRegisterQueryNobtn.vue
@@ -5,7 +5,7 @@
         <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-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true" style="font-size: 20px;"></el-button>
           </el-input>
         </div>
         <div class="query">
@@ -151,6 +151,9 @@ export default {
   padding-left: 5px;
   padding-right: 25px;
 }
+::v-deep .el-input-group__append{
+  padding: 0 5px; /* 控件默认 0 20px;*/
+}
 .query {
   margin-left: 10px;
 }
diff --git a/src/store/index.js b/src/store/index.js
index 5feb7e0..7c6e646 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -107,8 +107,10 @@ export default new Vuex.Store({
       medicalPackageChange: 0,     //控制体检列表记录切换时，0 无需触发更换套餐操作
       query: {
         dateType:'creationTime',  //登记日期
-        containRefuse:true,       //包含弃检项目
         dateRange:null,   //日期范围
+        startDate:null,   
+        endDate:null,
+        containRefuse:true,       //包含弃检项目        
         times: 0, //触发查询次数
         customerOrgId: "", //体检单位ID
         CustomerOrgParentId: "", //单位父级ID
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 8938650..7a3c9c2 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -10,10 +10,9 @@
             <div style="display:flex;">
               <div>
                 <span>登记日期：</span>
-                <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>
+                <el-date-picker v-model="query.startDate" type="date" placeholder="起始日期" size="small" style="width:90px;"/>
+                <span>至</span>
+                <el-date-picker v-model="query.endDate" type="date" placeholder="截止日期" size="small" style="width:90px;"/>
               </div>
               <div style="margin-left:10px;">
                 <el-button type="primary" class="btnClass" @click="Query" size="small" style="width:95px;">查询</el-button>
@@ -253,6 +252,8 @@ export default {
       query: {
         chargeFlag: 'N',
         dateRange: null,
+        startDate: null,
+        endDate: null,
         patientRegisterNo: '',
         patientNo: '',
         invoiceNo: '',
@@ -369,13 +370,14 @@ export default {
         if (!this.query.invoiceNo) return;
         body = { invoiceNo: this.query.invoiceNo };
       } else {
-        if (this.query.dateRange) {
-          body.startDate = moment(this.query.dateRange[0]).format('yyyy-MM-DD');
-          body.endDate = moment(this.query.dateRange[1]).format('yyyy-MM-DD');
+        if (this.query.startDate && this.query.endDate) {
+          body.startDate = moment(this.query.startDate).format("yyyy-MM-DD")
+          body.endDate = moment(this.query.endDate).format("yyyy-MM-DD")
+          if(body.startDate > body.endDate){
+            this.$message.warning("起始日期不能大于截止日期，数据校验不通过！")
+            return
+          }
         }
-        // if(this.query.patientName){
-        //   body.patientName = this.query.patientName;
-        // }                     
       }
 
       switch (this.query.chargeFlag) {
@@ -393,6 +395,12 @@ export default {
           break;
       }
 
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      });
       postapi(url, body).then(res => {
         if (res.code != - 1) {
           this.patientList = res.data.items;
@@ -402,6 +410,10 @@ export default {
             this.query.patientNo = this.patientList[0].patientNo;
           }
         }
+        loading.close();
+      })
+      .catch((err) => {
+        loading.close();
       });
 
     },
@@ -1070,11 +1082,19 @@ export default {
   padding: 0px 0;
 }
 
+
+/* 输入框相关设置*/
 ::v-deep .el-input__inner {
-  text-align: left;
-  padding-left: 5px;
+  padding-left: 2px;
   padding-right: 15px;
 }
+::v-deep .el-input__icon{
+  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
+}
+
+::v-deep .el-icon-date:before {
+  content: ""; /* 去掉日期控件前面的图标 */
+}
 
 ::v-deep input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {