diff --git a/game-server/app/servers/battle/handler/pvpHandler.ts b/game-server/app/servers/battle/handler/pvpHandler.ts
index 7205edc8e..519c60e0e 100644
--- a/game-server/app/servers/battle/handler/pvpHandler.ts
+++ b/game-server/app/servers/battle/handler/pvpHandler.ts
@@ -1,7 +1,7 @@
 import {Application, BackendSession, pinus} from 'pinus';
 import { uniq, findWhere, findIndex } from 'underscore';
 import { gameData, getPvpBoxs, getPLvByScore } from '../../../pubUtils/data';
-import { refreshEnemies, getEnemies, getLvByScore, defaultHeroes, comsumeChallengeCnt, refresh, findPvpDefByRoleId, checkRoleIsRobot, getRefOppCnt, findPvpDefAllByRoleId, generPVPOppRecInfo, generMyRecInfo, robotIdComBack } from '../../../services/pvpService';
+import { refreshEnemies, getEnemies, getLvByScore, defaultHeroes, comsumeChallengeCnt, refresh, findPvpDefByRoleId, checkRoleIsRobot, getRefOppCnt, findPvpDefAllByRoleId, generPVPOppRecInfo, generMyRecInfo } from '../../../services/pvpService';
 import { RoleModel, RoleType } from '../../../db/Role';
 import { STATUS } from '../../../consts/statusCode';
 import { resResult, genCode } from '../../../pubUtils/util';
@@ -35,20 +35,18 @@ export class PvpHandler {
         let roleId = session.get('roleId');
         let {heroScores, hisScore} = await PvpDefenseModel.findByRoleId(roleId);
         let score = 0;
-        for (let {hid, score: heroScore} of heroScores) {
+        for (let {hid, score: heroScore} of addHeroScores) {
             if (heroScore < 0) continue;
-            let index = findIndex(addHeroScores, {hid});
+            let index = findIndex(heroScores, {hid});
             if (index != -1) {
                 heroScores[index].score = heroScore;
             } else {
                 heroScores.push({hid, score :heroScore});
             }
         }
-
         for (let heroScore of heroScores) {
             score += heroScore.score;
         }
-
         if (score < 0) {
             score = 0;
         }
@@ -259,7 +257,7 @@ export class PvpHandler {
         const defenseInfo = await generPVPOppRecInfo(isSuccess, curOpp, oppHeroes, role.lv);
 
         // 战报记录
-        await PvpRecordModel.createRec({roleId1: roleId, roleId2: robotIdComBack(oppRoleId), warId: BattleRecord.battleId, attackInfo, defenseInfo, createTime: nowSeconds()});
+        await PvpRecordModel.createRec({roleId1: roleId, roleId2: oppRoleId, warId: BattleRecord.battleId, attackInfo, defenseInfo, createTime: nowSeconds()});
 
         // 刷新对手
         let newOppPlayers: Array<OppPlayers> = await refreshEnemies(role, score, pLv);
@@ -392,7 +390,7 @@ export class PvpHandler {
                 newHero.setPvpHeroInfo(hero);
                 return newHero;
             })
-            result = new PlayerDetail({...pvpHistoryOpp, roleId: pvpHistoryOpp.oppRoleId, heroes, rank: pvpHistoryOpp.rankLv});
+            result = new PlayerDetail({...pvpHistoryOpp, roleId: pvpHistoryOpp.oppRoleId, heroes});
         } else { // 查询对方pvpDefense
             let pvpDefense = await PvpDefenseModel.findByRoleId(oppoRoleId);
             let dbHeroes = await HeroModel.findByRole(oppoRoleId);
@@ -408,7 +406,7 @@ export class PvpHandler {
             }
             heroes.sort((a, b) => b.score - a.score);
             let rank = await getMyRank(REDIS_KEY.PVP_RANK, 0, roleId);//去redis中获取排名
-            result = new PlayerDetail({...role, ...pvpDefense, heroes, rank});
+            result = new PlayerDetail({...role, heroes, rank});
         }
         
         return resResult(STATUS.SUCCESS, result);