修正画面スクロール改善

@@ -594,6 +594,7 @@
             this.Controls.Add(this.textBox1);
             this.Name = "Form3";
             this.Text = "Form3";
+            this.Load += new System.EventHandler(this.Form3_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();

@@ -10,6 +10,7 @@ using System.Windows.Forms;
 using MySql.Data.MySqlClient;
 using System.Data.SqlClient;
 using System.IO;
+using System.Reflection;
 
 namespace MedicalCheckInputTool
 {
@@ -455,11 +456,11 @@ namespace MedicalCheckInputTool
         //行政区集計
         private void makeSummaryAdmin(MySqlConnection readerCon)
         {
-            string readQuery = "select `行政区コード`,`行政区名称`,count(行政区コード) from `１回目` where `ロット番号` = @lotNo group by `行政区コード` order by `行政区コード`";
+            string readQuery = "select `行政区コード`,`行政区名称`,count(行政区コード) from `１回目` group by `行政区コード` order by `行政区コード`";
             MySqlCommand readCmd = new MySqlCommand(readQuery, readerCon);
             readCmd.Parameters.AddWithValue("lotNo", EditParam.lotNo);
 
-            string countQuery = "select count(distinct `世帯番号`) from `１回目` where `行政区コード`= @adminCode and `ロット番号` = @lotNo";
+            string countQuery = "select count(distinct `世帯番号`) from `１回目` where `行政区コード`= @adminCode";
             MySqlCommand countCmd = new MySqlCommand(countQuery, readerCon);
 
             try
@@ -514,17 +515,26 @@ namespace MedicalCheckInputTool
 
         }
 
+        //行政区サマリ
+        public class SummaryHealthArea
+        {
+            public int lotNo;
+            public int countAll;
+            public int count;
+        }
+
         //保健区集計
         private void makeSummaryHealthArea(MySqlConnection readerCon)
         {
-            string getQuery = "select `保健区` from `１回目` where `ロット番号` = @lotNo group by `保健区`";
+//            string getQuery = "select `保健区` from `１回目` where `ロット番号` = @lotNo group by `保健区`";
+            string getQuery = "select `保健区` from `１回目` group by `保健区`";
             MySqlCommand getCmd = new MySqlCommand(getQuery, readerCon);
             getCmd.Parameters.AddWithValue("lotNo", EditParam.lotNo);
 
-            string readQuery = "select `行政区コード`,`行政区名称`,count(行政区コード) from `１回目` where (`ロット番号` = @lotNo) and (`保健区` = @healthArea) group by `行政区コード` order by `行政区コード`";
+            string readQuery = "select `行政区コード`,`行政区名称` from `１回目` where (`保健区` = @healthArea) group by `行政区コード` order by `行政区コード`";
             MySqlCommand readCmd = new MySqlCommand(readQuery, readerCon);
 
-            string countQuery = "select count(distinct `世帯番号`) from `１回目` where (`行政区コード`= @adminCode) and (`ロット番号` = @lotNo) and (`保健区` = @healthArea) ";
+            string countQuery = "select `ロット番号`,count(`行政区コード`),count(distinct `世帯番号`) from `１回目` where (`行政区コード`= @adminCode) and (`保健区` = @healthArea) group by `ロット番号` order by `ロット番号`";
             MySqlCommand countCmd = new MySqlCommand(countQuery, readerCon);
 
             try
@@ -548,50 +558,78 @@ namespace MedicalCheckInputTool
                 foreach (string ha in healthAreaList)
                 {
                     readCmd.Parameters.Clear();
-                    readCmd.Parameters.AddWithValue("lotNo", EditParam.lotNo);
                     readCmd.Parameters.AddWithValue("healthArea", ha);
                     // 実行
                     MySqlDataReader reader = readCmd.ExecuteReader();
+                    List<string> adminCodeList = new List<string>();
+                    List<string> adminNameList = new List<string>();
+
                     if (!reader.HasRows)
                     {   //無かった
                         reader.Close();
+                        continue;
                     }
                     else
                     {
-                        List<SummaryAdmin> adminList = new List<SummaryAdmin>();
                         while (reader.Read())
                         {
-                            SummaryAdmin tmp = new SummaryAdmin();
-                            tmp.adminCode = this.isDBNull(reader, "行政区コード");
-                            tmp.adminName = this.isDBNull(reader, "行政区名称");
-                            tmp.count = reader.GetInt16(2);
-                            adminList.Add(tmp);
+                            adminCodeList.Add(isDBNull(reader, "行政区コード"));
+                            adminNameList.Add(isDBNull(reader, "行政区名称"));
                         }
                         reader.Close();
+                    }
 
-                        StreamWriter writer = new StreamWriter("SummaryHealthArea_" + ha + ".csv", false, System.Text.Encoding.GetEncoding("shift_jis")); //ファイルストリーム
-                        writer.WriteLine("行政区コード,行政区名称,件数,世帯数");
+                    StreamWriter writer = new StreamWriter("SummaryHealthArea_" + ha + ".csv", false, System.Text.Encoding.GetEncoding("shift_jis")); //ファイルストリーム
+                    writer.WriteLine(",,1,,2,,3,,4,,5,");
+                    writer.WriteLine("行政区コード,行政区名称,件数,世帯数,件数,世帯数,件数,世帯数,件数,世帯数,件数,世帯数");
 
-                        foreach (SummaryAdmin sa in adminList)
+                    for (int i = 0; i < adminCodeList.Count; i++ )
+                    {
+                        countCmd.Parameters.Clear();
+                        countCmd.Parameters.AddWithValue("adminCode", adminCodeList[i]);
+                        countCmd.Parameters.AddWithValue("healthArea", ha);
+                        // 実行
+                        MySqlDataReader reader2 = countCmd.ExecuteReader();
+                        if (!reader2.HasRows)
+                        {   //無かった
+                            reader2.Close();
+                        }
+                        else
                         {
-                            countCmd.Parameters.Clear();
-                            countCmd.Parameters.AddWithValue("adminCode", sa.adminCode);
-                            countCmd.Parameters.AddWithValue("lotNo", EditParam.lotNo);
-                            countCmd.Parameters.AddWithValue("healthArea", ha);
-                            MySqlDataReader reader2 = countCmd.ExecuteReader();
+                            List<SummaryHealthArea> haList = new List<SummaryHealthArea>();
                             while (reader2.Read())
                             {
-                                int count2 = reader2.GetInt16(0);
-
-                                string line = sa.adminCode + "," + sa.adminName + "," + sa.count + "," + count2;
-                                writer.WriteLine(line);
+                                SummaryHealthArea tmp = new SummaryHealthArea();
+                                tmp.lotNo = reader2.GetInt16(0);
+                                tmp.countAll = reader2.GetInt16(1);
+                                tmp.count = reader2.GetInt16(2);
+                                haList.Add(tmp);
                             }
                             reader2.Close();
+
+                            string line = adminCodeList[i] + "," + adminNameList[i] ;
+                            for (int j = 0; j < 5; j++)
+                            {
+                                SummaryHealthArea hit = null;
+
+                                hit = haList.Find(delegate(SummaryHealthArea sha) { return sha.lotNo == j+1; });
+                                if (hit != null)
+                                {
+                                    line += ",";
+                                    line += hit.countAll + "," + hit.count;
+                                }
+                                else
+                                {
+                                    line += ",";
+                                    line += ",";
+                                }
+                            }
+                            writer.WriteLine(line);
                         }
+                    }
 
-                        writer.Close();
+                    writer.Close();
 
-                    }
                 }
             }
             catch (SqlException ex)
@@ -621,5 +659,13 @@ namespace MedicalCheckInputTool
 
         }
 
+        private void Form3_Load(object sender, EventArgs e)
+        {
+            typeof(DataGridView).
+                GetProperty("DoubleBuffered",
+                BindingFlags.Instance | BindingFlags.NonPublic).
+                SetValue(dataGridView1, true, null);
+        }
+
     }
 }