From 0285ef2cfa0b7e8b3f760b3ece4276e6f076e91d Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Thu, 28 Sep 2023 15:05:35 +0800
Subject: [PATCH] query seo

---
 .../doctorCheck/PatientRegisterBase.vue       |  20 +-
 .../doctorCheck/PatientRegisterList.vue       | 105 ++++----
 .../patientRegister/PatientRegisterEdit.vue   | 235 +++++++++++++++++-
 .../patientRegister/PatientRegisterList.vue   |   3 +-
 .../PatientRegisterRecoverList.vue            |  10 +-
 .../PatientRegisterRefuseList.vue             |  28 +--
 .../PatientRegisterSignList.vue               |  10 +-
 .../patientRegister/patientRegisterQuery.vue  |   7 +-
 src/utlis/proFunc.js                          |   1 +
 9 files changed, 330 insertions(+), 89 deletions(-)

diff --git a/src/components/doctorCheck/PatientRegisterBase.vue b/src/components/doctorCheck/PatientRegisterBase.vue
index ecec33d..ffe8b2e 100644
--- a/src/components/doctorCheck/PatientRegisterBase.vue
+++ b/src/components/doctorCheck/PatientRegisterBase.vue
@@ -129,9 +129,13 @@ export default {
     ...mapMutations(['doctorCheckPrBaseInit','sumPREditInit']),
     //按条码号查个人数据
     onQueryByPatientRegisterNo() {
-      let val = this.doctorCheck.prBase.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}`)
+      let patientRegisterNo = this.doctorCheck.prBase.patientRegisterNo
+      let body = {
+        sType:1,
+        patientRegisterNo
+      }      
+      console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient',body)
       .then((res) => {
         if (res.code != -1) {  
           
@@ -147,9 +151,13 @@ export default {
 
     //按条码号查个人数据
     onQueryByPatientNo() {
-      let val = this.doctorCheck.prBase.patientNo
-      console.log(`/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`)
-      getapi(`/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`)
+      let patientNo = this.doctorCheck.prBase.patientNo
+      let body = {
+        sType:2,
+        patientNo
+      }      
+      console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient',body)      
       .then((res) => {
         if (res.code != -1) {
           console.log('按条码号查个人数据',res.data)
diff --git a/src/components/doctorCheck/PatientRegisterList.vue b/src/components/doctorCheck/PatientRegisterList.vue
index d2243d0..1d680e3 100644
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@@ -40,31 +40,19 @@
     <!-- 人员列表 -->    
     <el-table :data="dataList" border width="100%" height="430" row-key="id" size="small"
       :height="window.pageHeight - 80 - 120"
-      class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">
-      <el-table-column type="selection" width="40">
-
-      </el-table-column>
-      <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="锁住">
-        <template slot-scope="scope">
-          <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="customerOrgParentName" label="单位" width="180">
+      class="el-table__body-wrapper tbody" highlight-current-row @row-click="rowick" ref="dataList">     
+      
+      <el-table-column prop="customerOrgParentName" label="单位" width="150">
         <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">
+      <el-table-column prop="customerOrgName" label="部门" width="100">
         <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="patientName" label="姓名" width="80"/>
       <el-table-column prop="sexId" label="性别">
         <template slot-scope="scope">
           <div>{{ ldddw(dict.sex, "id", scope.row.sexId, "displayName") }}</div>
@@ -145,6 +133,16 @@
           <div>{{ scope.row.isUpload == "Y" ? "是" : "否" }}</div>
         </template>
       </el-table-column>
+      <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="锁住">
+        <template slot-scope="scope">
+          <div>{{ scope.row.isLock == "Y" ? "是" : "否" }}</div>
+        </template>
+      </el-table-column>
     </el-table>    
 
     <!--通用选单位、体检次数、分组的控件-->
@@ -161,14 +159,11 @@ import { mapState, mapMutations } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { dddw, objCopy, arrayReduce } from "@/utlis/proFunc";
 
-import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
-import Camera from "../../components/patientRegister/Camera.vue";
+
 import CusOrgOCX from "../../components/report/CusOrgOCX.vue"
 
 export default {
   components: {
-    PatientRegisterEdit,
-    Camera,
     CusOrgOCX,
   },
   props: ['win'],
@@ -213,38 +208,48 @@ export default {
 
     //查询
     query() {
-      let body = {}
-
-      console.log(`this.patientRegister.query`, this.patientRegister.query)
-
-      if (this.patientRegister.query.customerOrgFlag) {
-        if (this.patientRegister.query.customerOrgId) body.customerOrgId = this.patientRegister.query.customerOrgId[0]
+      let body = {},customerOrgs=[]
+
+      if (this.report.dataCusOrgOCX.length > 0) {
+          this.report.dataCusOrgOCX.forEach(e => {
+              let rd = {
+                  startDate: moment(e.startDate).format('yyyy-MM-DD'),
+                  endDate: moment(e.endDate).format('yyyy-MM-DD'),
+                  dateType: e.dateType == 'summaryDate' ? '3':(e.dateType == 'medicalStartDate' ? '2':'1')
+              }
+
+              if (e.customerOrgId) {
+                  rd.customerOrgId = e.customerOrgId
+                  if(e.customerOrgId == this.dict.personOrgId){
+                      rd.customerOrgRegisterId = null
+                      rd.customerOrgGroupId = []
+                  }else{
+                      rd.customerOrgRegisterId = e.customerOrgRegister.id
+                      rd.customerOrgGroupId = e.customerOrgGroupIds
+                  }                        
+              }
+              customerOrgs.push(rd)
+          })
       }
 
-      if (this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
-
-      if (this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
-
-      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.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
-
-      if (this.patientRegister.query.patientNo) body = { patientNo: this.patientRegister.query.patientNo }
-
-      if (this.patientRegister.query.patientRegisterNo) body = { patientRegisterNo: this.patientRegister.query.patientRegisterNo }
-
-
-      console.log('/api/app/patientregister/getlistinfilter', body)
-      postapi('/api/app/patientregister/getlistinfilter', body)
+      body.customerOrgs = customerOrgs
+      if(this.patientRegister.query.patientName) body.patientName = this.patientRegister.query.patientName
+      if(this.patientRegister.query.sex) body.sexId = this.patientRegister.query.sex
+      if(this.patientRegister.query.isAudit) body.isAudit = this.patientRegister.query.isAudit
+      if(this.patientRegister.query.completeFlag) body.completeFlag = this.patientRegister.query.completeFlag
+      body.maxResultCount = 500 
+      // "patientName": "string",
+      // "sexId": "string",
+      // "isAudit": "string",
+      // "completeFlag": "string",
+      // "maxResultCount": 0
+
+      console.log('/api/patientregister/getpeisrecordlist', body)
+      postapi('/api/patientregister/getpeisrecordlist', body)
         .then((res) => {
-          this.dataList = res.data;
+          if(res.code != -1){
+            this.dataList = res.data.items;
+          }          
         });
     },
 
diff --git a/src/components/patientRegister/PatientRegisterEdit.vue b/src/components/patientRegister/PatientRegisterEdit.vue
index 43385c4..5c355b8 100644
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@@ -449,6 +449,153 @@
         <el-button type="primary" @click="choosePatient" style="width:90px;">确定</el-button>
       </span>
     </el-dialog>
+
+    <!-- 体检人员记录列表 -->
+    <el-dialog title="体检人员列表" :visible.sync="registerVisible" width="800" :show-close="false" :close-on-click-modal="false"
+      :append-to-body="true">
+      <el-table :data="patientRegisters" border width="800" height="480" highlight-current-row
+        @row-click="registerRowClick" size="small"> 
+        <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="guidePrintTimes" label="打印" width="50">
+          <template slot-scope="scope">
+            <i class="el-icon-printer" v-if="scope.row.guidePrintTimes > 0" style="font-size: 24px;color: green;"></i>
+          </template>
+        </el-table-column>
+        <el-table-column prop="isLock" label="锁住">
+          <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, "nationId", 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="180" />
+        <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>
+
+        <!--
+        "sexHormoneTermId": "00000000-0000-0000-0000-000000000000",
+        "interposeMeasure": null,
+        "medicalConclusionId": "00000000-0000-0000-0000-000000000000",
+        "reportPrintTimes": 0,        
+        "isMedicalStart": "N",
+        "medicalStartDate": "6/28/2023",
+        "isRecoverGuide": "N",
+        "summaryDate": "",
+        "summaryDoctor": null,
+        "isAudit": "N",
+        "auditDoctor": null,
+        "auditDate": "",        
+        "isNameHide": "N",
+        "isPhoneFollow": "N",
+        "thirdInfo": null,
+        "guidePrintTimes": null,
+        "remark": null,
+        "organizationUnitId": "00000000-0000-0000-0000-000000000000",
+        "customerOrgRegisterId": "00000000-0000-0000-0000-000000000000",
+        "lastModifierName": "",
+        "lastModificationTime": null,
+        "lastModifierId": null,
+        "creatorId": null,
+        "id": "3a0c196d-a6d0-37fe-5c32-4806bdc4530f"
+        -->
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="registerVisible = false" style="width:90px;">取消</el-button>
+        <el-button type="primary" @click="chooseRegister" style="width:90px;">确定</el-button>
+      </span>
+    </el-dialog>
+
+
     <!-- 拍照（openCamera） 网页模式，已废弃  
     <el-dialog title="拍照" :visible.sync="patientRegister.cameraVisble" width="400" height="600"
       :close-on-click-modal="false" :append-to-body="true">
@@ -579,6 +726,10 @@ export default {
       patientList: [], //人员列表（用于判断人员多次体检）
       patientChoosed: {}, //查重选中的人员
 
+      registerVisible:false,
+      patientRegisters:[],
+      registerChoosed:{},
+
       dialogCamera: false, //拍照组件
     };
   },
@@ -606,35 +757,79 @@ export default {
 
     //快速查找个人数据
     quickQuery(type) {
-      let url = '/api/app/patient-register/patient-register-or-patient?SType='
+      let url1 = '/api/app/patientregister/getpatientregisterorpatient'
+      let body={}
+      let url2 = '/api/app/patientregister/getlistinfilter'
+      
       switch (type) {
         case 'patientNo':
-          url += `2&PatientNo=${this.query.patientNo}`
+          if(!this.query.patientNo) return;  
+          body = {
+            sType:2,
+            patientNo:this.query.patientNo
+          }
+          this.getpatientregisterorpatient(url1,body)
           break;
-        case 'patientRegisterNo':
-          url += `1&PatientRegisterNo=${this.query.patientRegisterNo}`
+        case 'patientRegisterNo':  
+          if(!this.query.patientRegisterNo) return;       
+          body = {
+            sType:1,
+            patientRegisterNo:this.query.patientRegisterNo
+          }
+          this.getpatientregisterorpatient(url1,body)
           break;
         case 'tel':
-          url += `3&Phone=${this.query.tel}`
+          if(!this.query.tel) return;
+          body = {
+            phone:this.query.tel
+          }
+          this.getlistinfilter(url2,body);
           break;
         case 'patientName':
-          url += `4&PatientName=${this.query.patientName}`
+          if(!this.query.patientName) return;
+          body = {
+            patientName:this.query.patientName
+          }
+          this.getlistinfilter(url2,body);
           break;
         default:
           return;
       }
 
-      console.log(url)
-      getapi(url)
+    },
+
+    //按流水号或档案号查客户信息
+    getpatientregisterorpatient(url,body){
+      postapi(url,body)
         .then((res) => {
-          console.log('按条码号查个人数据', res)
+          console.log('getpatientregisterorpatient', res)
           if (res.code == 1) {            
             objCopy(res.data, this.form)
+            this.patientRegister.patientRegisterId = res.data.id
             this.patientRegister.photo = res.data.photo
           }else if(res.code == 0){
             this.$message.info("未找到相关信息")
-          }            
-          
+          } 
+        });
+    },
+
+    //按手机号或姓名查找客户信息
+    getlistinfilter(url,body){
+      postapi(url, body)
+        .then((res) => {
+          if (res.code != -1) {
+            if(res.data.items.length == 0){
+              this.$message.info("未找到相关信息")
+            }else if(res.data.items.length == 1){
+              objCopy(res.data.items[0], this.form)
+              this.patientRegister.patientRegisterId = res.data.items[0].id
+              this.patientRegister.photo = res.data.items[0].photo
+            }else{
+              //显示列表，供选择
+              this.patientRegisters = res.data.items
+              this.registerVisible = true
+            }            
+          }          
         });
     },
 
@@ -784,6 +979,24 @@ export default {
 
     },
 
+    registerRowClick(row){
+      this.registerChoosed = row;
+    },
+
+    chooseRegister(){
+      if (!this.registerChoosed) {
+        alert("请选中人员档案信息");
+        return;
+      }
+       
+      objCopy(this.registerChoosed, this.form)
+      this.patientRegister.patientRegisterId = this.registerChoosed.id
+      this.patientRegister.photo = this.registerChoosed.photo
+      this.registerVisible = false
+    },
+    
+
+
     ldddw(arrayData, key, value, display) {
       return dddw(arrayData, key, value, display);
     },
diff --git a/src/components/patientRegister/PatientRegisterList.vue b/src/components/patientRegister/PatientRegisterList.vue
index 582d098..ece199a 100644
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@@ -479,7 +479,7 @@ export default {
       }
       //console.log('customerOrgId',customerOrgId)
       this.patientRegister.patientRegisterId = "";
-      // this.patientRegister.patientRegisterRd.photo = '';
+      this.patientRegister.photo = '/pic/Photo.jpg';
       // this.patientRegister.patientRegisterRdInit.id = "";
       // this.patientRegister.patientRegisterRdInit.customerOrgId = this.patientRegister.query.customerOrgId;
       // this.patientRegister.addTimes++;
@@ -616,6 +616,7 @@ export default {
         }
       }
 
+      if (this.patientRegister.query.phone) body.phone = this.patientRegister.query.phone
 
       if (this.patientRegister.query.idCardNo) body = { idNo: this.patientRegister.query.idCardNo }
 
diff --git a/src/components/patientRegister/PatientRegisterRecoverList.vue b/src/components/patientRegister/PatientRegisterRecoverList.vue
index 96b5150..c09bf27 100644
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@@ -210,9 +210,13 @@ export default {
 
     //按条码号查个人数据
     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}`)
+      let patientRegisterNo = this.form.patientRegisterNo
+      let body = {
+        sType:1,
+        patientRegisterNo
+      }      
+      console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient',body)   
       .then((res) => {
         if (res.code != -1) {
           if(res.data){
diff --git a/src/components/patientRegister/PatientRegisterRefuseList.vue b/src/components/patientRegister/PatientRegisterRefuseList.vue
index 59849b9..021053a 100644
--- a/src/components/patientRegister/PatientRegisterRefuseList.vue
+++ b/src/components/patientRegister/PatientRegisterRefuseList.vue
@@ -319,13 +319,13 @@ export default {
 
     //按条码号查个人数据
     onQueryByPatientRegisterNo() {
-      let val = this.quick.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) => {
+      let patientRegisterNo = this.quick.patientRegisterNo;
+      let body = {
+        sType:1,
+        patientRegisterNo
+      }      
+      console.log('/api/app/patientregister/getpatientregisterorpatient',body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient',body).then((res) => {
         if (res.code != -1) {
           if (res.data) {
             objCopy(res.data, this.quick);
@@ -340,13 +340,13 @@ export default {
 
     //按条码号查个人数据
     onQueryByPatientNo() {
-      let val = this.quick.patientNo;
-      console.log(
-        `/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`
-      );
-      getapi(
-        `/api/app/patient-register/patient-register-or-patient?SType=2&PatientNo=${val}`
-      ).then((res) => {
+      let patientNo = this.quick.patientNo;
+      let body = {
+        sType:2,
+        patientNo
+      }      
+      console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient',body).then((res) => {
         if (res.code != -1) {
           if (res.data) {
             objCopy(res.data, this.quick);
diff --git a/src/components/patientRegister/PatientRegisterSignList.vue b/src/components/patientRegister/PatientRegisterSignList.vue
index db1d3f2..844886e 100644
--- a/src/components/patientRegister/PatientRegisterSignList.vue
+++ b/src/components/patientRegister/PatientRegisterSignList.vue
@@ -215,9 +215,13 @@ export default {
 
     //按条码号查个人数据
     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}`)
+      let patientRegisterNo = this.form.patientRegisterNo
+      let body = {
+        sType:1,
+        patientRegisterNo
+      }      
+      console.log(`/api/app/patientregister/getpatientregisterorpatient`,body)
+      postapi('/api/app/patientregister/getpatientregisterorpatient',body)   
       .then((res) => {
         if (res.code != -1) {
           if(res.data){
diff --git a/src/components/patientRegister/patientRegisterQuery.vue b/src/components/patientRegister/patientRegisterQuery.vue
index 3afe9d7..694bb09 100644
--- a/src/components/patientRegister/patientRegisterQuery.vue
+++ b/src/components/patientRegister/patientRegisterQuery.vue
@@ -31,10 +31,15 @@
           </el-option>
         </el-select>
       </div>
+      <div class="query">
+        <span>手机号：</span>
+        <el-input placeholder="手机号/电话" v-model="patientRegister.query.phone" size="small" clearable
+          style="width: 110px" />
+      </div>
       <div class="query">
         <span>身份证号：</span>
         <el-input placeholder="身份证号" v-model="patientRegister.query.idCardNo" size="small" clearable
-          style="width: 180px" />
+          style="width: 160px" />
       </div>
       <div class="query">
         <el-cascader v-model="patientRegister.query.customerOrgId" :options="patientRegister.customerOrgTreeAll" 
diff --git a/src/utlis/proFunc.js b/src/utlis/proFunc.js
index 4486207..d41563e 100644
--- a/src/utlis/proFunc.js
+++ b/src/utlis/proFunc.js
@@ -228,6 +228,7 @@ exports.parsIcCardtoLocal = parsIcCardtoLocal;
 function photoParse(photo) {
   //console.log(sysConfig,photo)
   let lphoto = ''  //data:image、UpLoad/、/pic/Photo.jpg
+  if(!photo) return '/pic/Photo.jpg'
   if (photo.indexOf("UpLoad/") > - 1) {
     lphoto = sysConfig.apiurl + '/' + photo + '?' + new Date().getTime()
   } else {