製造中登録（３回目）

@@ -108,6 +108,7 @@
             this.textBox2.Size = new System.Drawing.Size(100, 19);
             this.textBox2.TabIndex = 3;
             this.textBox2.TextChanged += new System.EventHandler(this.textBox2_TextChanged);
+            this.textBox2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox2_KeyPress);
             // 
             // label4
             // 
@@ -136,6 +137,7 @@
             this.textBox4.Size = new System.Drawing.Size(100, 19);
             this.textBox4.TabIndex = 8;
             this.textBox4.TextChanged += new System.EventHandler(this.textBox4_TextChanged);
+            this.textBox4.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox4_KeyPress);
             // 
             // textBox5
             // 
@@ -146,6 +148,7 @@
             this.textBox5.Size = new System.Drawing.Size(100, 19);
             this.textBox5.TabIndex = 9;
             this.textBox5.TextChanged += new System.EventHandler(this.textBox5_TextChanged);
+            this.textBox5.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox5_KeyPress);
             // 
             // label6
             // 
@@ -175,6 +178,7 @@
             this.textBox6.Size = new System.Drawing.Size(31, 19);
             this.textBox6.TabIndex = 12;
             this.textBox6.TextChanged += new System.EventHandler(this.textBox6_TextChanged);
+            this.textBox6.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox6_KeyPress);
             // 
             // label8
             // 
@@ -194,6 +198,7 @@
             this.textBox7.Size = new System.Drawing.Size(31, 19);
             this.textBox7.TabIndex = 14;
             this.textBox7.TextChanged += new System.EventHandler(this.textBox7_TextChanged);
+            this.textBox7.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox7_KeyPress);
             // 
             // label9
             // 
@@ -267,6 +272,7 @@
             this.textBox8.Size = new System.Drawing.Size(31, 19);
             this.textBox8.TabIndex = 22;
             this.textBox8.TextChanged += new System.EventHandler(this.textBox8_TextChanged);
+            this.textBox8.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox8_KeyPress);
             // 
             // textBox9
             // 
@@ -277,6 +283,7 @@
             this.textBox9.Size = new System.Drawing.Size(31, 19);
             this.textBox9.TabIndex = 23;
             this.textBox9.TextChanged += new System.EventHandler(this.textBox9_TextChanged);
+            this.textBox9.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox9_KeyPress);
             // 
             // textBox10
             // 
@@ -287,6 +294,7 @@
             this.textBox10.Size = new System.Drawing.Size(31, 19);
             this.textBox10.TabIndex = 24;
             this.textBox10.TextChanged += new System.EventHandler(this.textBox10_TextChanged);
+            this.textBox10.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox10_KeyPress);
             // 
             // textBox11
             // 
@@ -297,6 +305,7 @@
             this.textBox11.Size = new System.Drawing.Size(31, 19);
             this.textBox11.TabIndex = 25;
             this.textBox11.TextChanged += new System.EventHandler(this.textBox11_TextChanged);
+            this.textBox11.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox11_KeyPress);
             // 
             // textBox12
             // 
@@ -307,6 +316,7 @@
             this.textBox12.Size = new System.Drawing.Size(31, 19);
             this.textBox12.TabIndex = 26;
             this.textBox12.TextChanged += new System.EventHandler(this.textBox12_TextChanged);
+            this.textBox12.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox12_KeyPress);
             // 
             // textBox13
             // 
@@ -317,6 +327,7 @@
             this.textBox13.Size = new System.Drawing.Size(31, 19);
             this.textBox13.TabIndex = 27;
             this.textBox13.TextChanged += new System.EventHandler(this.textBox13_TextChanged);
+            this.textBox13.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox13_KeyPress);
             // 
             // textBox14
             // 
@@ -327,6 +338,7 @@
             this.textBox14.Size = new System.Drawing.Size(31, 19);
             this.textBox14.TabIndex = 28;
             this.textBox14.TextChanged += new System.EventHandler(this.textBox14_TextChanged);
+            this.textBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox14_KeyPress);
             // 
             // label16
             // 
@@ -365,6 +377,7 @@
             this.textBox15.Size = new System.Drawing.Size(31, 19);
             this.textBox15.TabIndex = 32;
             this.textBox15.TextChanged += new System.EventHandler(this.textBox15_TextChanged);
+            this.textBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox15_KeyPress);
             // 
             // textBox16
             // 
@@ -375,6 +388,7 @@
             this.textBox16.Size = new System.Drawing.Size(31, 19);
             this.textBox16.TabIndex = 33;
             this.textBox16.TextChanged += new System.EventHandler(this.textBox16_TextChanged);
+            this.textBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox16_KeyPress);
             // 
             // button1
             // 
@@ -487,8 +501,10 @@
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Controls.Add(this.textBox1);
+            this.KeyPreview = true;
             this.Name = "Form2";
             this.Text = "Form2";
+            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Form2_KeyDown);
             this.ResumeLayout(false);
             this.PerformLayout();
 

@@ -18,10 +18,15 @@ namespace MedicalCheckInputTool
         private const int historyMax = 10;
         private int historyPos = 0;
 
-        public Form2()
+        public Form2(string serialNo = null)
         {
             InitializeComponent();
 
+            if (serialNo != null)
+            {
+                initDsp(serialNo);
+            }
+
             this.Text = "ロット：" + Global.lotNo + " " + Global.times + " " + "ユーザ：" + Global.inputUser;
 
             label3.Text = "ロット " + Global.lotNo + "  行政区番号 " + Global.adminCode;
@@ -31,6 +36,67 @@ namespace MedicalCheckInputTool
             dspCount();
         }
 
+        //修正から遷移
+        private void initDsp(string serialNo)
+        {
+            MySqlConnection conn;
+            string connstr = System.Configuration.ConfigurationManager.AppSettings["Conn"];
+            conn = new MySqlConnection(connstr);
+            conn.Open();
+            string code = serialNo.PadLeft(10, '0');
+
+            textBox1.Text = code;
+            bool err = false;
+            MySqlCommand cmd = new MySqlCommand("select * from `" + Global.times + "` where `ロット番号` = @lotNo and `整理番号` = @serialNo", conn);
+            // パラメータ設定
+            cmd.Parameters.Add(new MySqlParameter("lotNo", Global.lotNo));
+            cmd.Parameters.Add(new MySqlParameter("serialNo", serialNo));
+
+            try
+            {
+                MySqlDataReader reader = cmd.ExecuteReader();
+                if (!reader.HasRows)
+                {
+                    //無かった
+                    reader.Close();
+                }
+                else
+                {
+                    string[] row = new string[reader.FieldCount];
+                    while (reader.Read())
+                    {
+                        textBox1.Text = isDBNull(reader, "整理番号");
+                        textBox2.Text = isDBNull(reader, "世帯番号");
+                        textBox4.Text = isDBNull(reader, "電話番号");
+                        textBox5.Text = isDBNull(reader, "携帯番号");
+                        textBox6.Text = isDBNull(reader, "健康診査");
+                        textBox7.Text = isDBNull(reader, "結核肺がん");
+                        textBox8.Text = isDBNull(reader, "胃がん");
+                        textBox9.Text = isDBNull(reader, "大腸がん");
+                        textBox10.Text = isDBNull(reader, "前立腺がん");
+                        textBox11.Text = isDBNull(reader, "骨粗鬆症");
+                        textBox12.Text = isDBNull(reader, "成人歯科");
+                        textBox13.Text = isDBNull(reader, "子宮頸がん");
+                        textBox14.Text = isDBNull(reader, "乳がん");
+                        textBox15.Text = isDBNull(reader, "希望場所");
+                        textBox16.Text = isDBNull(reader, "身体不自由");
+
+                        Global.adminCode = isDBNull(reader, "行政区コード");
+                        Global.adminName = isDBNull(reader, "行政区名称");
+                        Global.healthArea = isDBNull(reader, "保健区");
+                    }
+                    reader.Close();
+                }
+            }
+            catch (SqlException ex)
+            {
+            }
+
+            conn.Close();
+        }
+
+
+
         private void dspCount()
         {
             MySqlConnection conn;
@@ -148,6 +214,19 @@ namespace MedicalCheckInputTool
                 sv.inputUser = Global.inputUser;
                 err = insertData(sv, Global.times, conn);
             }
+
+            if ("２回目".Equals(Global.times))
+            {
+                if ("1".Equals(sv.done)) //保存したデータの完了フラグが立っていたら
+                {
+                    SaveData sv1 = new SaveData();
+                    sv1.lotNo = int.Parse(Global.lotNo);
+                    sv1.serialNo = sv.serialNo;
+                    sv1.done = "1";
+                    updateDoneFlag(sv1, "１回目", conn);//１回目の完了フラグも立てる
+                }
+            }
+
             conn.Close();
             return err;
         }
@@ -295,6 +374,7 @@ namespace MedicalCheckInputTool
                 {
                     //無かった
                     textBox1.BackColor = Color.Pink;
+                    err = true;
                     reader.Close();
                 }
                 else
@@ -302,7 +382,7 @@ namespace MedicalCheckInputTool
                     string[] row = new string[reader.FieldCount];
                     while (reader.Read())
                     {
-                        if( !sv.adminCode.Equals(isDBNull(reader, "世帯番号")))
+                        if (!sv.houseNo.Equals(isDBNull(reader, "世帯番号")))
                         {
                             textBox2.BackColor = Color.Pink;
                             err = true; 
@@ -505,7 +585,7 @@ namespace MedicalCheckInputTool
                                                       + "`修正日` = @updateDate,"
                                                       + "`修正者` = @updateUser,"
                                                       + "`完了` = @done "
-                                                      + "where `整理番号` = @serialNo";
+                                                      + "where `ロット番号` = @lotNo and `整理番号` = @serialNo";
 
             // コマンドを作成
             MySqlCommand cmd = new MySqlCommand(sql, conn);
@@ -550,6 +630,36 @@ namespace MedicalCheckInputTool
 
         }
 
+        private bool updateDoneFlag(SaveData sv, string tableName, MySqlConnection conn)
+        {
+            bool err = false;
+
+            string sql = "update `" + tableName + "` set `完了` = @done "
+                                          + "where `ロット番号` = @lotNo and `整理番号` = @serialNo";
+
+            // コマンドを作成
+            MySqlCommand cmd = new MySqlCommand(sql, conn);
+
+            // パラメータ設定
+            cmd.Parameters.Add(new MySqlParameter("lotNo", sv.lotNo));
+            cmd.Parameters.Add(new MySqlParameter("serialNo", sv.serialNo));
+            cmd.Parameters.Add(new MySqlParameter("done", sv.done));
+
+            try
+            {
+                // 実行
+                cmd.ExecuteNonQuery();
+            }
+            catch (SqlException ex)
+            {
+                // 例外処理
+                MessageBox.Show("例外発生:" + ex.Message);
+                return true;
+            }
+
+            return err;
+        }
+
         private void sendTabKey(TextBox textbox, int length)
         {
             if (textbox.Text.Length == length)
@@ -592,6 +702,8 @@ namespace MedicalCheckInputTool
             textBox15.Text = "";
             textBox16.Text = "";
 
+            label20.Text = "";
+
             textBox1.Focus();
         }
 
@@ -801,30 +913,6 @@ namespace MedicalCheckInputTool
             dspCount();
         }
 
-        private void textBox1_KeyPress(object sender, KeyPressEventArgs e)
-        {
-//            if (e.KeyChar == Keys.NumLock) // 「NumLock」タブ
-//            {
-//                SendKeys.Send("{Tab}");
-//                e.Handled = true;
-//            }
-            if (e.KeyChar == '/') // 「/」BackSpace
-            {
-                SendKeys.Send("{BS}");
-                e.Handled = true;
-            }
-            if (e.KeyChar == '+') // 「+」次へ
-            {
-                button2.Focus();
-                button2.PerformClick();
-                e.Handled = true;
-            }
-            if (e.KeyChar == '*') // 「*」無効
-            {
-                e.Handled = true;
-            }
-        }
-
         //復元
         private void button3_Click(object sender, EventArgs e)
         {
@@ -939,5 +1027,123 @@ namespace MedicalCheckInputTool
             }
         }
 
+        private void shortcutKey(object sender, KeyPressEventArgs e)
+        {
+            if (e.KeyChar == '/') // 「/」BackSpace
+            {
+                SendKeys.Send("{BS}");
+                e.Handled = true;
+            }
+            if (e.KeyChar == '+') // 「+」次へ
+            {
+//                button2.Focus();
+//                button2.PerformClick();
+                e.Handled = true;
+            }
+            if (e.KeyChar == '*') // 「*」Tab
+            {
+//                SendKeys.Send("{Tab}");
+                e.Handled = true;
+            }
+        }
+
+        private void textBox1_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox2_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox4_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox5_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox6_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox7_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox8_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox9_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox10_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox11_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox12_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox13_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox14_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox15_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void textBox16_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            shortcutKey(sender, e);
+        }
+
+        private void Form2_KeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode == Keys.Multiply)
+            {
+                SendKeys.Send("{Tab}");
+                e.Handled = true;
+            }
+
+            if(e.KeyCode == Keys.Add)
+            {
+                button2.Focus();
+                button2.PerformClick();
+                e.Handled = true;
+            }
+
+            if(e.KeyCode == Keys.Enter)
+            {
+//                button1.Focus();
+                button1.PerformClick();
+                e.Handled = true;
+            }
+        }
+
     }
 }

@@ -116,6 +116,7 @@
             this.button2.TabIndex = 3;
             this.button2.Text = "チェック";
             this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // checkBox1
             // 
@@ -126,6 +127,7 @@
             this.checkBox1.TabIndex = 4;
             this.checkBox1.Text = "未完了データのみ表示";
             this.checkBox1.UseVisualStyleBackColor = true;
+            this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged);
             // 
             // dataGridView1
             // 
@@ -177,6 +179,7 @@
             this.dataGridView1.RowTemplate.Height = 21;
             this.dataGridView1.Size = new System.Drawing.Size(1040, 381);
             this.dataGridView1.TabIndex = 5;
+            this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
             // 
             // label2
             // 
@@ -216,6 +219,7 @@
             this.checkBox2.TabIndex = 9;
             this.checkBox2.Text = "１回目を軸";
             this.checkBox2.UseVisualStyleBackColor = true;
+            this.checkBox2.CheckedChanged += new System.EventHandler(this.checkBox2_CheckedChanged);
             // 
             // checkBox3
             // 
@@ -228,14 +232,16 @@
             this.checkBox3.TabIndex = 10;
             this.checkBox3.Text = "２回目を軸";
             this.checkBox3.UseVisualStyleBackColor = true;
+            this.checkBox3.CheckedChanged += new System.EventHandler(this.checkBox3_CheckedChanged);
             // 
             // comboBox1
             // 
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(772, 69);
+            this.comboBox1.Location = new System.Drawing.Point(789, 69);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(85, 20);
+            this.comboBox1.Size = new System.Drawing.Size(68, 20);
             this.comboBox1.TabIndex = 11;
+            this.comboBox1.SelectionChangeCommitted += new System.EventHandler(this.comboBox1_SelectionChangeCommitted);
             // 
             // button3
             // 
@@ -245,6 +251,7 @@
             this.button3.TabIndex = 12;
             this.button3.Text = "＜";
             this.button3.UseVisualStyleBackColor = true;
+            this.button3.Click += new System.EventHandler(this.button3_Click);
             // 
             // label5
             // 
@@ -263,6 +270,7 @@
             this.button4.TabIndex = 14;
             this.button4.Text = "＞";
             this.button4.UseVisualStyleBackColor = true;
+            this.button4.Click += new System.EventHandler(this.button4_Click);
             // 
             // 状況
             // 
@@ -278,13 +286,16 @@
             this.編集1.ReadOnly = true;
             this.編集1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.編集1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.編集1.Width = 30;
+            this.編集1.Text = "編集";
+            this.編集1.UseColumnTextForButtonValue = true;
+            this.編集1.Width = 40;
             // 
             // f_行政区コード
             // 
             this.f_行政区コード.HeaderText = "l_行政区コード";
             this.f_行政区コード.Name = "f_行政区コード";
             this.f_行政区コード.ReadOnly = true;
+            this.f_行政区コード.Width = 50;
             // 
             // f_整理番号
             // 
@@ -392,7 +403,9 @@
             this.編集2.HeaderText = "編集(2)";
             this.編集2.Name = "編集2";
             this.編集2.ReadOnly = true;
-            this.編集2.Width = 30;
+            this.編集2.Text = "編集";
+            this.編集2.UseColumnTextForButtonValue = true;
+            this.編集2.Width = 40;
             // 
             // s_行政区コード
             // 
@@ -401,6 +414,7 @@
             this.s_行政区コード.ReadOnly = true;
             this.s_行政区コード.Resizable = System.Windows.Forms.DataGridViewTriState.True;
             this.s_行政区コード.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.s_行政区コード.Width = 50;
             // 
             // s_整理番号
             // 

@@ -14,7 +14,7 @@ namespace MedicalCheckInputTool
 {
     public partial class Form3 : Form
     {
-        private const int PAGEMAX = 100;
+        private const int PAGEMAX = 10;
         private int currentPageNo = 1;
         private int maxPageNo = 1;
 
@@ -23,6 +23,8 @@ namespace MedicalCheckInputTool
             InitializeComponent();
 
             this.Text = "ロット: " + EditParam.lotNo + "  ユーザ: " + EditParam.inputUser;
+
+            this.label2.Text = "";
         }
 
         private void setPage()
@@ -31,7 +33,7 @@ namespace MedicalCheckInputTool
             MySqlConnection readerCon = new MySqlConnection(connstr);
             readerCon.Open();
             string countQuery = "select count(*) from page_compare where ";
-            string orderby = " order by `f_行政区コード`, `f_整理番号`";
+//            string orderby = " order by `f_行政区コード`, `f_整理番号`";
 
             // ロットの指定は必須
             countQuery += "(`f_ロット番号` = " + EditParam.lotNo + " or `s_ロット番号` = " + EditParam.lotNo + ") ";
@@ -62,7 +64,7 @@ namespace MedicalCheckInputTool
                 }
             }
             // 並び順
-            countQuery += orderby;
+//            countQuery += orderby;
 
             //ページ設定
             MySqlCommand cntCmd = new MySqlCommand(countQuery, readerCon);
@@ -99,7 +101,7 @@ namespace MedicalCheckInputTool
             readerCon.Open();
             string readQuery = "select * from page_compare where ";
             string orderby = " order by `f_行政区コード`, `f_整理番号`";
-            string pageing = " limit " + PAGEMAX + " offset " + ((currentPageNo - 1) * PAGEMAX);
+            string paging = " limit " + PAGEMAX + " offset " + ((currentPageNo - 1) * PAGEMAX);
 
             // ロットの指定は必須
             readQuery += "(`f_ロット番号` = " + EditParam.lotNo + " or `s_ロット番号` = " + EditParam.lotNo + ") ";
@@ -111,7 +113,8 @@ namespace MedicalCheckInputTool
 
             if (this.checkBox1.Checked)
             {
-                readQuery += " and (`f_完了` <> 1 or `s_完了` <> 1)";
+//                readQuery += " and (`f_完了` <> 1 or `s_完了` <> 1)";
+                readQuery += " and (`f_完了` is null or `s_完了` is null)";
             }
 
             if (this.checkBox2.Checked && this.checkBox3.Checked)
@@ -133,18 +136,17 @@ namespace MedicalCheckInputTool
             readQuery += orderby;
 
             //ページ指定
-            readQuery += pageing;
+            readQuery += paging;
 
             MySqlCommand readCmd = new MySqlCommand(readQuery, readerCon);
             MySqlDataReader reader = readCmd.ExecuteReader();
 
             this.dataGridView1.Rows.Clear();
-            //adapter.Fill(ds);
             while (reader.Read())
             {
                 DataGridViewRow row = new DataGridViewRow();
                 row.CreateCells(this.dataGridView1);
-                row.Cells[0].Value = (this.isDBNull(reader, "s_完了") == "1") ? "一致" : "不一致"; ;
+                row.Cells[0].Value = (this.isDBNull(reader, "f_完了") == "1") ? "一致" : "不一致";
                 this.dataGridView1.Rows.Add(row);
                 foreach (string prefix in new string[2] { "f_", "s_" })
                 {
@@ -269,12 +271,261 @@ namespace MedicalCheckInputTool
             }
         }
 
+        // 行マッチ判定
+        private void check()
+        {
+            // 行マッチングデータを取得
+            string connstr = System.Configuration.ConfigurationManager.AppSettings["Conn"];
+
+            // 更新用Connection
+            MySqlConnection updateCon = new MySqlConnection(connstr);
+            updateCon.Open();
+
+            /*
+            // 一度フラグを落とす
+            string resetFsql = "update `１回目` set `完了` = 0 where `ロット番号` = @lot";
+            if (!"".Equals(textBox1.Text))
+            {
+                resetFsql += " and `整理番号` like '%" + textBox1.Text + "%'";
+            }
+            MySqlCommand resetFirst = new MySqlCommand(resetFsql, updateCon);
+            resetFirst.Parameters.AddWithValue("lot", EditParam.lotNo);
+            resetFirst.ExecuteNonQuery();
+
+            string resetSsql = "update `２回目` set `完了` = 0 where `ロット番号` = @lot";
+            if (!"".Equals(textBox1.Text))
+            {
+                resetSsql += " and `整理番号` like '%" + textBox1.Text + "%'";
+            }
+            MySqlCommand resetSecond = new MySqlCommand(resetSsql, updateCon);
+            resetSecond.Parameters.AddWithValue("lot", EditParam.lotNo);
+            resetSecond.ExecuteNonQuery();
+             */
+
+            // フラグ更新用コマンド
+            MySqlCommand updateFirst = new MySqlCommand("update `１回目` set `完了` = 1 where " +
+              "`ロット番号` = @lot and " +
+              "`整理番号` = @serialCode", updateCon);
+            // フラグ更新用コマンド
+            MySqlCommand updateSecond = new MySqlCommand("update `２回目` set `完了` = 1 where " +
+              "`ロット番号` = @lot and " +
+              "`整理番号` = @serialCode", updateCon);
+
+            // 行突合データを取得する
+            // 参照用Connection
+            MySqlConnection readerCon = new MySqlConnection(connstr);
+            readerCon.Open();
+            string readQuery = "select * from page_compare where (`f_ロット番号` = @f_lot or `s_ロット番号` = @s_lot) and (`f_完了` <> 1 or `s_完了` <> 1)";
+            string orderby = " order by `f_行政区コード`, `f_整理番号`, `s_行政区コード`, `s_整理番号`";
+            if (!"".Equals(textBox1.Text))
+            {
+                readQuery += " and (`f_整理番号` like '%" + textBox1.Text + "%' or `s_整理番号` like '%" + textBox1.Text + "%')";
+            }
+            readQuery += orderby;
+            MySqlCommand readCmd = new MySqlCommand(readQuery, readerCon);
+            readCmd.Parameters.AddWithValue("f_lot", EditParam.lotNo);
+            readCmd.Parameters.AddWithValue("s_lot", EditParam.lotNo);
+            MySqlDataReader reader = readCmd.ExecuteReader();
+
+            while (reader.Read())
+            {
+                // 各種値のチェック
+                bool IsMatch = true;
+                // 各項目の一致をチェックする
+                // 整理番号
+                if (!this.isDBNull(reader, "f_整理番号").Equals(this.isDBNull(reader, "s_整理番号")))
+                {
+                    IsMatch = false;
+                }
+                // 世帯番号
+                if (!this.isDBNull(reader, "f_世帯番号").Equals(this.isDBNull(reader, "s_世帯番号")))
+                {
+                    IsMatch = false;
+                }
+                // 健康診査
+                if (!this.isDBNull(reader, "f_健康診査").Equals(this.isDBNull(reader, "s_健康診査")))
+                {
+                    IsMatch = false;
+                }
+                // 結核肺がん
+                if (!this.isDBNull(reader, "f_結核肺がん").Equals(this.isDBNull(reader, "s_結核肺がん")))
+                {
+                    IsMatch = false;
+                }
+                // 胃がん
+                if (!this.isDBNull(reader, "f_胃がん").Equals(this.isDBNull(reader, "s_胃がん")))
+                {
+                    IsMatch = false;
+                }
+                // 大腸がん
+                if (!this.isDBNull(reader, "f_大腸がん").Equals(this.isDBNull(reader, "s_大腸がん")))
+                {
+                    IsMatch = false;
+                }
+                // 前立腺がん
+                if (!this.isDBNull(reader, "f_前立腺がん").Equals(this.isDBNull(reader, "s_前立腺がん")))
+                {
+                    IsMatch = false;
+                }
+                // 骨粗鬆症
+                if (!this.isDBNull(reader, "f_骨粗鬆症").Equals(this.isDBNull(reader, "s_骨粗鬆症")))
+                {
+                    IsMatch = false;
+                }
+                // 成人歯科
+                if (!this.isDBNull(reader, "f_成人歯科").Equals(this.isDBNull(reader, "s_成人歯科")))
+                {
+                     IsMatch = false;
+                }
+                // 子宮頸がん
+                if (!this.isDBNull(reader, "f_子宮頸がん").Equals(this.isDBNull(reader, "s_子宮頸がん")))
+                {
+                    IsMatch = false;
+                }
+                // 乳がん
+                if (!this.isDBNull(reader, "f_乳がん").Equals(this.isDBNull(reader, "s_乳がん")))
+                {
+                    IsMatch = false;
+                }
+                // 希望場所
+                if (!this.isDBNull(reader, "f_希望場所").Equals(this.isDBNull(reader, "s_希望場所")))
+                {
+                    IsMatch = false;
+                }
+                // 身体不自由
+                if (!this.isDBNull(reader, "f_身体不自由").Equals(this.isDBNull(reader, "s_身体不自由")))
+                {
+                    IsMatch = false;
+                }
+                // 電話番号
+                if (!this.isDBNull(reader, "f_電話番号").Equals(this.isDBNull(reader, "s_電話番号")))
+                {
+                    IsMatch = false;
+                }
+                // 携帯番号
+                if (!this.isDBNull(reader, "f_携帯番号").Equals(this.isDBNull(reader, "s_携帯番号")))
+                {
+                    IsMatch = false;
+                }
+
+                // マッチはフラグを更新する
+                if (IsMatch)
+                {
+                    updateFirst.Parameters.Clear();
+                    updateFirst.Parameters.AddWithValue("lot", EditParam.lotNo);
+                    updateFirst.Parameters.AddWithValue("serialCode", this.isDBNull(reader, "f_整理番号"));
+                    updateFirst.ExecuteNonQuery();
+
+                    updateSecond.Parameters.Clear();
+                    updateSecond.Parameters.AddWithValue("lot", EditParam.lotNo);
+                    updateSecond.Parameters.AddWithValue("serialCode", this.isDBNull(reader, "f_整理番号"));
+                    updateSecond.ExecuteNonQuery();
+                }
+            }
+
+            updateCon.Close();
+            readerCon.Close();
+        }
+
         //検索
         private void button1_Click(object sender, EventArgs e)
         {
             this.setPage();
+            this.check();
             this.search();
         }
 
+        //チェック
+        private void button2_Click(object sender, EventArgs e)
+        {
+            this.check();
+            this.search();
+        }
+
+        private void checkBox1_CheckedChanged(object sender, EventArgs e)
+        {
+            this.setPage();
+            this.search();
+        }
+
+        private void checkBox2_CheckedChanged(object sender, EventArgs e)
+        {
+            this.setPage();
+            this.search();
+        }
+
+        private void checkBox3_CheckedChanged(object sender, EventArgs e)
+        {
+            this.setPage();
+            this.search();
+        }
+
+        //前へ
+        private void button3_Click(object sender, EventArgs e)
+        {
+            if (currentPageNo <= 1)
+            {
+                return;
+            }
+            currentPageNo--;
+            comboBox1.SelectedIndex = currentPageNo - 1;
+
+            this.search();
+        }
+
+        //次へ
+        private void button4_Click(object sender, EventArgs e)
+        {
+            if (currentPageNo >= maxPageNo)
+            {
+                return;
+            }
+            currentPageNo++;
+            comboBox1.SelectedIndex = currentPageNo - 1;
+
+            this.search();
+        }
+
+        //ページジャンプ
+        private void comboBox1_SelectionChangeCommitted(object sender, EventArgs e)
+        {
+            currentPageNo = int.Parse(comboBox1.SelectedItem.ToString());
+            this.search();
+        }
+
+        private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            DataGridView dgv = (DataGridView)sender;
+            if (dgv.Columns[e.ColumnIndex].Name == "編集1")
+            {
+                // 整理番号を取得
+                string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
+                Global.lotNo = EditParam.lotNo;
+                Global.times = "１回目";
+                Global.inputUser = EditParam.inputUser;
+                if (serialNo != "")
+                {
+                    Form form2 = new Form2(serialNo);
+                    form2.ShowDialog();
+                    form2.Dispose();
+                }
+            }
+            if (dgv.Columns[e.ColumnIndex].Name == "編集2")
+            {
+                // 整理番号を取得
+                string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
+                Global.lotNo = EditParam.lotNo;
+                Global.times = "２回目";
+                Global.inputUser = EditParam.inputUser;
+                if (serialNo != "")
+                {
+                    Form form2 = new Form2(serialNo);
+                    form2.ShowDialog();
+                    form2.Dispose();
+                }
+            }
+
+        }
+
     }
 }