diff --git a/game-server/app/servers/battle/handler/comBattleHandler.ts b/game-server/app/servers/battle/handler/comBattleHandler.ts
index bba152dca..99f3486d6 100644
--- a/game-server/app/servers/battle/handler/comBattleHandler.ts
+++ b/game-server/app/servers/battle/handler/comBattleHandler.ts
@@ -7,7 +7,7 @@ import { difference } from 'underscore';
  * @Last Modified time: 2020-12-03 21:36:00
  */
 import { IT_TYPE, CURRENCY_BY_TYPE, CURRENCY_TYPE, COM_TEAM_STATUS, COM_BTL_CONST, CONSUME_TYPE, COM_BTL_QUALITY } from './../../../consts';
-import { getGoodById, getBossHpByBlueprtId, getBlueprtComposeByQuality, getBluePrtByQuality, getWarById, getWarIdByBlueprtId, comBtlRangeByLv } from '../../../pubUtils/gamedata';
+import { getGoodById, getBlueprtComposeByQuality, getBluePrtByQuality, getWarById, getWarIdByBlueprtId, comBtlRangeByLv } from '../../../pubUtils/gamedata';
 import Role, { RoleModel } from '../../../db/Role';
 import { STATUS } from '../../../consts/statusCode';
 import { Application, BackendSession } from 'pinus';
@@ -16,7 +16,6 @@ import { RoleStatus, ComBattleTeamModel, ComBattleTeamType } from '../../../db/C
 import { ItemModel } from '../../../db/Item';
 import { handleFixedReward, addItems, handleCost } from '../../../services/rewardService';
 import { checkRoleInQueue, getTeamSearchByQuality, rmRoleFromQueue, setTeamSearchReq } from '../../../services/redisService';
-import { transBossHpArr } from '../../../services/battleService';
 import { getRandBlueprtId, getRandComBtlRobots, clearComBtlTimer, getAssistTimesByQuality, getFrd, updateRobotHurtByTime, comBtlLvInvalid, clearRobotHurtTimer, setDismissTimer, dismissTeam, incEquipPrintDrop, randEquipPrintId, handleComBtlProgress, getComBattleFriendAdd, getValidTeammateRoleSt, teammateInBlackList, blueprtIdValid, createComTeamData, hasEnoughBlueprt } from '../../../services/comBattleService';
 import { setAp } from '../../../services/actionPointService';
 import { roleLevelup } from '../../../services/normalBattleService';
@@ -74,9 +73,8 @@ export class ComBattleHandler {
                 roleIds.push(teammateRoleId);
             }
         }
-        let { bossHpSum, bossHpArr } = getBossHpByBlueprtId(blueprtId);
         // 创建队伍数据结构
-        let comTeam: MemComBtlTeam = createComTeamData(teamCode, pub, blueprtId, COM_TEAM_STATUS.DEFAULT, roleId, ceLimit, bossHpSum || 10000, goodData.quality, transBossHpArr(bossHpArr));
+        let comTeam: MemComBtlTeam = createComTeamData(teamCode, pub, blueprtId, roleId, ceLimit);
         comTeam.roleStatus = roleStatus;
         comTeam.roleIds = roleIds;
 
@@ -182,10 +180,9 @@ export class ComBattleHandler {
 
             // 创建队伍
             let blueprtId = getRandBlueprtId(qualityArr).pop();
-            let { quality } = getGoodById(blueprtId);
-            let { bossHpSum, bossHpArr } = getBossHpByBlueprtId(blueprtId);
-            let comTeam: MemComBtlTeam = createComTeamData(teamCode, false, blueprtId, COM_TEAM_STATUS.DEFAULT, 'robot', 0, bossHpSum || 10000, quality, transBossHpArr(bossHpArr))
+            let comTeam: MemComBtlTeam = createComTeamData(teamCode, false, blueprtId, 'robot', 0)
 
+            let { quality } = getGoodById(blueprtId);
             let isFrd = await getFrd(roleId, quality);
             // 将玩家加入队伍
             let roleInfo = new RoleStatus(roleId, roleName, false, isFrd, headHid, sHid, topFiveCe, lv);
diff --git a/game-server/app/services/comBattleService.ts b/game-server/app/services/comBattleService.ts
index 8ca08fb9e..60df8ea5b 100644
--- a/game-server/app/services/comBattleService.ts
+++ b/game-server/app/services/comBattleService.ts
@@ -7,10 +7,10 @@ import { EquipPrintDropType, EquipPrintDropModel } from './../db/EquipPrintDrop'
 import { FriendPointModel } from './../db/FriendPoint';
 import { STATUS } from './../consts/statusCode';
 import { COM_TEAM_STATUS, CURRENCY_BY_TYPE, CURRENCY_TYPE, FRIEND_DROP_TYPE, COM_BTL_CONST, FRIEND_DROP_MAX } from './../consts';
-import { RoleStatus, ComBattleTeamModel, BossHp } from './../db/ComBattleTeam';
-import { getBluePrtByQuality, getComBtlSetByQuality, getRewardByBlueprtId, getWarById, getWarIdByBlueprtId, comBtlRangeInfo, getGoodById, comBtlRangeByLv } from "../pubUtils/gamedata";
+import { RoleStatus, ComBattleTeamModel } from './../db/ComBattleTeam';
+import { getBluePrtByQuality, getComBtlSetByQuality, getRewardByBlueprtId, getWarById, getWarIdByBlueprtId, comBtlRangeInfo, getGoodById, comBtlRangeByLv, getBossHpByBlueprtId } from "../pubUtils/gamedata";
 import { getRandEelm, getRandValue, resResult, ratioReward, getRandValueByMinMax, getRandomWithWeight, decodeStr, getRobotInfo, reduceCe } from "../pubUtils/util";
-import { getRandRobot } from "./battleService";
+import { getRandRobot, transBossHpArr } from "./battleService";
 import { difference, omit } from 'underscore';
 import { Channel } from 'pinus';
 import { TREASURE } from '../pubUtils/dicParam';
@@ -532,15 +532,18 @@ export function blueprtIdValid(id: number) {
  * @param {Array<BossHp>} bossHpArr
  * @returns
  */
-export function createComTeamData(teamCode: string, pub: boolean, blueprtId: number, status: number, capId: string, ceLimit: number, bossHp: number, quality: number, bossHpArr:Array<BossHp>) {
-    const { lvLimited } = getGoodById(blueprtId);
+export function createComTeamData(teamCode: string, pub: boolean, blueprtId: number, capId: string, ceLimit: number) {
+    const { lvLimited, quality } = getGoodById(blueprtId);
     const lvRange = comBtlRangeByLv(lvLimited);
+    const { bossHpSum, bossHpArr } = getBossHpByBlueprtId(blueprtId);
     const curRnd = 0;
     const roleCnt = 1;
     const timeout = false;
-    const bossCurHp = bossHp;
+    const bossCurHp = bossHpSum;
+    const bossHp = bossHpSum;
+    const status = COM_TEAM_STATUS.DEFAULT;
     return {
-        teamCode, pub, blueprtId, status, capId, ceLimit, bossHp, bossCurHp, quality, bossHpArr, curRnd, roleCnt, timeout, lvRange
+        teamCode, pub, blueprtId, status, capId, ceLimit, bossHp, bossCurHp, quality, bossHpArr: transBossHpArr(bossHpArr), curRnd, roleCnt, timeout, lvRange
     };
 }