diff --git a/src/components/patientRegister/LisRequest.vue b/src/components/patientRegister/LisRequest.vue
index 2a8f53a..f198cf2 100644
--- a/src/components/patientRegister/LisRequest.vue
+++ b/src/components/patientRegister/LisRequest.vue
@@ -200,6 +200,11 @@ export default {
         ],
       };
 
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
+
       if (isPreview) {
         //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295
         //this.multipleSelection.forEach((item,index) =>{
@@ -212,8 +217,8 @@ export default {
               console.log(
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
-              );
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
+              );              
+              return this.$peisAPI.printPre(JSON.stringify(toOutShell));              
             }
           })
           .catch((err) => {
@@ -231,11 +236,12 @@ export default {
                 "JSON.stringify(toOutShell)",
                 JSON.stringify(toOutShell)
               );
+
               return this.$peisAPI.print(JSON.stringify(toOutShell));
             }
           })
           .then((res) => {
-            if (res.toLowerCase() == "success") {
+            if (res.code != -1) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index f8b7a4f..200499e 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -843,12 +843,15 @@ export default {
 
     //读取身份证信息
     peopleIcCard() {
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
       this.$peisAPI.peopleIcCard().then(res => {
-        //console.log('peopleIcCard',res)      
+        //console.log('peopleIcCard',res)
         let lres = JSON.parse(res)
-        if (lres.code && lres.code.toLowerCase() == 'success') {
-          this.projPriv.idNos = lres
-          let idNos = parsIcCardtoLocal(this.projPriv.idNos, this.dict.sex, this.dict.nation)
+        if (lres.code >= 0) {          
+          let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
           this.form.patientName = idNos.Name
           this.form.birthDate = idNos.birthDate
           this.form.sexId = idNos.sexId
@@ -1191,13 +1194,13 @@ export default {
     },
 
     //拍照（已废弃）
-    openCamera() {
-      if (!this.form.id) {
-        alert("请先保存人员信息");
-        return;
-      }
-      this.patientRegister.cameraVisble = true;
-    },
+    // openCamera() {
+    //   if (!this.form.id) {
+    //     alert("请先保存人员信息");
+    //     return;
+    //   }
+    //   this.patientRegister.cameraVisble = true;
+    // },
 
     //拍照（调壳程序）
     photoGrah() {
@@ -1205,6 +1208,10 @@ export default {
         alert("请先保存人员信息");
         return;
       }
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
       this.$peisAPI.photoGrah()
         .then(res => {
           console.log(res)
@@ -1250,6 +1257,10 @@ export default {
         this.$message.info("人员信息尚未保存，不可执行此操作！");
         return;
       }
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
 
       let token = localStorage.getItem('token');
       let user = localStorage.getItem('user');
@@ -1271,8 +1282,8 @@ export default {
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
-              return this.$peisAPI.printPre(JSON.stringify(toOutShell));
+              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));              
+              return this.$peisAPI.printPre(JSON.stringify(toOutShell));             
             }
           })
           .catch(err => {
@@ -1285,12 +1296,12 @@ export default {
           .then((res) => {
             if (res.code != -1) {
               toOutShell.ReportTable = res.data;
-              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+              console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));              
               return this.$peisAPI.print(JSON.stringify(toOutShell));
             }
           })
           .then(res => {
-            if (res.toLowerCase() == 'success') {
+            if (res.code != -1) {
               //更新打印次数
               return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.form.id])
             }
@@ -1363,6 +1374,10 @@ export default {
         this.$message.info("人员信息尚未保存，不可执行此操作！");
         return;
       }
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
 
       let token = localStorage.getItem('token');
       let user = localStorage.getItem('user');
@@ -1401,7 +1416,7 @@ export default {
             }
           })
           .then(res => {
-            if (res.toLowerCase() == 'success') {
+            if (res.code != -1) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index e31a14d..4f36254 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -650,8 +650,8 @@ export default {
                 return this.$peisAPI.print(JSON.stringify(toOutShell));
               }
             })
-            .then((res) => {
-              if (res.toLowerCase() == "success") {
+            .then((res) => {              
+              if (JSON.parse(res).code >= 0) {
                 //更新打印次数
                 return postapi(
                   "api/app/patientregister/updatepatientregisterguideprinttimesmany",
@@ -1420,8 +1420,8 @@ export default {
             }
           })
           .then((res) => {
-            console.log("res", res);
-            if (res && res.toLowerCase() == "success") {
+            //console.log("res", res);
+            if (JSON.parse(res).code >= 0) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
@@ -1493,7 +1493,7 @@ export default {
             }
           })
           .then((res) => {
-            if (res.toLowerCase() == "success") {
+            if (JSON.parse(res).code >= 0) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index 021053a..792b2fb 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -1,261 +1,263 @@
 <template>
   <div style="display: flex">
-    <div
-      :style="'width:' + Math.floor((window.pageWidth - 120 - 86) / 2) + 'px;'"
-    >
-      <el-table
-        :data="dataList"
-        border
-        :height="window.pageHeight < 600 ? 310 : window.pageHeight - 290"
-        row-key="id"
-        size="small"
-        highlight-current-row
-        ref="dataList"
-        @row-click="rowClick"
+    <div :style="'margin-left: 5px;display: flex;width:' + (window.pageWidth - 110 - 50) + 'px;'">
+      <div
+        :style="'width:' + Math.floor((window.pageWidth - 110 - 50) / 2) + 'px;'"
       >
-        <el-table-column type="index" width="50" label="序号" />
-        <el-table-column prop="completeFlag" label="体检进度">
-          <template slot-scope="scope">
-            <div>
-              {{
-                ldddw(
-                  dict.completeFlag,
-                  "id",
-                  scope.row.completeFlag,
-                  "displayName"
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isLock" label="锁住" width="50">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <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 prop="patientName" label="姓名" />
-        <el-table-column prop="sexId" label="性别">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="age" label="年龄" />
-        <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
-        <el-table-column prop="patientNo" label="档案号" />
-        <el-table-column prop="medicalTimes" label="体检次数"></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
-              "
-            >
-              {{
-                ldddw(
-                  dict.medicalPackage,
-                  "id",
-                  scope.row.medicalPackageId,
-                  "displayName"
-                )
-              }}
-            </div>
-            <div
-              v-if="
-                scope.row.medicalPackageId !== dict.personOrgId &&
-                scope.row.customerOrgId !== dict.personOrgId
-              "
-            >
-              {{
-                ldddw(
-                  dict.customerOrgGroupAll,
-                  "id",
-                  scope.row.customerOrgGroupId,
-                  "displayName"
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="nationId" label="民族">
-          <template slot-scope="scope">
-            <div>
-              {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="idNo" label="身份证" width="150" />
-        <el-table-column prop="birthDate" label="出生日期" width="100">
-          <template slot-scope="scope">
-            <div v-if="scope.row.birthDate">
-              {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="email" label="邮箱" width="100" />
-        <el-table-column prop="mobileTelephone" label="手机" width="100" />
-        <el-table-column prop="telephone" label="电话" width="100" />
-        <el-table-column prop="address" label="地址" width="300" />
-        <el-table-column prop="medicalCardNo" label="体检卡号" />
-        <el-table-column prop="jobCardNo" label="工卡号" />
-        <el-table-column prop="maritalStatusId" label="婚姻状况">
-          <template slot-scope="scope">
-            <div>
-              {{
-                ldddw(
-                  dict.maritalStatus,
-                  "id",
-                  scope.row.maritalStatusId,
-                  "displayName"
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="medicalTypeId" label="体检类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
-              {{
-                ldddw(
-                  dict.medicalType,
-                  "id",
-                  scope.row.medicalTypeId,
-                  "displayName"
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="personnelTypeId" label="人员类别">
-          <template slot-scope="scope">
-            <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
-              {{
-                ldddw(
-                  dict.personnelType,
-                  "id",
-                  scope.row.personnelTypeId,
-                  "displayName"
-                )
-              }}
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="jobPost" label="职务" />
-        <el-table-column prop="jobTitle" label="职称" />
-        <el-table-column prop="salesman" label="介绍人" />
-        <el-table-column prop="isVip" label="是否VIP">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="creatorName" label="登记人" />
-        <el-table-column prop="creationTime" label="登记日期" width="100">
-          <template slot-scope="scope">
-            <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="isUpload" label="是否上传">
-          <template slot-scope="scope">
-            <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div
-      :style="
-        'margin-left: 5px;width:' +
-        Math.floor((window.pageWidth - 120 - 86) / 2) +
-        'px;'
-      "
-    >
-      <div style="display: flex; flex-wrap: wrap; height: 40px; width: 100%">
-        <div class="query">
-          <span>条码号</span>
-          <el-input
-            placeholder="条码号"
-            v-model="quick.patientRegisterNo"
-            size="small"
-            style="width: 140px"
-            clearable
-            @input="onQueryByPatientRegisterNo"
-          />
-        </div>
-        <div class="query">
-          <span>档案号</span>
-          <el-input
-            placeholder="档案号"
-            v-model="quick.patientNo"
-            size="small"
-            style="width: 100px"
-            clearable
-            @input="onQueryByPatientNo"
-          />
-        </div>
-        <div class="query">
-          <span>姓名</span>
-          <el-input
-            placeholder="姓名"
-            v-model="quick.patientName"
-            size="small"
-            style="width: 100px"
-            disabled
-          />
-        </div>
+        <el-table
+          :data="dataList"
+          border
+          :height="window.pageHeight < 600 ? 350 : window.pageHeight - 250"
+          row-key="id"
+          size="small"
+          highlight-current-row
+          ref="dataList"
+          @row-click="rowClick"
+        >
+          <el-table-column type="index" width="50" label="序号" />
+          <el-table-column prop="completeFlag" label="体检进度">
+            <template slot-scope="scope">
+              <div>
+                {{
+                  ldddw(
+                    dict.completeFlag,
+                    "id",
+                    scope.row.completeFlag,
+                    "displayName"
+                  )
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isLock" label="锁住" width="50">
+            <template slot-scope="scope">
+              <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+            </template>
+          </el-table-column>
+          <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 prop="patientName" label="姓名" />
+          <el-table-column prop="sexId" label="性别">
+            <template slot-scope="scope">
+              <div>
+                {{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="age" label="年龄" />
+          <el-table-column prop="patientRegisterNo" label="条码号" width="150" />
+          <el-table-column prop="patientNo" label="档案号" />
+          <el-table-column prop="medicalTimes" label="体检次数"></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
+                "
+              >
+                {{
+                  ldddw(
+                    dict.medicalPackage,
+                    "id",
+                    scope.row.medicalPackageId,
+                    "displayName"
+                  )
+                }}
+              </div>
+              <div
+                v-if="
+                  scope.row.medicalPackageId !== dict.personOrgId &&
+                  scope.row.customerOrgId !== dict.personOrgId
+                "
+              >
+                {{
+                  ldddw(
+                    dict.customerOrgGroupAll,
+                    "id",
+                    scope.row.customerOrgGroupId,
+                    "displayName"
+                  )
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="nationId" label="民族">
+            <template slot-scope="scope">
+              <div>
+                {{ ldddw(dict.nation, "id", scope.row.nationId, "displayName") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="idNo" label="身份证" width="150" />
+          <el-table-column prop="birthDate" label="出生日期" width="100">
+            <template slot-scope="scope">
+              <div v-if="scope.row.birthDate">
+                {{ lmoment(scope.row.birthDate, "yyyy-MM-DD") }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="email" label="邮箱" width="100" />
+          <el-table-column prop="mobileTelephone" label="手机" width="100" />
+          <el-table-column prop="telephone" label="电话" width="100" />
+          <el-table-column prop="address" label="地址" width="300" />
+          <el-table-column prop="medicalCardNo" label="体检卡号" />
+          <el-table-column prop="jobCardNo" label="工卡号" />
+          <el-table-column prop="maritalStatusId" label="婚姻状况">
+            <template slot-scope="scope">
+              <div>
+                {{
+                  ldddw(
+                    dict.maritalStatus,
+                    "id",
+                    scope.row.maritalStatusId,
+                    "displayName"
+                  )
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="medicalTypeId" label="体检类别">
+            <template slot-scope="scope">
+              <div v-if="scope.row.medicalTypeId !== dict.personOrgId">
+                {{
+                  ldddw(
+                    dict.medicalType,
+                    "id",
+                    scope.row.medicalTypeId,
+                    "displayName"
+                  )
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="personnelTypeId" label="人员类别">
+            <template slot-scope="scope">
+              <div v-if="scope.row.personnelTypeId !== dict.personOrgId">
+                {{
+                  ldddw(
+                    dict.personnelType,
+                    "id",
+                    scope.row.personnelTypeId,
+                    "displayName"
+                  )
+                }}
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="jobPost" label="职务" />
+          <el-table-column prop="jobTitle" label="职称" />
+          <el-table-column prop="salesman" label="介绍人" />
+          <el-table-column prop="isVip" label="是否VIP">
+            <template slot-scope="scope">
+              <div>{{ scope.row.isVip == "Y" ? "是" : "否" }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creatorName" label="登记人" />
+          <el-table-column prop="creationTime" label="登记日期" width="100">
+            <template slot-scope="scope">
+              <div>{{ lmoment(scope.row.creationTime, "yyyy-MM-DD") }}</div>
+            </template>
+          </el-table-column>
+          <el-table-column prop="isUpload" label="是否上传">
+            <template slot-scope="scope">
+              <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
+            </template>
+          </el-table-column>
+        </el-table>
       </div>
-      <el-table
-        :data="doctorCheck.RegisterCheckList"
-        :height="window.pageHeight < 600 ? 270 : window.pageHeight - 330"
-        border
-        highlight-current-row
-        size="small"
-        @selection-change="handleSelectionChange"
+      <div
+        :style="
+          'margin-left: 5px;width:' +
+          Math.floor((window.pageWidth - 110 - 60) / 2) +
+          'px;'
+        "
       >
-        <el-table-column type="selection" width="40" />
-        <el-table-column prop="asbitemName" label="组合项目" width="180" />
-        <el-table-column label="弃检" width="80">
-          <template slot-scope="scope">
-            <el-checkbox :value="scope.row.completeFlag == '2'"></el-checkbox>
-          </template>
-        </el-table-column>
-        <el-table-column prop="lastModifierName" label="操作员" width="100" />
-        <el-table-column
-          prop="lastModificationTime"
-          label="操作时间"
-          width="180"
+        <div style="display: flex; flex-wrap: wrap; height: 40px; width: 100%">
+          <div class="query">
+            <span>条码号</span>
+            <el-input
+              placeholder="条码号"
+              v-model="quick.patientRegisterNo"
+              size="small"
+              style="width: 140px"
+              clearable
+              @input="onQueryByPatientRegisterNo"
+            />
+          </div>
+          <div class="query">
+            <span>档案号</span>
+            <el-input
+              placeholder="档案号"
+              v-model="quick.patientNo"
+              size="small"
+              style="width: 100px"
+              clearable
+              @input="onQueryByPatientNo"
+            />
+          </div>
+          <div class="query">
+            <span>姓名</span>
+            <el-input
+              placeholder="姓名"
+              v-model="quick.patientName"
+              size="small"
+              style="width: 100px"
+              disabled
+            />
+          </div>
+        </div>
+        <el-table
+          :data="doctorCheck.RegisterCheckList"
+          :height="window.pageHeight < 600 ? 310 : window.pageHeight - 290"
+          border
+          highlight-current-row
+          size="small"
+          @selection-change="handleSelectionChange"
         >
-          <template slot-scope="scope">
-            <div>
-              {{
-                lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss")
-              }}
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
+          <el-table-column type="selection" width="40" />
+          <el-table-column prop="asbitemName" label="组合项目" width="180" />
+          <el-table-column label="弃检" width="80">
+            <template slot-scope="scope">
+              <el-checkbox :value="scope.row.completeFlag == '2'"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column prop="lastModifierName" label="操作员" width="100" />
+          <el-table-column
+            prop="lastModificationTime"
+            label="操作时间"
+            width="180"
+          >
+            <template slot-scope="scope">
+              <div>
+                {{
+                  lmoment(scope.row.lastModificationTime, "yyyy-MM-DD HH:mm:ss")
+                }}
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
     </div>
-    <div style="margin-left: 10px; width: 110px">
+    <div style="margin-left: 10px;margin-top: 60px; width: 100px">
       <div class="listBtn">
         <el-button type="success" class="btnClass" @click="resuse('2')"
           >登记弃检</el-button
@@ -592,6 +594,6 @@ export default {
   text-align: center;
 }
 .btnClass {
-  width: 110px;
+  width: 100px;
 }
 </style>
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index d31b5f9..7d5cf18 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -72,6 +72,7 @@
 <script>
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import {parsIcCardtoLocal} from '../../utlis/proFunc'
 
 export default {
   components: {},
@@ -103,12 +104,35 @@ export default {
 
     //读身份证
     readIdCard() {
-      alert("读身份证");
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
+      this.$peisAPI.peopleIcCard().then(res => {
+        console.log('peopleIcCard',res)
+        let lres = JSON.parse(res)
+        if (lres.code >= 0) {          
+          let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
+          // this.form.patientName = idNos.Name
+          // this.form.birthDate = idNos.birthDate
+          // this.form.sexId = idNos.sexId
+          // this.form.age = idNos.age
+          // this.form.nationId = idNos.nationId
+          // this.form.idNo = idNos.IDCode
+          // this.form.address = idNos.Address
+          // this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo
+          this.patientRegister.query.patientName = idNos.Name
+          this.patientRegister.query.sex = idNos.sexId
+          this.patientRegister.query.idCardNo = idNos.IDCode
+        }
+      })      
     },
+
   },
 };
 </script>
 <style scoped>
+@import "../../assets/css/global_button.css";
 @import "../../assets/css/global_input.css";
 
 .query {
diff --git a/src/components/report/BtnReport.vue b/src/components/report/BtnReport.vue
index d3a4627..1dbb897 100644
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@@ -281,6 +281,11 @@ export default {
                 return
             }
 
+            if(!this.$peisAPI) {
+                this.$message.info("此功能，需要在壳客户端才可运行！")
+                return       
+            }
+
             ///3a0c990e-5756-2dc0-19d5-69a617fe4048
             let ReportCode = '0005';
             let token = localStorage.getItem('token');
@@ -305,7 +310,7 @@ export default {
                     this.$peisAPI.printPre(JSON.stringify(toOutShell));
                 }else{
                     this.$peisAPI.print(JSON.stringify(toOutShell)).then(res =>{
-                        if (res.toLowerCase() == 'success') {
+                        if (res.code != -1) {
                             //更新打印次数
                             return postapi('/api/app/patientregister/updatepatientregisterguideprinttimesmany', [this.patientRegister.patientRegisterId])
                         }
diff --git a/src/components/report/PatientRegisterListNobtn.vue b/src/components/report/PatientRegisterListNobtn.vue
index 669df44..faed907 100644
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@@ -243,6 +243,10 @@ export default {
         this.$message.info("请勾选要打印指引单的人员记录！");
         return;
       }
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
 
       if (isPreview) {
         //
@@ -271,7 +275,7 @@ export default {
               }
             })
             .then(res => {
-              if (res.toLowerCase() == 'success') {
+              if (res.code != -1) {
                 //更新打印次数
                 return postapi('api/app/patientregister/updatepatientregisterguideprinttimesmany', [item.id])
               }
@@ -843,6 +847,10 @@ export default {
         ],
       };
 
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
 
       if (isPreview) {
         //http://140.143.162.39:9529/api/app/printreport/getlisrequestreport?PatientRegisterId=3a0d2e90-da68-3746-6775-bf17e5f9b295
@@ -870,7 +878,7 @@ export default {
             }
           })
           .then(res => {
-            if (res.toLowerCase() == 'success') {
+            if (res.code != -1) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
@@ -901,6 +909,10 @@ export default {
         ],
       };
 
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
 
       if (isPreview) {
         //http://140.143.162.39:9529/api/app/printreport/getpacsnoreport?PatientRegisterId=3a0c990e-5756-2dc0-19d5-69a617fe4048
@@ -928,7 +940,7 @@ export default {
             }
           })
           .then(res => {
-            if (res.toLowerCase() == 'success') {
+            if (res.code != -1) {
               //更新打印状态  /api/app/lisrequest/updatelisrequestisprint
               // {
               //   "operateType": 0,  操作类型（1.按PatientRegisterId 2.按LisRequestId）
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 5914b77..d915b6b 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -269,7 +269,10 @@ export default {
                 alert(ret)
                 return
             }
-
+            if(!this.$peisAPI) {
+                this.$message.info("此功能，需要在壳客户端才可运行！")
+                return       
+            }
             ///3a0c990e-5756-2dc0-19d5-69a617fe4048
             let ReportCode = '0005';
             let token = localStorage.getItem('token');
@@ -279,7 +282,7 @@ export default {
                 preViewCanPrint: this.sumDoctorCheck.sumPREdit.isAudit,
                 Parameters: [
                     { Name: 'printer', Value: user },
-                    { Name: 'LTS', Value: 'Y' }, //Y、N 
+                    { Name: 'LTS', Value: 'Y' }, //Y、N   N只看不能打印
                     { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
                     { Name: "peisReportFirstPage", Value: "pic/peisReportFirstPage.jpg" },
                     { Name: "peisReportPageHeader", Value: "pic/peisReportPageHeader.jpg" },
diff --git a/src/store/index.js b/src/store/index.js
index f89dd73..0bb9437 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -129,6 +129,9 @@ export default new Vuex.Store({
         customerOrgFlag: true,    //单位作为查询条件
         customerOrgRegister: {}, //单位体检次数
         checkAsbs: null,
+        patientName:'',  //姓名
+        sex:'', //性别
+        idCardNo:'', //身份证号
       }, //查询条件
       customerOrgGroup: [], //分组（针对单位）
       patientRegisterAbs: [], //人员已选组合项目
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 7202ca1..4291130 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -209,14 +209,15 @@ function parsIcCardtoLocal(idNos, dictSex, dictNation) {
   //   "IDCode": "430121198601223693",
   //   "Photo": ""
   // }
-  console.log(local, dictSex, dictNation)
+
+  //console.log(local, dictSex, dictNation)
   let lfind = -1;
   lfind = arrayExistObj(dictSex, 'displayName', local.Sex)
-  console.log(lfind,local.Sex)
+  // console.log(lfind,local.Sex)
   if (lfind > -1) local.sexId = dictSex[lfind].id;
 
   lfind = arrayExistObj(dictNation, 'displayName', local.Nation + '族')
-  console.log(lfind,local.Nation)
+  // console.log(lfind,local.Nation)
   if (lfind > -1) local.nationId = dictNation[lfind].nationId;
 
   local.birthDate = new Date(local.Birthday)
diff --git a/src/views/charge/charge.vue b/src/views/charge/charge.vue
index 7a3c9c2..29cb703 100644
--- a/src/views/charge/charge.vue
+++ b/src/views/charge/charge.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-card>
-      <div class="publiccss">体检收费</div>
-      <div style="display: flex; width: 100%;margin-top:20px">
+      <div slot="header">体检收费</div>
+      <div style="display: flex; width: 100%;">
         <!-- 查询条件 与列表  -->
         <div class="queryDivClass">
           <!-- 查询条件 -->
@@ -34,7 +34,7 @@
           <!-- 列表 -->
           <div class="prListDivClass">
             <el-table :data="patientList" border highlight-current-row
-              :height="(window.pageHeight > 600 ? (window.pageHeight - 270) : 310)" @row-click="rowClick" size="small">
+              :height="(window.pageHeight > 600 ? (window.pageHeight - 230) : 370)" @row-click="rowClick" size="small">
               <!--  
                 <el-table-column prop="patientRegisterId" label="体检记录ID" />
               -->
@@ -900,6 +900,10 @@ export default {
         this.$message.info("人员信息尚未保存，不可执行此操作！");
         return;
       }
+      if(!this.$peisAPI) {
+        this.$message.info("此功能，需要在壳客户端才可运行！")
+        return       
+      }
 
       let token = localStorage.getItem('token');
       let user = localStorage.getItem('user');
@@ -1074,54 +1078,19 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-form-item {
-  margin-bottom: 1px;
-}
-
-::v-deep .el-table--small .el-table__cell {
-  padding: 0px 0;
-}
-
-
-/* 输入框相关设置*/
-::v-deep .el-input__inner {
-  padding-left: 2px;
-  padding-right: 15px;
-}
-::v-deep .el-input__icon{
-  width: 15px; /* 输入框下拉箭头或清除图标 默认 25 */
-}
-
-::v-deep .el-icon-date:before {
-  content: ""; /* 去掉日期控件前面的图标 */
-}
+@import '../../assets/css/global_button.css';
+@import '../../assets/css/global_card.css';
+@import '../../assets/css/global_dialog.css';
+@import '../../assets/css/global_form.css';
+@import '../../assets/css/global_input.css';
+@import '../../assets/css/global_table.css';
+@import '../../assets/css/global.css';
 
-::v-deep input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  -webkit-appearance: none !important;
-  margin: 0 !important;
-}
-
-::v-deep .el-table th.el-table__cell {
-  text-align: center;
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-::v-deep .el-table td.el-table__cell {
-  padding-left: 1px;
-  padding-right: 1px;
-}
-
-::v-deep .el-table .cell {
-  padding-left: 1px;
-  padding-right: 1px;
-}
 
 .queryDivClass {
   display: block;
-  width: v-bind("(window.pageWidth > 600 ? (window.pageWidth - 120 - 80) / 2 : 200) + 'px'");
-  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 190) : 410) + 'px'");
+  width: v-bind("(window.pageWidth > 600 ? (window.pageWidth - 110 - 50) / 2 : 200) + 'px'");
+  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 150) : 450) + 'px'");
 }
 
 .query {
@@ -1129,13 +1098,13 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 .prListDivClass {
-  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 290) : 310) + 'px'");
+  height: v-bind("(window.pageHeight > 600 ? (window.pageHeight - 250) : 350) + 'px'");
 }
 
 .btnDivClass {
   display: block;
-  width: 110px;
-  margin-left: 5px;
+  width: 100px;
+  margin-left: 10px;
   margin-top: 180px;
 }
 
@@ -1144,6 +1113,6 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 .btnClass {
-  width: 110px;
+  width: 100px;
 }
 </style>
diff --git a/src/views/customerOrg/patientRegisterRefuse.vue b/src/views/customerOrg/patientRegisterRefuse.vue
index 8471993..3b316a7 100644
--- a/src/views/customerOrg/patientRegisterRefuse.vue
+++ b/src/views/customerOrg/patientRegisterRefuse.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-card>      
-     <div class="publiccss">弃检登记</div>
-      <div style=" width: 100%;margin-top:20px">
+     <div slot="header">弃检登记</div>
+      <div style=" width: 100%;">
         <!-- 查询条件  -->
         <PatientRegisterQuery orgEnable="Y"/>
 
@@ -182,5 +182,6 @@ export default {
 };
 </script>
 <style scoped>
+@import '../../assets/css/global_card.css';
 
 </style>