再指摘反映

@@ -99,6 +99,7 @@
             this.label25 = new System.Windows.Forms.Label();
             this.textBox33 = new System.Windows.Forms.TextBox();
             this.textBox34 = new System.Windows.Forms.TextBox();
+            this.label26 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -395,7 +396,7 @@
             // label18
             // 
             this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(82, 550);
+            this.label18.Location = new System.Drawing.Point(82, 566);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(65, 12);
             this.label18.TabIndex = 31;
@@ -415,7 +416,7 @@
             // textBox16
             // 
             this.textBox16.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.textBox16.Location = new System.Drawing.Point(163, 547);
+            this.textBox16.Location = new System.Drawing.Point(163, 563);
             this.textBox16.MaxLength = 1;
             this.textBox16.Name = "textBox16";
             this.textBox16.Size = new System.Drawing.Size(31, 19);
@@ -425,17 +426,18 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(232, 608);
+            this.button1.Location = new System.Drawing.Point(232, 616);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(75, 23);
             this.button1.TabIndex = 35;
             this.button1.Text = "保存";
             this.button1.UseVisualStyleBackColor = true;
+            this.button1.Visible = false;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(313, 608);
+            this.button2.Location = new System.Drawing.Point(313, 616);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(86, 23);
             this.button2.TabIndex = 36;
@@ -456,7 +458,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(10, 608);
+            this.button4.Location = new System.Drawing.Point(10, 616);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(75, 23);
             this.button4.TabIndex = 37;
@@ -495,7 +497,7 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(91, 608);
+            this.button5.Location = new System.Drawing.Point(91, 616);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(75, 23);
             this.button5.TabIndex = 41;
@@ -538,7 +540,7 @@
             this.panel1.Controls.Add(this.textBox3);
             this.panel1.Location = new System.Drawing.Point(371, 72);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(109, 506);
+            this.panel1.Size = new System.Drawing.Size(109, 521);
             this.panel1.TabIndex = 43;
             this.panel1.Visible = false;
             // 
@@ -588,7 +590,7 @@
             // 
             // textBox30
             // 
-            this.textBox30.Location = new System.Drawing.Point(3, 471);
+            this.textBox30.Location = new System.Drawing.Point(3, 487);
             this.textBox30.MaxLength = 1;
             this.textBox30.Name = "textBox30";
             this.textBox30.ReadOnly = true;
@@ -763,7 +765,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(405, 608);
+            this.button7.Location = new System.Drawing.Point(405, 616);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(75, 23);
             this.button7.TabIndex = 45;
@@ -848,11 +850,22 @@
             this.textBox34.TextChanged += new System.EventHandler(this.textBox34_TextChanged);
             this.textBox34.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox34_KeyPress);
             // 
+            // label26
+            // 
+            this.label26.AutoSize = true;
+            this.label26.ForeColor = System.Drawing.SystemColors.ActiveBorder;
+            this.label26.Location = new System.Drawing.Point(8, 548);
+            this.label26.Name = "label26";
+            this.label26.Size = new System.Drawing.Size(269, 12);
+            this.label26.TabIndex = 52;
+            this.label26.Text = "――――――――――――――――――――――";
+            // 
             // Form2
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(492, 643);
+            this.ClientSize = new System.Drawing.Size(492, 651);
+            this.Controls.Add(this.label26);
             this.Controls.Add(this.textBox34);
             this.Controls.Add(this.textBox33);
             this.Controls.Add(this.label25);
@@ -989,5 +1002,6 @@
         private System.Windows.Forms.TextBox textBox37;
         private System.Windows.Forms.TextBox textBox36;
         private System.Windows.Forms.TextBox textBox35;
+        private System.Windows.Forms.Label label26;
     }
 }
\ No newline at end of file

@@ -897,22 +897,26 @@ namespace MedicalCheckInputTool
 
         private void textBox15_TextChanged(object sender, EventArgs e) //希望場所
         {
+            dspModify(textBox15, label17);
             sendTabKey(textBox15, 1);
         }
 
         private void textBox33_TextChanged(object sender, EventArgs e) //希望場所（本庁個別）
         {
+            dspModify(textBox33, label24);
             sendTabKey(textBox15, 1);
         }
 
         private void textBox34_TextChanged(object sender, EventArgs e)//希望場所（石巻ロイヤル）
         {
+            dspModify(textBox34, label25);
             sendTabKey(textBox15, 1);
         }
 
 
         private void textBox16_TextChanged(object sender, EventArgs e) //身体不自由
         {
+            dspModify(textBox16, label18);
             sendTabKey(textBox16, 1);
         }
 
@@ -1672,6 +1676,8 @@ namespace MedicalCheckInputTool
             }
             else if ("１回目の保存".Equals(btxt))
             {
+                changeEdit(false);
+                button6.Text = "１回目の編集";
                 //データ保存
                 updateDataOnce(conn);
             }

@@ -118,6 +118,7 @@
             this.button2.TabIndex = 3;
             this.button2.Text = "チェック";
             this.button2.UseVisualStyleBackColor = true;
+            this.button2.Visible = false;
             this.button2.Click += new System.EventHandler(this.button2_Click);
             // 
             // checkBox1

@@ -342,6 +342,10 @@ namespace MedicalCheckInputTool
             {
                 // 整理番号を取得
                 string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
+                if ("".Equals(serialNo)) //なかったら２回目の番号を入れて起動
+                {
+                    serialNo = dgv.Rows[e.RowIndex].Cells["s_整理番号"].Value.ToString();
+                }
                 Global.lotNo = EditParam.lotNo;
                 Global.times = "１回目";
                 Global.inputUser = EditParam.inputUser;
@@ -355,7 +359,11 @@ namespace MedicalCheckInputTool
             if (dgv.Columns[e.ColumnIndex].Name == "編集2")
             {
                 // 整理番号を取得
-                string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
+                string serialNo = dgv.Rows[e.RowIndex].Cells["s_整理番号"].Value.ToString();
+                if ("".Equals(serialNo)) //なかったら１回目の番号を入れて起動
+                {
+                    serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
+                }
                 Global.lotNo = EditParam.lotNo;
                 Global.times = "２回目";
                 Global.inputUser = EditParam.inputUser;