diff --git a/src/main/java/com/ntlab/irisserver/entities/Game.java b/src/main/java/com/ntlab/irisserver/entities/Game.java
index f6b0822..a6e50d7 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Game.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Game.java
@@ -1,22 +1,35 @@
 package com.ntlab.irisserver.entities;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.*;
 
 public class Game {
 
+    @JsonProperty("assignments")
     private Map<Member, List<Integer>> assignments = new HashMap<>();//<Member, List<dno>>
+    @JsonProperty("drawingList")
     private Map<Integer, Drawing> drawingList = new HashMap<>();//<dno,Drawing>
+    @JsonProperty("keywordList")
     private Map<Integer, String> keywordList = new HashMap<>();//<dno, keyword>
+    @JsonProperty("cellList")
     private Map<Integer, Cell> cellList = new HashMap<>();//<cno, Cell>
 
+    @JsonProperty("map")
     private List<Integer> map = new ArrayList<>();//cno順にdnoを管理
+    @JsonProperty("colorList")
     private List<String> colorList = new ArrayList<>();//cno順にr:赤,g:灰,b:青,d:黒を管理
+    @JsonProperty("turnList")
     private List<Turn> turnList = new ArrayList<>();
 
+    @JsonProperty("nowTurn")
     private Turn nowTurn = null;//現在のターン
+    @JsonProperty("drawingController")
     private DrawingController drawingController = null;
+    @JsonProperty("settings")
     private Settings settings = null;
 
+
     public Game(Room room, String[] keywords) {
 
         room.setGame(this);
diff --git a/src/main/java/com/ntlab/irisserver/entities/GameJson.java b/src/main/java/com/ntlab/irisserver/entities/GameJson.java
index d236512..e3deedd 100644
--- a/src/main/java/com/ntlab/irisserver/entities/GameJson.java
+++ b/src/main/java/com/ntlab/irisserver/entities/GameJson.java
@@ -1,14 +1,18 @@
 package com.ntlab.irisserver.entities;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class GameJson {
-
+    @JsonProperty("drawingList")
     private Map<Integer, Drawing> drawingList = new HashMap<>();//<dno, drawingのURL>
+    @JsonProperty("map")
     private List<Integer> map = new ArrayList<>();//cno順にdnoを管理
+    @JsonProperty("colorList")
     private List<String> colorList = new ArrayList<>();//cno順にr,g,b,dを管理
 
     //コンストラクタ
diff --git a/src/main/java/com/ntlab/irisserver/entities/Turn.java b/src/main/java/com/ntlab/irisserver/entities/Turn.java
index 80c74ca..8795b93 100644
--- a/src/main/java/com/ntlab/irisserver/entities/Turn.java
+++ b/src/main/java/com/ntlab/irisserver/entities/Turn.java
@@ -21,7 +21,7 @@
     private int turnstate; //0:スパイマスターのターン 1:諜報員のターン
 
     @JsonProperty("gamestate")
-    private int gamestate;//0:turn継続, 1:turn終了, 2:game終了
+    private int endstate;//0:game継続, 1:game終了
 
     private List<Member> questions[] = new ArrayList[16]; //<cno, List<Menber>>
 
@@ -32,7 +32,7 @@
     public Turn(){
         max = -1;
         turnstate = 0;
-        gamestate = 0;
+        endstate = 0;
     }
 
     //---------------------------------------------------------
@@ -46,7 +46,7 @@
 
     public void setTurnstate(int turnstate) {this.turnstate = turnstate;}
 
-    public void setGamestate(int gamestate) {this.gamestate = gamestate;}
+    public void setEndstate(int endstate) {this.endstate = endstate;}
 
     //---------------------------------------------------------
     //ゲッター
@@ -63,7 +63,7 @@
 
     public int getTurnstate() {return turnstate;}
 
-    public int getGamestate() {return gamestate;}
+    public int getEndstate() {return endstate;}
 
     //---------------------------------------------------------
     //questions操作
diff --git a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java
index 6fe9806..7c0d843 100644
--- a/src/main/java/com/ntlab/irisserver/entities/TurnJson.java
+++ b/src/main/java/com/ntlab/irisserver/entities/TurnJson.java
@@ -20,7 +20,7 @@
     private int turnstate; //0:スパイマスターのターン 1:諜報員のターン
 
     @JsonProperty("gamestate")
-    private int gamestate; //0:turn継続, 1:turn終了, 2:game終了
+    private int endstate; //0:game継続, 1:game終了
 
     private List<Integer> openlist = new ArrayList<>();
 
@@ -32,7 +32,7 @@
         max = t.getMax();
         openlist = t.getOpenListAll();
         turnstate = t.getTurnstate();
-        gamestate = t.getGamestate();
+        endstate = t.getEndstate();
     }
 
 }
diff --git a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
index f7df9ef..a7d3b45 100644
--- a/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
+++ b/src/main/java/com/ntlab/irisserver/resources/TurnsRest.java
@@ -10,7 +10,6 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Iterator;
 
@@ -169,7 +168,7 @@
 
     @PUT //オープンリストの追加 カードをめくったときの色ごとの処理（）
     @Path("/{rid}/game/turns/{tno}/openlist")
-    public Integer setOpenList(@PathParam("rid") String rid, @PathParam("tno") Integer tno, @FormParam("cno")Integer cno){
+    public void setOpenList(@PathParam("rid") String rid, @PathParam("tno") Integer tno, @FormParam("cno")Integer cno){
 
         RoomManager rm = RoomManager.getInstance();
         Room room = rm.getRoom(rid);
@@ -181,18 +180,22 @@
         card.setIsOpen(true);
 
         //turnが続くかの判定
+        int i;
+        int r = 0;
+        int b = 0;
+        for(i = 0; i < 16; i++){
+            Cell cell = game.getCell(i);
+            boolean isOpen = cell.getIsOpen();
+
+        }
         if(card.color == "d"){
-            t.setGamestate(2);
+            t.setEndstate(1);
         }else if(t.getMax() <= t.getOpenListAll().size()){
-            t.setGamestate(1);
             game.createTurn();
         }else if(card.color == "g"||(card.color != t.getTeam())){
-            t.setGamestate(1);
             game.createTurn();
         }
 
-        return t.getGamestate();
-
     }
 
 }