diff --git a/src/main/java/com/example/cosmos_serversb/entities/User.java b/src/main/java/com/example/cosmos_serversb/entities/User.java
index efefb2c..1a93926 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/User.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/User.java
@@ -1,5 +1,7 @@
 package com.example.cosmos_serversb.entities;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
 public class User {
     public String uId, uri, name, iconUri;
     public boolean login = true;
@@ -17,6 +19,11 @@
         this.login = true;
     }
 
+    static interface removeuIdAnduri{
+        @JsonIgnore String getuId();
+        @JsonIgnore String getUri();
+    }
+
     public String getuId() {
         return uId;
     }
diff --git a/src/main/java/com/example/cosmos_serversb/models/Users.java b/src/main/java/com/example/cosmos_serversb/models/Users.java
index ee47aac..4a3e123 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Users.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Users.java
@@ -5,7 +5,7 @@
 import javax.inject.Singleton;
 
 import com.example.cosmos_serversb.entities.*;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
@@ -97,7 +97,7 @@
     public static PutUser setUser(String uId, String name, String pw, String iconImage) {
         Session session = sessionFactory.openSession();
         session.beginTransaction();
-        List usersList = session.createQuery( "from setUser" ).list();
+        List usersList = session.createQuery( "from User" ).list();
         for ( User user : (List<User>) usersList ) {
             if(user.getuId() == uId){
                 user.setName(name);
@@ -119,18 +119,17 @@
         return putUser;
     }
 
-    public static GetUser getUserById(String uId) {
+    public static User getUserById(String uId) {
         //与えられたuIdのUser情報を返す
         Session session = sessionFactory.openSession();
         session.beginTransaction();
-        List usersList = session.createQuery( "from getUser" ).list();
+        List usersList = session.createQuery( "from User" ).list();
         //uIdを比較し、一致した場合はNameとiconUriを返す。一致しない場合はbreak
         for ( User user : (List<User>) usersList ) {
             if (user.getuId() == uId) {
-                //ここの2行でUser.javaからNameとIconUriを参照
                 User findUser = (User) session.load(User.class, uId);
-                GetUser getUser = new GetUser(findUser.getName(),findUser.getIconUri());
-                return getUser;
+                ObjectMapper mapper = new ObjectMapper();
+                return mapper.addMixIn(findUser, findUser.removeuIdAnduri());
 //                System.out.println( "name: " + user.getName() + "iconUri : " + user.getIconUri());]
             }else{
                 break;