コピペ許容とバグ修正

r-ujihara
1 parent c2c26f19
Showing 2 changed files with 45 additions and 9 deletions
MedicalCheckInputTool/Form2.Designer.cs
MedicalCheckInputTool/Form2.cs
--- a/MedicalCheckInputTool/Form2.Designer.cs
View file @fbff54e
+++ b/MedicalCheckInputTool/Form2.Designer.cs
View file @fbff54e
@@ -396,7 +396,7 @@
             // label18
             // 
             this.label18.AutoSize = true;
-            this.label18.Location = new System.Drawing.Point(82, 566);
+            this.label18.Location = new System.Drawing.Point(82, 563);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(65, 12);
             this.label18.TabIndex = 31;
@@ -416,7 +416,7 @@
             // textBox16
             // 
             this.textBox16.ImeMode = System.Windows.Forms.ImeMode.Off;
-            this.textBox16.Location = new System.Drawing.Point(163, 563);
+            this.textBox16.Location = new System.Drawing.Point(163, 559);
             this.textBox16.MaxLength = 1;
             this.textBox16.Name = "textBox16";
             this.textBox16.Size = new System.Drawing.Size(31, 19);
@@ -568,7 +568,7 @@
             // 
             // textBox36
             // 
-            this.textBox36.Location = new System.Drawing.Point(3, 365);
+            this.textBox36.Location = new System.Drawing.Point(3, 361);
             this.textBox36.MaxLength = 1;
             this.textBox36.Name = "textBox36";
             this.textBox36.ReadOnly = true;
@@ -854,7 +854,7 @@
             // 
             this.label26.AutoSize = true;
             this.label26.ForeColor = System.Drawing.SystemColors.ActiveBorder;
-            this.label26.Location = new System.Drawing.Point(8, 548);
+            this.label26.Location = new System.Drawing.Point(8, 544);
             this.label26.Name = "label26";
             this.label26.Size = new System.Drawing.Size(269, 12);
             this.label26.TabIndex = 52;
--- a/MedicalCheckInputTool/Form2.cs
View file @fbff54e
+++ b/MedicalCheckInputTool/Form2.cs
View file @fbff54e
@@ -49,6 +49,7 @@ namespace MedicalCheckInputTool
             conn = new MySqlConnection(connstr);
             conn.Open();
             string code = serialNo.PadLeft(10, '0');
+            bool noData = false;
             textBox1.Text = code;
             MySqlCommand cmd = new MySqlCommand("select * from `" + Global.times + "` where `ロット番号` = @lotNo and `整理番号` = @serialNo", conn);
@@ -63,6 +64,7 @@ namespace MedicalCheckInputTool
                 {
                     //無かった
                     reader.Close();
+                    noData = true;
                 }
                 else
                 {
@@ -98,6 +100,33 @@ namespace MedicalCheckInputTool
                     }
                     reader.Close();
                 }
+
+                if(noData) //修正からの遷移のときは新規かつ整理番号指定だけで来ることがあるので、その整理番号の行政区を別テーブルから調べる
+                {
+                    string times = "１回目".Equals(Global.times) ? "２回目" : "１回目";
+                    MySqlCommand cmd2 = new MySqlCommand("select * from `" + times + "` where `ロット番号` = @lotNo and `整理番号` = @serialNo", conn);
+                    // パラメータ設定
+                    cmd2.Parameters.Add(new MySqlParameter("lotNo", Global.lotNo));
+                    cmd2.Parameters.Add(new MySqlParameter("serialNo", serialNo));
+                    MySqlDataReader reader2 = cmd2.ExecuteReader();
+                    if (!reader2.HasRows)
+                    {
+                        //無かった
+                        reader2.Close(); //このルートはありえない
+                    }
+                    else
+                    {
+                        string[] row = new string[reader2.FieldCount];
+                        while (reader2.Read())
+                        {
+                            Global.adminCode = isDBNull(reader2, "行政区コード");
+                            Global.adminName = isDBNull(reader2, "行政区名称");
+                            Global.healthArea = isDBNull(reader2, "保健区");
+                        }
+                        reader2.Close();
+                    }
+
+                }
             }
             catch (SqlException )
             {
@@ -1105,7 +1134,10 @@ namespace MedicalCheckInputTool
         //入力可能(数字とハイフンとBS)
         private void inputAllNumber(object sender, KeyPressEventArgs e)
         {
-            if ((e.KeyChar < '0' || e.KeyChar > '9') && (e.KeyChar != '\b') && (e.KeyChar != '-'))
+            if ((e.KeyChar < '0' || e.KeyChar > '9') &&
+                (e.KeyChar != '\b') &&
+                (e.KeyChar != '-') &&
+                ((int)(e.KeyChar) != 3) && ((int)(e.KeyChar) != 24) && ((int)(e.KeyChar) != 22)) //3:CtrlC、24:CtrlX、22:CtrlV
             {
                 e.Handled = true;
             }
@@ -1527,14 +1559,14 @@ namespace MedicalCheckInputTool
         }
         //１回目の修正
-        private void updateDataOnce(MySqlConnection conn)
+        private SaveData updateDataOnce(MySqlConnection conn)
         {
             bool match = false;
             //入力チェック
             if ("".Equals(textBox3.Text)) //必須は整理番号のみ
             {
                 MessageBox.Show("整理番号が入力されていません");
-                return;
+                return null;
             }
             SaveData sv = makeSaveDataOnce(); //保存用データ生成（パディング済み）
@@ -1568,6 +1600,7 @@ namespace MedicalCheckInputTool
             string tableName = "２回目";
             updateDoneFlag(sv1, tableName, conn);//別の回の完了フラグも立てる
+            return sv;
         }
         private SaveData makeSaveDataOnce()
@@ -1679,7 +1712,11 @@ namespace MedicalCheckInputTool
                 changeEdit(false);
                 button6.Text = "１回目の編集";
                 //データ保存
-                updateDataOnce(conn);
+                SaveData sv = updateDataOnce(conn);
+                if (sv != null)
+                {
+                    selectDataOnce("１回目", sv.lotNo.ToString(), sv.serialNo, conn);//表示を今登録したデータにする
+                }
             }
             panel1.Visible = true;
@@ -1839,6 +1876,5 @@ namespace MedicalCheckInputTool
         }
-
     }
 }