fix:完成任务状态，任务同步，高度同步等工作

wlzboy

2025-10-25 a5b842f1f6ab32f1af39f4bcb7e45217e94db761

 app/pages/task/create-emergency.vue

@@ -9,22 +9,50 @@
    
    <view class="form-section">
      <view class="form-item">
        <view class="form-label">任务车辆</view>
        <picker mode="selector" :range="vehicles" @change="onVehicleChange">
        <view class="form-label required">任务车辆</view>
        <picker mode="selector" :range="vehicles" :value="selectedVehicleIndex" @change="onVehicleChange">
          <view class="form-input picker-input">
            {{ selectedVehicle || '请选择任务车辆' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
          </view>
        </picker>
      </view>
        <view class="form-item">
        <view class="form-label">归属机构</view>
        <picker mode="selector" :range="organizations" @change="onOrganizationChange">
          <view class="form-input picker-input">
            {{ selectedOrganization || '请选择归属机构' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
          </view>
        </picker>
      </view>
      
      <view class="form-item">
        <view class="form-label required">任务类型</view>
        <picker mode="selector" :range="emergencyTaskTypeOptions" range-key="text" @change="onEmergencyTaskTypeChange">
          <view class="form-input picker-input">
            {{ selectedEmergencyTaskType || '请选择任务类型' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
          </view>
        </picker>
      </view>
      
      <view class="form-item">
        <view class="form-label required">单据类型</view>
        <picker mode="selector" :range="documentTypeOptions" range-key="text" @change="onDocumentTypeChange">
          <view class="form-input picker-input">
            {{ selectedDocumentType || '请选择单据类型' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
          </view>
        </picker>
      </view>
      <view class="form-item">
        <view class="form-label">执行任务人员</view>
        <view class="staff-list">
          <view class="staff-item" v-for="(staff, index) in selectedStaff" :key="staff.userId">
            <view class="staff-info">
              <text class="staff-name">{{ staff.nickName }}</text>
              <text class="staff-role">({{ staff.postName || staff.roleName || '未知职位' }})</text>
              <text class="staff-role">({{ getUserTypeName(staff.type) || '未知职位' }})</text>
            </view>
            <uni-icons 
              v-if="index > 0" 
@@ -47,25 +75,7 @@
        </view>
      </view>
      
      <view class="form-item">
        <view class="form-label">归属机构</view>
        <picker mode="selector" :range="organizations" @change="onOrganizationChange">
          <view class="form-input picker-input">
            {{ selectedOrganization || '请选择归属机构' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
          </view>
        </picker>
      </view>
      
      <view class="form-item">
        <view class="form-label">任务类型</view>
        <picker mode="selector" :range="emergencyTaskTypes" @change="onEmergencyTaskTypeChange">
          <view class="form-input picker-input">
            {{ selectedEmergencyTaskType || '请选择任务类型' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
          </view>
        </picker>
      </view>
    
      
      <view class="form-item">
        <view class="form-label">转运时间</view>
@@ -79,7 +89,7 @@
      
      <view class="form-section-title">患者信息</view>
      <view class="form-item">
        <view class="form-label">联系人</view>
        <view class="form-label required">联系人</view>
        <input 
          class="form-input" 
          placeholder="请输入联系人" 
@@ -88,7 +98,7 @@
      </view>
      
      <view class="form-item">
        <view class="form-label">联系电话</view>
        <view class="form-label required">联系电话</view>
        <input 
          class="form-input" 
          type="number" 
@@ -98,7 +108,7 @@
      </view>
      
      <view class="form-item">
        <view class="form-label">患者姓名</view>
        <view class="form-label required">患者姓名</view>
        <input 
          class="form-input" 
          placeholder="请输入患者姓名" 
@@ -163,7 +173,7 @@
      
      <view class="form-section-title">转出医院信息</view>
      <view class="form-item">
        <view class="form-label">医院名称</view>
        <view class="form-label required">医院名称</view>
        <view class="hospital-search-container">
          <input 
            class="form-input" 
@@ -180,15 +190,15 @@
              @click="selectHospitalOut(hospital)"
            >
              <view class="hospital-name">{{ hospital.hospName }}</view>
              <view class="hospital-address">{{ hospital.hospAddress }}</view>
              <view class="hospital-address">{{ buildFullAddress(hospital) }}</view>
            </view>
          </view>
        </view>
      </view>
      
      <view class="form-item">
        <view class="form-label">科室</view>
        <picker mode="selector" :range="departmentOptions" range-key="dictLabel" @change="onHospitalOutDepartmentChange">
        <view class="form-label required">科室</view>
        <picker mode="selector" :range="departmentOptions" range-key="text" @change="onHospitalOutDepartmentChange">
          <view class="form-input picker-input">
            {{ taskForm.hospitalOut.department || '请选择科室' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
@@ -214,7 +224,7 @@
      
      <view class="form-section-title">转入医院信息</view>
      <view class="form-item">
        <view class="form-label">医院名称</view>
        <view class="form-label required">医院名称</view>
        <view class="hospital-search-container">
          <input 
            class="form-input" 
@@ -231,15 +241,15 @@
              @click="selectHospitalIn(hospital)"
            >
              <view class="hospital-name">{{ hospital.hospName }}</view>
              <view class="hospital-address">{{ hospital.hospAddress }}</view>
              <view class="hospital-address">{{ buildFullAddress(hospital) }}</view>
            </view>
          </view>
        </view>
      </view>
      
      <view class="form-item">
        <view class="form-label">科室</view>
        <picker mode="selector" :range="departmentOptions" range-key="dictLabel" @change="onHospitalInDepartmentChange">
        <view class="form-label required">科室</view>
        <picker mode="selector" :range="departmentOptions" range-key="text" @change="onHospitalInDepartmentChange">
          <view class="form-input picker-input">
            {{ taskForm.hospitalIn.department || '请选择科室' }}
            <uni-icons type="arrowright" size="16" color="#999"></uni-icons>
@@ -313,14 +323,14 @@
        <view class="staff-filter">
          <view 
            class="filter-item" 
            :class="{ active: staffFilterType === 'all' }"
            @click="filterStaff('all')"
          >全部</view>
          <view 
            class="filter-item" 
            :class="{ active: staffFilterType === 'driver' }"
            @click="filterStaff('driver')"
          >司机</view>
          <view 
            class="filter-item" 
            :class="{ active: staffFilterType === 'doctor' }"
            @click="filterStaff('doctor')"
          >医生</view>
          <view 
            class="filter-item" 
            :class="{ active: staffFilterType === 'nurse' }"
@@ -342,7 +352,7 @@
              </view>
              <view class="staff-detail-row">
                <text class="staff-dept">{{ staff.deptName }}</text>
                <text class="staff-post">{{ staff.postName || staff.roleName || '未知职位' }}</text>
                <text class="staff-post">{{ staff.postName || staff.roleName  || '未知职位' }}</text>
              </view>
            </view>
            <uni-icons 
@@ -437,8 +447,10 @@
import { searchHospitals } from "@/api/hospital"
import { listUser } from "@/api/system/user"
import { searchIcd10 } from "@/api/icd10"
import { getUserProfile } from "@/api/system/user"

import { getDicts } from "@/api/dict"
import { getServiceOrdAreaTypes, getServiceOrderTypes, getHospitalDepartments } from "@/api/dictionary"
import { listBranchCompany } from "@/api/system/dept"
import MapSelector from '@/components/map-selector.vue'

export default {
@@ -452,7 +464,12 @@
      selectedVehicle: '',
      selectedVehicleId: null,
      selectedOrganization: '',
      selectedEmergencyTaskType: '',
      selectedOrganizationId: null, // 归属机构ID（部门ID）
      selectedRegion: '', // 从归属机构中提取的地域信息（如：广州、深圳等）
      selectedEmergencyTaskType: '', // 选中的任务类型文本
      selectedEmergencyTaskTypeId: null, // 选中的任务类型ID
      selectedDocumentType: '', // 选中的单据类型文本
      selectedDocumentTypeId: null, // 选中的单据类型ID
      mapSelectorType: '',
      // 医院搜索相关
      hospitalOutSearchKeyword: '',
@@ -468,7 +485,7 @@
      allStaffList: [], // 所有人员列表
      filteredStaffList: [], // 过滤后的人员列表
      staffSearchKeyword: '', // 人员搜索关键词
      staffFilterType: 'all', // 人员筛选类型：all/driver/nurse
      staffFilterType: 'driver', // 人员筛选类型：driver/doctor/nurse，默认选中司机
      // 病情选择相关
      selectedDiseases: [], // 已选择的病情列表
      tempSelectedDiseases: [], // 临时选择的病情列表（用于弹窗）
@@ -486,14 +503,18 @@
          condition: ''
        },
        hospitalOut: {
          id: null,  // 医院ID
          name: '',
          department: '',
          departmentId: null,  // 科室ID
          bedNumber: '',
          address: ''
        },
        hospitalIn: {
          id: null,  // 医院ID
          name: '',
          department: '',
          departmentId: null,  // 科室ID
          bedNumber: '',
          address: ''
        },
@@ -502,8 +523,12 @@
      },
      vehicles: [],
      vehicleOptions: [],
      organizations: ['广州分公司', '深圳分公司', '珠海分公司', '佛山分公司'],
      emergencyTaskTypes: ['急救转运', '航空转运'],
      organizations: [], // 归属机构列表（从后台加载分公司数据）
      organizationOptions: [], // 归属机构选项（用于picker显示）
      emergencyTaskTypes: [], // 任务类型列表（从 SQL Server 动态加载）
      emergencyTaskTypeOptions: [], // 任务类型选项（用于picker显示）
      documentTypes: [], // 单据类型列表
      documentTypeOptions: [], // 单据类型选项（用于picker显示）
      departmentOptions: [], // 科室字典数据
      loading: false,
      addressCoordinates: {
@@ -516,15 +541,23 @@
    ...mapState({
      currentUser: state => ({
        userId: state.user.userId,
        name: state.user.name || '张三',
        nickName: state.user.nickName || state.user.name || '张三',
        name: state.user.nickName || '张三',
        nickName: state.user.nickName || '张三',
        position: '司机',
        deptId: state.user.deptId || 100,
        phonenumber: state.user.phonenumber || '',
        branchCompanyId: state.user.branchCompanyId,
        branchCompanyName: state.user.branchCompanyName
      })
    })
    }),
    // 计算车辆在picker中的索引，用于默认选中
    selectedVehicleIndex() {
      if (!this.selectedVehicle || this.vehicles.length === 0) {
        return 0
      }
      const index = this.vehicles.findIndex(v => v === this.selectedVehicle)
      return index !== -1 ? index : 0
    }
  },
  onLoad(options) {
    // 先加载车辆列表，然后加载绑定车辆信息
@@ -533,23 +566,32 @@
    })
    this.initSelectedStaff()
    this.loadDeptStaff()
    // 设置默认归属机构
    if (this.currentUser.branchCompanyName) {
      this.selectedOrganization = this.currentUser.branchCompanyName
    }
    // 加载默认医院列表（前100条）
    this.loadDefaultHospitals()
    // 加载分公司数据（会自动设置默认分公司并加载医院列表）
    this.loadBranchCompanies()
    // 加载科室字典数据
    this.loadDepartments()
    // 加载任务类型数据
    this.loadEmergencyTaskTypes()
    // 加载单据类型数据
    this.loadDocumentTypes()
  },
  methods: {
    // 获取用户绑定的车辆信息
    getUserBoundVehicleInfo() {
      getUserProfile().then(response => {
        const userInfo = response.data || response
        if (userInfo.boundVehicle) {
          const boundVehicleNo = userInfo.boundVehicle.vehicleNumber
          const boundVehicleId = userInfo.boundVehicle.vehicleId
      const userId = this.currentUser.userId
      if (!userId) {
        console.warn('用户ID不存在，无法获取绑定车辆')
        return
      }
      
      getUserBoundVehicle(userId).then(response => {
        const boundVehicle = response.data
        
        if (boundVehicle && boundVehicle.vehicleId) {
          const boundVehicleNo = boundVehicle.vehicleNo
          const boundVehicleId = boundVehicle.vehicleId
          
          console.log('用户绑定的车辆:', boundVehicleNo, 'ID:', boundVehicleId)
          
          // 在车辆列表中查找绑定的车辆
          const vehicleIndex = this.vehicleOptions.findIndex(v => 
@@ -560,7 +602,12 @@
            // 设置默认选中的车辆
            this.selectedVehicle = this.vehicleOptions[vehicleIndex].name
            this.selectedVehicleId = this.vehicleOptions[vehicleIndex].id
            console.log('默认选中车辆:', this.selectedVehicle)
          } else {
            console.warn('绑定的车辆不在可用车辆列表中')
          }
        } else {
          console.log('用户未绑定车辆')
        }
      }).catch(error => {
        console.error('获取用户绑定车辆信息失败:', error)
@@ -590,45 +637,164 @@
    },
    
    onOrganizationChange(e) {
      this.selectedOrganization = this.organizations[e.detail.value]
      const index = e.detail.value
      const selected = this.organizationOptions[index]
      this.selectedOrganization = selected.deptName
      this.selectedOrganizationId = selected.deptId // 保存部门ID
      // 从归属机构中提取地域关键词（去除"分公司"后缀）
      // 例如："广州分公司" -> "广州"
      this.selectedRegion = selected.deptName.replace(/分公司$/g, '').trim()
      // 重新加载医院列表（带地域过滤）
      this.loadDefaultHospitals()
    },
    
    onEmergencyTaskTypeChange(e) {
      this.selectedEmergencyTaskType = this.emergencyTaskTypes[e.detail.value]
    },
    
    // 加载科室字典数据
    loadDepartments() {
      getDicts('hospital_department').then(response => {
        this.departmentOptions = response.data || []
    // 加载分公司数据（parent_id=100的部门）
    loadBranchCompanies() {
      listBranchCompany().then(response => {
        const list = response.data || []
        // 过滤出 parent_id = 100 的部门（分公司）
        this.organizationOptions = list.filter(dept => dept.parentId === 100)
        // 生成picker的数据源（只显示名称）
        this.organizations = this.organizationOptions.map(dept => dept.deptName)
        
        // 默认设置为当前用户的分公司
        if (this.currentUser.branchCompanyName) {
          const index = this.organizationOptions.findIndex(
            dept => dept.deptName === this.currentUser.branchCompanyName
          )
          if (index !== -1) {
            this.selectedOrganization = this.currentUser.branchCompanyName
            this.selectedOrganizationId = this.organizationOptions[index].deptId // 保存部门ID
            // 提取地域关键词
            this.selectedRegion = this.selectedOrganization.replace(/分公司$/g, '').trim()
            console.log('默认选中归属机构:', this.selectedOrganization, '部门ID:', this.selectedOrganizationId, '地域:', this.selectedRegion)
            // 加载医院列表（带地域过滤）
            this.loadDefaultHospitals()
          }
        }
      }).catch(error => {
        console.error('加载科室字典失败:', error)
        console.error('加载分公司数据失败:', error)
        this.organizationOptions = []
        this.organizations = []
      })
    },
    
    // 加载科室数据（从 SQL Server 动态加载）
    loadDepartments() {
      getHospitalDepartments().then(response => {
        const list = response.data || [];
        this.departmentOptions = list.map(item => ({
          id: item.vID,
          text: item.vtext,
          dictValue: item.vtext  // 为了保持兼容性，保留dictValue字段
        }));
        // console.log('科室数据加载成功:', this.departmentOptions);
      }).catch(error => {
        console.error('加载科室数据失败:', error)
        this.departmentOptions = []
      })
    },
    
    // 加载任务类型数据（从 SQL Server）
    loadEmergencyTaskTypes() {
      getServiceOrderTypes().then(response => {
        const list = response.data || []
        this.emergencyTaskTypes = list
        this.emergencyTaskTypeOptions = list.map(item => ({
          id: item.vID,
          text: item.vtext
        }))
        
        // 默认选中第一个任务类型
        if (this.emergencyTaskTypeOptions.length > 0) {
          this.selectedEmergencyTaskType = this.emergencyTaskTypeOptions[0].text
          this.selectedEmergencyTaskTypeId = this.emergencyTaskTypeOptions[0].id
          console.log('默认选中任务类型:', this.selectedEmergencyTaskType)
        }
      }).catch(error => {
        console.error('加载任务类型失败:', error)
        this.emergencyTaskTypes = []
        this.emergencyTaskTypeOptions = []
      })
    },
    
    // 任务类型选择
    onEmergencyTaskTypeChange(e) {
      const index = e.detail.value
      const selected = this.emergencyTaskTypeOptions[index]
      this.selectedEmergencyTaskType = selected.text
      this.selectedEmergencyTaskTypeId = selected.id
    },
    getUserTypeName(staffType){
      switch(staffType){
        case "nurse":
          return "护士";
        case "doctor":
          return "医生";
        case "driver":
          return "司机";
        default:
          return "司机";
      }
    },
    
    // 加载单据类型数据
    loadDocumentTypes() {
      getServiceOrdAreaTypes().then(response => {
        const list = response.data || []
        this.documentTypes = list
        this.documentTypeOptions = list.map(item => ({
          id: item.vID,
          text: item.vtext
        }))
        
        // 默认选中第一个单据类型
        if (this.documentTypeOptions.length > 0) {
          this.selectedDocumentType = this.documentTypeOptions[0].text
          this.selectedDocumentTypeId = this.documentTypeOptions[0].id
          console.log('默认选中单据类型:', this.selectedDocumentType)
        }
      }).catch(error => {
        console.error('加载单据类型失败:', error)
        this.documentTypes = []
        this.documentTypeOptions = []
      })
    },
    
    // 单据类型选择
    onDocumentTypeChange(e) {
      const index = e.detail.value
      const selected = this.documentTypeOptions[index]
      this.selectedDocumentType = selected.text
      this.selectedDocumentTypeId = selected.id
    },
    
    // 转出医院科室选择
    onHospitalOutDepartmentChange(e) {
      const index = e.detail.value
      this.taskForm.hospitalOut.department = this.departmentOptions[index].dictValue
      const selected = this.departmentOptions[index]
      this.taskForm.hospitalOut.department = selected.text  // 保存科室名称
      this.taskForm.hospitalOut.departmentId = selected.id  // 保存科室ID
    },
    
    // 转入医院科室选择
    onHospitalInDepartmentChange(e) {
      const index = e.detail.value
      this.taskForm.hospitalIn.department = this.departmentOptions[index].dictValue
      const selected = this.departmentOptions[index]
      this.taskForm.hospitalIn.department = selected.text  // 保存科室名称
      this.taskForm.hospitalIn.departmentId = selected.id  // 保存科室ID
    },
    
    // 加载默认医院列表（前100条）
    // 加载默认区院列表（前100条）
    loadDefaultHospitals() {
      // 传入空字符串或特殊标识获取前100条
      searchHospitals('').then(response => {
      // 传入空字符串或特殊标识获取前100条，同时传入地域过滤
      searchHospitals('', this.selectedRegion).then(response => {
        this.defaultHospitals = response.data || []
        // 同时初始化两个搜索结果为默认数据
        this.hospitalOutResults = [...this.defaultHospitals]
        this.hospitalInResults = [...this.defaultHospitals]
      }).catch(error => {
        console.error('加载默认医院列表失败:', error)
        console.error('加载默认区院列表失败:', error)
        this.defaultHospitals = []
      })
    },
@@ -667,7 +833,8 @@
    
    // 搜索转出医院
    searchHospitalOut(keyword) {
      searchHospitals(keyword).then(response => {
      // 传入关键词和地域过滤
      searchHospitals(keyword, this.selectedRegion).then(response => {
        this.hospitalOutResults = response.data || []
        this.showHospitalOutResults = true
      }).catch(error => {
@@ -678,8 +845,11 @@
    
    // 选择转出医院
    selectHospitalOut(hospital) {
      this.taskForm.hospitalOut.id = hospital.hospId  // 保存医院ID
      this.taskForm.hospitalOut.name = hospital.hospName
      this.taskForm.hospitalOut.address = hospital.hospAddress
      // 合并省市区 + 详细地址
      const fullAddress = this.buildFullAddress(hospital)
      this.taskForm.hospitalOut.address = fullAddress
      this.hospitalOutSearchKeyword = hospital.hospName
      this.showHospitalOutResults = false
      this.hospitalOutResults = []
@@ -730,7 +900,8 @@
    
    // 搜索转入医院
    searchHospitalIn(keyword) {
      searchHospitals(keyword).then(response => {
      // 传入关键词和地域过滤
      searchHospitals(keyword, this.selectedRegion).then(response => {
        this.hospitalInResults = response.data || []
        this.showHospitalInResults = true
      }).catch(error => {
@@ -741,8 +912,11 @@
    
    // 选择转入医院
    selectHospitalIn(hospital) {
      this.taskForm.hospitalIn.id = hospital.hospId  // 保存医院ID
      this.taskForm.hospitalIn.name = hospital.hospName
      this.taskForm.hospitalIn.address = hospital.hospAddress
      // 合并省市区 + 详细地址
      const fullAddress = this.buildFullAddress(hospital)
      this.taskForm.hospitalIn.address = fullAddress
      this.hospitalInSearchKeyword = hospital.hospName
      this.showHospitalInResults = false
      this.hospitalInResults = []
@@ -759,13 +933,22 @@
    
    // 初始化选中的人员（默认包含当前用户）
    initSelectedStaff() {
      this.selectedStaff = [{
      // 构建当前用户对象，包含完整的角色信息
      const currentUserStaff = {
        userId: this.currentUser.userId,
        nickName: this.currentUser.nickName,
        phonenumber: this.currentUser.phonenumber,
        postName: this.currentUser.position,
        deptId: this.currentUser.deptId
      }]
        deptId: this.currentUser.deptId,
        posts: this.currentUser.posts || [],
        roles: this.currentUser.roles || [],
        dept: this.currentUser.dept || null
      }
      
      // 为当前用户设置角色类型
      currentUserStaff.type = this.getUserType(currentUserStaff)
      
      this.selectedStaff = [currentUserStaff]
    },
    
    // 加载当前用户所在分公司的所有人员
@@ -811,17 +994,22 @@
    getUserType(user) {
      const postName = user.posts && user.posts.length > 0 ? user.posts[0].postName : ''
      const roleName = user.roles && user.roles.length > 0 ? user.roles[0].roleName : ''
      
      const deptName = user.dept?.deptName || ''
      // console.log("获取用户类型:", postName, roleName,user)
      // 判断是否为司机
      if (postName.includes('司机') || roleName.includes('司机')) {
      if (postName.includes('司机') || roleName.includes('司机') || deptName.includes('车队') || deptName.includes('司机')) {
        return 'driver'
      }
      // 判断是否为医生
      if (postName.includes('医生') || roleName.includes('医生') || deptName.includes('医生')) {
        return 'doctor'
      }
      // 判断是否为护士
      if (postName.includes('护士') || roleName.includes('护士')) {
      if (postName.includes('护士') || roleName.includes('护士') || deptName.includes('护士')) {
        return 'nurse'
      }
      // 其他类型
      return 'other'
      // 其他类型，默认为司机
      return 'driver'
    },
    
    // 显示人员选择弹窗
@@ -834,7 +1022,7 @@
    closeStaffSelector() {
      this.$refs.staffPopup.close()
      this.staffSearchKeyword = ''
      this.staffFilterType = 'all'
      this.staffFilterType = 'driver' // 重置为默认的司机类型
    },
    
    // 人员搜索
@@ -856,6 +1044,8 @@
      // 按类型过滤
      if (this.staffFilterType === 'driver') {
        list = list.filter(staff => staff.type === 'driver')
      } else if (this.staffFilterType === 'doctor') {
        list = list.filter(staff => staff.type === 'doctor')
      } else if (this.staffFilterType === 'nurse') {
        list = list.filter(staff => staff.type === 'nurse')
      }
@@ -1022,6 +1212,21 @@
        return false
      }
      
      if (!this.selectedEmergencyTaskType) {
        this.$modal.showToast('请选择任务类型')
        return false
      }
      
      if (!this.selectedDocumentType) {
        this.$modal.showToast('请选择单据类型')
        return false
      }
      
      if (!this.taskForm.patient.contact) {
        this.$modal.showToast('请输入联系人')
        return false
      }
      
      if (!this.taskForm.patient.name) {
        this.$modal.showToast('请输入患者姓名')
        return false
@@ -1037,8 +1242,18 @@
        return false
      }
      
      if (!this.taskForm.hospitalOut.department) {
        this.$modal.showToast('请选择转出医院科室')
        return false
      }
      
      if (!this.taskForm.hospitalIn.name) {
        this.$modal.showToast('请输入转入医院名称')
        return false
      }
      
      if (!this.taskForm.hospitalIn.department) {
        this.$modal.showToast('请选择转入医院科室')
        return false
      }
      
@@ -1062,9 +1277,25 @@
      
      const submitData = {
        taskType: 'EMERGENCY_TRANSFER',
        deptId: this.selectedOrganizationId, // 归属机构ID（部门ID）
        vehicleIds: this.selectedVehicleId ? [this.selectedVehicleId] : [],
        assigneeIds: this.selectedStaff.map(staff => staff.userId), // 添加执行人员ID列表
        transferTime: this.taskForm.transferTime,
        assigneeIds: this.selectedStaff.map(staff => staff.userId), // 执行人员ID列表
        assigneeId: this.selectedStaff.length > 0 ? this.selectedStaff[0].userId : null, // 主要执行人
        // 执行人员详细信息（包含角色类型）
        assignees: this.selectedStaff.map(staff => ({
          userId: staff.userId,
          userName: staff.nickName,
          userType: staff.type // driver/doctor/nurse
        })),
        transferTime: this.taskForm.transferTime, // 转运时间
        plannedStartTime: this.taskForm.transferTime, // 计划开始时间
        documentTypeId: this.selectedDocumentTypeId, // 单据类型ID
        taskTypeId: this.selectedEmergencyTaskTypeId, // 任务类型ID
        // 病情ID列表（用于同步调度单的OrdICD_ID参数）
        diseaseIds: this.selectedDiseases.map(d => d.id),
        // 将转出医院地址作为出发地，转入医院地址作为目的地
        departureAddress: this.taskForm.hospitalOut.address || '',
        destinationAddress: this.taskForm.hospitalIn.address || '',
        patient: {
          ...this.taskForm.patient,
          condition: conditionText, // 使用合并后的病情信息
@@ -1074,22 +1305,33 @@
            icdName: d.icdName
          }))
        },
        hospitalOut: this.taskForm.hospitalOut,
        hospitalIn: this.taskForm.hospitalIn,
        // 医院信息（包含医院ID、科室名称、科室ID等完整信息）
        hospitalOut: this.taskForm.hospitalOut,  // 包含: id, name, department, departmentId, bedNumber, address
        hospitalIn: this.taskForm.hospitalIn,    // 包含: id, name, department, departmentId, bedNumber, address
        transferDistance: this.taskForm.transferDistance ? parseFloat(this.taskForm.transferDistance) : null,
        price: this.taskForm.price ? parseFloat(this.taskForm.price) : null
      }
      
      if (this.addressCoordinates.hospitalOutAddress) {
        // 转出医院GPS坐标写入扩展表
        if (!submitData.hospitalOut) submitData.hospitalOut = {}
        submitData.hospitalOut.longitude = this.addressCoordinates.hospitalOutAddress.lng
        submitData.hospitalOut.latitude = this.addressCoordinates.hospitalOutAddress.lat
        
        // 同时写入主任务表的出发地经纬度
        submitData.departureLongitude = this.addressCoordinates.hospitalOutAddress.lng
        submitData.departureLatitude = this.addressCoordinates.hospitalOutAddress.lat
      }
      
      if (this.addressCoordinates.hospitalInAddress) {
        // 转入医院GPS坐标写入扩展表
        if (!submitData.hospitalIn) submitData.hospitalIn = {}
        submitData.hospitalIn.longitude = this.addressCoordinates.hospitalInAddress.lng
        submitData.hospitalIn.latitude = this.addressCoordinates.hospitalInAddress.lat
        
        // 同时写入主任务表的目的地经纬度
        submitData.destinationLongitude = this.addressCoordinates.hospitalInAddress.lng
        submitData.destinationLatitude = this.addressCoordinates.hospitalInAddress.lat
      }
      
      return submitData
@@ -1108,7 +1350,7 @@
          this.loading = false
          this.$modal.showToast('任务创建成功')
          setTimeout(() => {
            uni.redirectTo({
            uni.switchTab({
              url: '/pages/task/index'
            })
          }, 1500)
@@ -1122,6 +1364,24 @@
    
    goBack() {
      uni.navigateBack()
    },
    
    // 合并医院地址（省 + 市 + 区 + 详细地址）
    buildFullAddress(hospital) {
      const parts = []
      if (hospital.hopsProvince) {
        parts.push(hospital.hopsProvince)
      }
      if (hospital.hopsCity) {
        parts.push(hospital.hopsCity)
      }
      if (hospital.hopsArea) {
        parts.push(hospital.hopsArea)
      }
      if (hospital.hospAddress) {
        parts.push(hospital.hospAddress)
      }
      return parts.join('')
    }
  }
}
@@ -1178,6 +1438,13 @@
        font-size: 28rpx;
        margin-bottom: 15rpx;
        color: #333;
        
        &.required::before {
          content: '*';
          color: #ff4d4f;
          margin-right: 4rpx;
          font-weight: bold;
        }
      }
      
      .hospital-search-container {