diff --git a/app/src/main/java/com/example/cosmosclient/entities/Request.java b/app/src/main/java/com/example/cosmosclient/entities/Request.java
index ced0b45..619f097 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/Request.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/Request.java
@@ -10,11 +10,12 @@
     private String IssuerUid;
     private String product;
     private Date deadline;
-    private String location; // private int location;
+//    private String location;
+    private int location;
     private String name; //消
     private boolean done = false;
 
-    public Request(String product, Date deadline, String location, String name) {
+    public Request(String product, Date deadline, int location, String name) {
         this.product = product;
         this.deadline = deadline;
         this.location = location;
@@ -45,11 +46,11 @@
         this.deadline = deadline;
     }
 
-    public String getLocation() {
+    public int getLocation() {
         return location;
     }
 
-    public void setLocation(String location) {
+    public void setLocation(int location) {
         this.location = location;
     }
 
diff --git a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
index 7dc390c..5987657 100644
--- a/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
@@ -154,7 +154,7 @@
                  String inputProduct = editTextProduct.getText().toString();
 
                  // 取得したテキストを TextView に張り付ける
-                 RequestListActivity.requestlist.add(0, (new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), selectedSubCategory, "a-hongo")));
+                 RequestListActivity.requestlist.add(0, (new Request(inputProduct, new Date(curYear, curMonth, curDayOfMonth), Yolp.getInstance().getCodeBySubcategory(selectedSubCategory), "a-hongo")));
                  finish();
              }
          });
diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
index 6d0b97a..58421c5 100644
--- a/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
@@ -27,6 +27,7 @@
 import com.example.cosmosclient.app.Cosmos;
 import com.example.cosmosclient.entities.Request;
 import com.example.cosmosclient.resources.GroupsRest;
+import com.example.cosmosclient.yolp.Yolp;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -244,7 +245,7 @@
     public Comparator<Request> locationSortComparator = new Comparator<Request>() {
         @Override
         public int compare(Request r1, Request r2) {
-            return r1.getLocation().compareTo(r2.getLocation());
+            return Yolp.getInstance().getSubCategoryByCode(r1.getLocation()).getSubName().compareTo(Yolp.getInstance().getSubCategoryByCode(r2.getLocation()).getSubName());
         }
     };
 
@@ -340,9 +341,9 @@
         requestlist.clear();
 
         //Add Request
-        requestlist.add(new Request("わさび", new Date(2019, 6, 7), "スーパー", "a-hongo"));
-        requestlist.add(new Request("ケーキ" , new Date(2019, 6, 6), "ダニエル", "t-sugisawa"));
-        requestlist.add(new Request("からし", new Date(2018, 6, 4), "コンビニ", "n-kande"));
+        requestlist.add(new Request("わさび", new Date(2019, 6, 7), 205002, "a-hongo"));
+        requestlist.add(new Request("ケーキ" , new Date(2019, 6, 6), 205001, "t-sugisawa"));
+        requestlist.add(new Request("からし", new Date(2018, 6, 4), 205002, "n-kande"));
 
         //Add RequestList Table
         AddRequestListTable(requestlist);
@@ -446,7 +447,7 @@
             tableRow.addView(textDeadline, new TableRow.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT));
 
             TextView textLocation = new TextView(this);
-            textLocation.setText(requestList.get(i).getLocation());
+            textLocation.setText(Yolp.getInstance().getSubCategoryByCode(requestList.get(i).getLocation()).getSubName());
             textLocation.setTextSize(20);
             textLocation.setHeight(150);
             textLocation.setGravity(Gravity.CENTER);
diff --git a/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java b/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
index 1532db5..87e1a8a 100644
--- a/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
+++ b/app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
@@ -45,6 +45,17 @@
         return codeToSubcategory;
     }
 
+    public int getCodeBySubcategory(String selectedSubCategory) {
+        int code = 0;
+        for(SubCategory subCategory : codeToSubcategory.values()) {
+            if(subCategory.getSubName().equals(selectedSubCategory)) {
+                code = subCategory.getCode();
+                break;
+            }
+        }
+        return code;
+    }
+
     public void setCodeToSubcategory(HashMap<Integer, SubCategory> codeToSubcategory) {
         this.codeToSubcategory = codeToSubcategory;
     }