diff --git a/public/files/会员卡导入模板.xls b/public/files/会员卡导入模板.xls
index 4b3e33c..e5f65c3 100644
Binary files a/public/files/会员卡导入模板.xls and b/public/files/会员卡导入模板.xls differ
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 2f8b098..81992e7 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -566,6 +566,14 @@
           ref="patientList">
           <el-table-column type="index" width="30" align="center" />
           <el-table-column prop="patientNo" label="档案号" min-width="80" align="center" />
+          <el-table-column prop="customerOrgParentName" label="档案号" min-width="180" show-overflow-tooltip/>
+          <el-table-column prop="customerOrgName" label="档案号" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.customerOrgParentName == scope.row.customerOrgName ? '':scope.row.customerOrgName }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column prop="lastTime" label="末次体检" min-width="80" align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.lastTime">
@@ -573,7 +581,7 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="medicalTimes" label="体检次数" min-width="70" align="center" />
+          <el-table-column prop="medicalTimes" label="次数" min-width="70" align="center" />
           <el-table-column prop="displayName" label="姓名" min-width="70" align="center" />
           <el-table-column prop="sexId" label="性别" min-width="50" align="center">
             <template slot-scope="scope">
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 4d12477..446e38b 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -757,10 +757,10 @@ export default {
         {
           label: "条码号",
           prop: "patientRegisterNo",
-          minWidth: 150,
+          minWidth: 110,
           align: "center",
         },
-        { label: "档案号", prop: "patientNo", minWidth: 100, align: "center" },
+        { label: "档案号", prop: "patientNo", minWidth: 90, align: "center" },
         {
           label: "体检次数",
           prop: "medicalTimes",
@@ -836,10 +836,10 @@ export default {
         { label: "高铁", prop: "qztlIsGt", minWidth: 50, align: "center" },
         { label: "职害", prop: "qztlIsWh", minWidth: 50, align: "center" },
         { label: "复检", prop: "qztlIsFj", minWidth: 50, align: "center" },
-        { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
-        { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },
-        { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
-        { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
+        // { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
+        // { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },
+        // { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
+        // { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
       ],
       dialogColSort: false,
       jsonFields: {},
@@ -1877,7 +1877,7 @@ export default {
 
       // 带费且合计  /api/app/PatientRegister/GetPatientRegisterWithCharge
       // 不带费且合计 /api/app/patientregister/getlistinfilter
-      postapi("/api/app/PatientRegister/GetPatientRegisterWithCharge", body).then(
+      postapi("/api/app/patientregister/getlistinfilter", body).then(
         async (res) => {
           if (res.code > -1) {
             // 刷新最大记录数
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 605a25b..a52c237 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -134,11 +134,11 @@ export default {
         { label: "介绍人", prop: "salesman", minWidth: 80, align: "center" },
         { label: "VIP", prop: "isVip", minWidth: 80, align: "center" },
         { label: "总检医生", prop: "summaryDoctorName", minWidth: 90, align: "center" },
-        { label: "总检日期", prop: "summaryDate", minWidth: 140, align: "center" },
+        { label: "总检日期", prop: "summaryDate", minWidth: 160, align: "center" },
         { label: "审核医生", prop: "auditDoctorName", minWidth: 90, align: "center" },
-        { label: "审核日期", prop: "auditDate", minWidth: 140, align: "center" },
+        { label: "审核日期", prop: "auditDate", minWidth: 160, align: "center" },
         { label: "登记人", prop: "registerName", minWidth: 80, align: "center" },
-        { label: "登记时间", prop: "registerDate", minWidth: 140, align: "center" },
+        { label: "登记时间", prop: "registerDate", minWidth: 160, align: "center" },
         { label: "打印人", prop: "reportPrintName", minWidth: 70, align: "center" },
         { label: "领取人", prop: "reportReceiveName", minWidth: 70, align: "center" },
         { label: "领取时间", prop: "reportReceiveDate", minWidth: 140, align: "center" },
diff --git a/src/views/customerReport/personnelPositive.vue b/src/views/customerReport/personnelPositive.vue
index 8f587aa..5f181ba 100644
--- a/src/views/customerReport/personnelPositive.vue
+++ b/src/views/customerReport/personnelPositive.vue
@@ -19,13 +19,19 @@
             margin-top: 7px;
           ">
           <div class="query">
-            <span>体检单位：</span>
+            <span style="margin-right: 3px;">体检单位</span>
             <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
               disabled>
               <el-button slot="append" icon="el-icon-search" @click="report.dialogCusOrgOCX = true"
                 style="font-size: 20px"></el-button>
             </el-input>
           </div>
+          <div class="query">
+            <span style="margin-right: 3px;">显示综述</span>
+            <el-checkbox v-model="isDispSummary" size="small" true-label="Y"
+                  false-label="N" />
+          </div>
+          
           <!-- <div class="query">
             <span>检查状态：</span>
             <el-select v-model="completeFlag" placeholder="请选择" clearable style="width: 80px"
@@ -64,7 +70,7 @@
           </div>
         </div>
         <div ref="imageDom" style="background-color: #fff; padding: 15px; border-radius: 8px">
-          <el-table :data="dataList" border width="45%" :height="flag
+          <el-table :data="dataList" border  :height="flag
               ? window.pageHeight < 600
                 ? 415
                 : window.pageHeight - 185 - 25
@@ -83,8 +89,8 @@
                 <el-table-column prop="sexName" label="性别" width="50" align="center" />
                 <el-table-column prop="age" label="年龄" width="80" align="center" />
                 <el-table-column prop="medicalTimes" label="次数" width="50" align="center" />
-                <el-table-column prop="mobileTelephone" label="手机号码" width="120" />
-                <el-table-column prop="sumSummarysContent" label="检查综述" min-width="400">
+                <el-table-column prop="mobileTelephone" label="手机号码" width="120" />                
+                <el-table-column prop="sumSummarysContent" label="检查综述" min-width="400" v-if="isDispSummary == 'Y' ? true:false">
                   <template slot-scope="scope">
                     <div v-for="(line, index) in scope.row.sumSummarysContent.split('\n')" :key="index">
                       {{ line }}
@@ -131,6 +137,7 @@ export default {
       completeFlag: "",
       classification: "Y",
       flag: true,
+      isDispSummary:'N', // 是否显示综述
       summary: {
         startDate: "",
         endDate: "",
diff --git a/src/views/fee-settings/cardRegister.vue b/src/views/fee-settings/cardRegister.vue
index 849fa90..18f1870 100644
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@@ -174,24 +174,12 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="creatorName" label="创建人员" align="center"/>
-            <el-table-column prop="creationTime" label="创建日期" width="150" align="center">
-              <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="creatorName" label="操作人员" align="center"/>
+            <el-table-column prop="creationTime" label="操作日期" width="160" align="center" />
+            <!--
             <el-table-column prop="lastModifierName" label="修改人员" />
-            <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-column prop="lastModificationTime" label="修改日期" width="160" align="center"/>
+              -->
           </el-table>
         </div>
       </div>
@@ -232,7 +220,7 @@
           </a>
         </div>
         <div style="margin-top: 10px">
-          <el-button class="commonbutton" @click="btnImportCard">导入建卡</el-button>
+          <el-button class="commonbutton" @click="seq = 0">导入建卡</el-button>
         </div>
         <div style="margin-top: 10px">
           <download-excel :fields="jsonFields" :fetch="btnExport" type="xls" :name="tableName">
@@ -417,14 +405,13 @@
           <br />注意事项如下:
           <br />
           <div style="margin-left: 25px">
-            1、卡号、卡主不能为空，其余数据可根据实际情况选择是否填写。
-            <br />2、卡类别与本软件系统中的名称完全一致。
+            1、卡号、卡主不能为空，其余数据可根据实际情况选择是否填写；
+            <br />2、卡类别与本软件系统中的名称完全一致，初始金额不为 0 时，充值方式必填；
             <br />3、折扣率填写错误（未填、0、负数或非有数字）时，则默认为 100
             <br />4、Excel中标题列不能有单元格合并。
           </div>
         </div>
         <span slot="footer" class="dialog-footer">
-          <el-button class="commonbutton" type="primary" @click="seq--">上一步</el-button>
           <el-button class="commonbutton" type="primary" @click="seq++">下一步</el-button>
           <el-button class="commonbutton" @click="seq = -1">关闭</el-button>
         </span>
@@ -643,7 +630,7 @@ export default {
         oldMansOpts: false, //历史数据导入前参数设定
       },
       oldSeq: -2, //旧的步骤（辅助区分上一步，下一步）
-      seq: 0, //当前显示窗口
+      seq: -1, //当前显示窗口
       mode: "10", //模式 10 开始 文件导入，20开始 从数据库中导入 ，30 开始职业病
       excelCols: [{ dispLabel: "", val: "", dataLabel: "" }], //excel数据列名 {dispLabel:'',val:'',dataLabel:''}
       importCols: [], //实际导入的列（即有设置与 dataCols 匹配的列）
@@ -656,6 +643,7 @@ export default {
         { dispLabel: "会员卡号", val: "cardNo" },
         { dispLabel: "折扣率", val: "discount" },
         { dispLabel: "初始余额", val: "cardBalance" },
+        { dispLabel: "充值方式", val: "payMode" },
         { dispLabel: "性别", val: "expiryDate" },
         { dispLabel: "年龄", val: "age" },
         { dispLabel: "有效期限", val: "birthDate" },
@@ -674,6 +662,7 @@ export default {
         sheetNameChoosed: "", //当前选中的表格
         titleRow: 1, //标题行
       },
+
       jsonFields: {
         卡类别: "cardTypeId",
         会员卡号: "cardNo",