//乌兰察布第四医院：121526004609160793|乌兰察布第四医院实验室：221526004609160793

src/api/inspect/inspectpatient/index.ts

@@ -36,6 +36,7 @@ export interface PatientVO {
   chiefinspector: string // 总检医生
   examhoscode: string // 体检机构编码
   examhosname: string // 体检机构名称
+  hospitalNo: string // 医院编号
 }
 
 // 患者信息 API
@@ -175,10 +176,10 @@ export const PatientApi = {
       url: `/inspect/patient/updateBarcodeTime?medicalSn=${medicalSn}&barcodetime=${barcodetime.toISOString()}`
     })
   },
-  //根据体检编号更新患者归属机构
-  updatePatientOrg: async (medicalSn: string,examhoscode: string,examhosname: string) => {
+  //根据体检编号更新患者归属机构&医院编号
+  updatePatientOrg: async (medicalSn: string,examhoscode: string,examhosname: string,hospitalNo: string) => {
     return await request.put({
-      url: `/inspect/patient/updatePatientOrg?medicalSn=${medicalSn}&examhoscode=${examhoscode}&examhosname=${examhosname}`
+      url: `/inspect/patient/updatePatientOrg?medicalSn=${medicalSn}&examhoscode=${examhoscode}&examhosname=${examhosname}&hospitalNo=${hospitalNo}`
     })
   },
   //获取详情数据

src/views/Inspection-checklist/Inspection-checklist.vue

@@ -67,7 +67,12 @@ v-loading.fullscreen.lock="fullscreenLoading"
           <el-option label="未打印" value="0" />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="当前机构" prop="hospitalNo">
+        <el-select v-model="queryParams.hospitalNo" placeholder="请选择当前机构" clearable class="!w-200px">
+          <el-option label="乌兰察布第四医院" value="121526004609160793" />
+          <el-option label="乌兰察布第四医院实验室" value="221526004609160793" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleQuery">
           <Icon icon="ep:search" class="mr-5px" /> 查询
@@ -226,7 +231,8 @@ const queryParams = reactive({
   phoneNum: undefined as string | undefined,
   domicileaddress: undefined as string | undefined,
   isprint: undefined as string | undefined,
-  printTimeRange: undefined as [string, string] | undefined
+  printTimeRange: undefined as [string, string] | undefined,
+  hospitalNo: undefined as string | undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const fileInputRef = ref<HTMLInputElement | null>(null) // 文件输入引用
@@ -319,7 +325,9 @@ const handlePrint = async (row: PatientVO) => {
     }
     const userInfo = await getUserProfile()
     const deptInfo = await InspectOrgApi.getInspectOrg(userInfo.deptId)
-    await PatientApi.updatePatientOrg(row.medicalSn,deptInfo.orgid,deptInfo.orgName)
+    if (queryParams.hospitalNo) {
+    console.log(queryParams.hospitalNo)
+    await PatientApi.updatePatientOrg(row.medicalSn,deptInfo.orgid,deptInfo.orgName,queryParams.hospitalNo)
     await PatientApi.bindPatientProject(row.medicalSn)
     await PatientApi.syncinspectApplyTj(row.medicalSn)
     await createPrint(row.medicalSn)
@@ -331,6 +339,15 @@ const handlePrint = async (row: PatientVO) => {
     message.success('打印成功')
     // 更新患者补充信息
     PatientApi.updatePatientSupplement(row.medicalSn,row.cardId)
+  }
+  else{
+    ElMessageBox.alert('请选择当前机构', '提示', {
+      confirmButtonText: '确定',
+      type: 'warning',
+      dangerouslyUseHTMLString: true
+    })
+    return
+  }
   } catch (error: any) {
     console.error('打印失败:', error)
     message.error(`打印失败: ${error.message || '未知错误'}`)

src/views/inspect/inspectorg/InspectOrgForm.vue

@@ -87,9 +87,9 @@ const formRules = reactive({
   highLevelOrgID: [{ required: true, message: '请选择上级机构', trigger: 'change' }],
   orgType: [{ required: true, message: '请选择医院机构类型', trigger: 'change' }],
   orgName: [{ required: true, message: '请输入机构名称', trigger: 'change' }],
-  contactPerson: [{ required: true, message: '请输入联系人姓名', trigger: 'change' }],
+  contactPerson: [{ required: false, message: '请输入联系人姓名', trigger: 'change' }],
   contactTel: [
-    { required: true, message: '请填入正确的手机号', trigger: 'blur' },
+    { required: false, message: '请填入正确的手机号', trigger: 'blur' },
     {
       validator: (rule, value, callback) => {
         if (value && !validator.isMobilePhone(value, 'zh-CN')) {