--- a/src/kaigo/Nk/nk.go	Wed Oct 14 21:30:04 2020 +0900
+++ b/src/kaigo/Nk/nk.go	Fri Oct 16 20:35:44 2020 +0900
@@ -1,7 +1,7 @@
 /*
  nk.go: Nintei Kekka
 
- Last Change: 2020-03-10 火 16:38:20.
+ Last Change: 2020-10-16 金 14:27:50.
 */
 
 package main
@@ -385,7 +385,7 @@
 )
 
 var (
-    ver = "0.2"
+    ver = "0.3"
 
 	flg_hb int
 	flg_time bool
@@ -611,7 +611,7 @@
     /* MAKE SORT-TABEL */
     print_step("並び順の決定")
 
-	re_hhs := regexp.MustCompile(`0[1238]\d{8}`)
+	re_hhs := regexp.MustCompile(`05((2126)|(2159)|(4346))0[1238]\d{8}`)
 	re_kaigo := regexp.MustCompile(`要((介護)|(支援)).`)
 
 	hash_fw := make(map[string]int) // 負担割合証発行者のハッシュ
@@ -646,7 +646,7 @@
 	order := ""
 	for _, s := range sorttable {
 		t := strings.Split(s, "#")
-		order += ":" + t[len(t)-1]
+		order += ":" + t[len(t)-1][6:]
 	}
 	order = strings.Replace(order, ":", "", 1)
 
@@ -700,10 +700,11 @@
 		t := strings.Split(s, "#")
 		u := strings.ReplaceAll(t[1], ":", ",")
 		u, _, _ = transform.String(japanese.ShiftJIS.NewEncoder(), u)
-		h := t[2]
+		c := t[2][0:6]
+		h := t[2][6:16]
 		n, _, _ := transform.String(japanese.ShiftJIS.NewEncoder(), hash_hhs[h])
-		// seq, hno, name, kaigo, fw, kyotaku
-		fmt.Fprintf(fcsv, "%04d,%s,%s,%s\n", i + 1, h, n, u)
+		// seq, city, hno, name, kaigo, fw, kyotaku
+		fmt.Fprintf(fcsv, "%04d,%s,%s,%s,%s\n", i + 1, c, h, n, u)
 	}
 	if err := fcsv.Close(); err != nil {
 		log.Fatal(err)