this.$con

src/components/patientRegister/PatientRegisterEdit.vue

@@ -209,9 +209,9 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="介绍人" prop="salesman">
-                  <el-select v-model="form.salesman" placeholder="请选择" filterable clearable allow-create
-                    size="small">
-                    <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" :value="item.surname"/>
+                  <el-select v-model="form.salesman" placeholder="请选择" filterable clearable allow-create size="small">
+                    <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname"
+                      :value="item.surname" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -1694,6 +1694,31 @@ export default {
       })
     },
 
+    // 新增/编辑读身份证的区分处理
+    readCardAfter(idNos) {
+      return new Promise((resolve, reject) => {
+        if (this.form.id) {
+          resolve()
+        } else {
+          if ((this.form.patientName && this.form.patientName != idNos.Name) || (this.form.idNo && this.form.idNo != idNos.IDCode)) {
+            this.$confirm("当前人员姓名和身份证号与读取身份证信息不一致, 是否以读取到身份证的信息更新当前人员?", "提示", {
+              confirmButtonText: "是",
+              cancelButtonText: "  否  ",
+              type: "warning",
+            })
+              .then(() => {
+                resolve()
+              })
+              .catch(err => {
+                reject(err)
+              })
+          } else {
+            resolve()
+          }
+        }
+      })
+    },
+
     //读取身份证信息
     peopleIcCard() {
       if (!this.$peisAPI) {
@@ -1705,6 +1730,10 @@ export default {
         let lres = JSON.parse(res)
         if (lres.code >= -1) {
           let idNos = parsIcCardtoLocal(lres.data, this.dict.sex, this.dict.nation)
+
+          // 如果是编辑状态，则加身份证与之前登记的人员信息相等提示 
+          this.readCardAfter(idNos)
+          .then(() => {
             this.form.patientName = idNos.Name
             this.form.birthDate = idNos.birthDate
             this.form.sexId = idNos.sexId
@@ -1716,6 +1745,8 @@ export default {
             // this.patientRegister.photo = 'data:image/bmp;base64,' + idNos.Photo
             // isNameContinue 身份证号查重后是否姓名查重
             this.changeIdNo('N') //  触发身份证查询档案号（Y:身份证没查到，再按名字查，N：仅按身份证号查）
+          })
+
         } else {
           this.$message.error({ showClose: true, message: `${lres.message}` })
         }

src/components/patientRegister/PatientRegisterEditQuery.vue

@@ -46,7 +46,7 @@
 
 import { mapState, mapActions } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { getPagePriv,checkPagePriv, objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, arrayReduce,parsIcCardtoLocal, photoParse, savePeoplePhoto, arrayExistObj } from "../../utlis/proFunc";
+import { getPagePriv,checkPagePriv, objCopy, setNull, dddw,checkIDCode, parseID, birthdayToAge,ageToBirthday, deepCopy, arrayFilter, arrayReduce,parsIcCardtoLocal, photoParse,  arrayExistObj } from "../../utlis/proFunc";
 import PatientRegisterForChoose from "./PatientRegisterForChoose.vue";
 export default {
   components: {

src/components/patientRegister/PatientRegisterList.vue

@@ -1923,7 +1923,7 @@ export default {
             }
 
             //  2、扫身份证查询时，无照片自动更新照片(参数控制)
-            if (upPhotoParam != "N" && photo) {
+            if (upPhotoParam == "Y" && photo) {
               if (!e.photo) {
                 savePeoplePhoto(e.id, photo);
               }

src/components/patientRegister/PatientRegisterRecoverList.vue

@@ -544,7 +544,7 @@ export default {
               }
 
               //  2、扫身份证查询时，无照片自动更新照片(参数控制)
-              if (upPhotoParam != "N" && photo) {
+              if (upPhotoParam == "Y" && photo) {
                 if (!e.photo) {
                   savePeoplePhoto(e.id, photo);
                 }

src/components/patientRegister/patientRegisterQuery.vue

@@ -289,6 +289,8 @@ export default {
         this.$message.info({ showClose: true, message: "此功能，需要在壳客户端才可运行！" })
         return
       }
+      this.btnClear()
+      
       this.$peisAPI.peopleIcCard().then(res => {
         console.log('peopleIcCard', res)
         let lres = JSON.parse(res)

src/components/patientRegister/patientRegisterRecoverListQuery.vue

@@ -691,7 +691,7 @@ export default {
               }
 
               //  2、扫身份证查询时，无照片自动更新照片(参数控制)
-              if (upPhotoParam != "N" && photo) {
+              if (upPhotoParam == "Y" && photo) {
                 if (!e.photo) {
                   savePeoplePhoto(e.id, photo);
                 }

src/utlis/proApi.js

@@ -41,16 +41,17 @@ async function savePeoplePhoto(peopleId, photoBase64) {
     photo: photoBase64.split(",")[1],
   };
 
-  
-
   try {
-    lres = await postapi(`/api/app/patient-register/up-load-img`, uploadPhoto)
+    postapi(`/api/app/patient-register/up-load-img`, uploadPhoto)
+      .then(res => {
+        if (res.code > -1) {
           let body = {
             patientRegisterId: peopleId,
-      photo: lres.data,
+            photo: res.data,
           }
-    await postapi(`/api/app/patient-register/update-photo`, body)
-
+          postapi(`/api/app/patient-register/update-photo`, body)
+        }
+      })
   } catch (error) {
     lres = { code: -1, msg: error }
   }