Tools / 2016PE · Commits

Commit c2c26f1981d441ae344fdace03d7340feec7371f

Authored by r-ujihara
1 parent 30d58f43
build: skipped

再指摘反映

Inline Side-by-side
Showing 4 changed files with 40 additions and 11 deletions
@@ -99,6 +99,7 @@ @@ -99,6 +99,7 @@
99 this.label25 = new System.Windows.Forms.Label(); 99 this.label25 = new System.Windows.Forms.Label();
100 this.textBox33 = new System.Windows.Forms.TextBox(); 100 this.textBox33 = new System.Windows.Forms.TextBox();
101 this.textBox34 = new System.Windows.Forms.TextBox(); 101 this.textBox34 = new System.Windows.Forms.TextBox();
  102 + this.label26 = new System.Windows.Forms.Label();
102 this.panel1.SuspendLayout(); 103 this.panel1.SuspendLayout();
103 this.SuspendLayout(); 104 this.SuspendLayout();
104 // 105 //
@@ -395,7 +396,7 @@ @@ -395,7 +396,7 @@
395 // label18 396 // label18
396 // 397 //
397 this.label18.AutoSize = true; 398 this.label18.AutoSize = true;
398 - this.label18.Location = new System.Drawing.Point(82, 550); 399 + this.label18.Location = new System.Drawing.Point(82, 566);
399 this.label18.Name = "label18"; 400 this.label18.Name = "label18";
400 this.label18.Size = new System.Drawing.Size(65, 12); 401 this.label18.Size = new System.Drawing.Size(65, 12);
401 this.label18.TabIndex = 31; 402 this.label18.TabIndex = 31;
@@ -415,7 +416,7 @@ @@ -415,7 +416,7 @@
415 // textBox16 416 // textBox16
416 // 417 //
417 this.textBox16.ImeMode = System.Windows.Forms.ImeMode.Off; 418 this.textBox16.ImeMode = System.Windows.Forms.ImeMode.Off;
418 - this.textBox16.Location = new System.Drawing.Point(163, 547); 419 + this.textBox16.Location = new System.Drawing.Point(163, 563);
419 this.textBox16.MaxLength = 1; 420 this.textBox16.MaxLength = 1;
420 this.textBox16.Name = "textBox16"; 421 this.textBox16.Name = "textBox16";
421 this.textBox16.Size = new System.Drawing.Size(31, 19); 422 this.textBox16.Size = new System.Drawing.Size(31, 19);
@@ -425,17 +426,18 @@ @@ -425,17 +426,18 @@
425 // 426 //
426 // button1 427 // button1
427 // 428 //
428 - this.button1.Location = new System.Drawing.Point(232, 608); 429 + this.button1.Location = new System.Drawing.Point(232, 616);
429 this.button1.Name = "button1"; 430 this.button1.Name = "button1";
430 this.button1.Size = new System.Drawing.Size(75, 23); 431 this.button1.Size = new System.Drawing.Size(75, 23);
431 this.button1.TabIndex = 35; 432 this.button1.TabIndex = 35;
432 this.button1.Text = "保存"; 433 this.button1.Text = "保存";
433 this.button1.UseVisualStyleBackColor = true; 434 this.button1.UseVisualStyleBackColor = true;
  435 + this.button1.Visible = false;
434 this.button1.Click += new System.EventHandler(this.button1_Click); 436 this.button1.Click += new System.EventHandler(this.button1_Click);
435 // 437 //
436 // button2 438 // button2
437 // 439 //
438 - this.button2.Location = new System.Drawing.Point(313, 608); 440 + this.button2.Location = new System.Drawing.Point(313, 616);
439 this.button2.Name = "button2"; 441 this.button2.Name = "button2";
440 this.button2.Size = new System.Drawing.Size(86, 23); 442 this.button2.Size = new System.Drawing.Size(86, 23);
441 this.button2.TabIndex = 36; 443 this.button2.TabIndex = 36;
@@ -456,7 +458,7 @@ @@ -456,7 +458,7 @@
456 // 458 //
457 // button4 459 // button4
458 // 460 //
459 - this.button4.Location = new System.Drawing.Point(10, 608); 461 + this.button4.Location = new System.Drawing.Point(10, 616);
460 this.button4.Name = "button4"; 462 this.button4.Name = "button4";
461 this.button4.Size = new System.Drawing.Size(75, 23); 463 this.button4.Size = new System.Drawing.Size(75, 23);
462 this.button4.TabIndex = 37; 464 this.button4.TabIndex = 37;
@@ -495,7 +497,7 @@ @@ -495,7 +497,7 @@
495 // 497 //
496 // button5 498 // button5
497 // 499 //
498 - this.button5.Location = new System.Drawing.Point(91, 608); 500 + this.button5.Location = new System.Drawing.Point(91, 616);
499 this.button5.Name = "button5"; 501 this.button5.Name = "button5";
500 this.button5.Size = new System.Drawing.Size(75, 23); 502 this.button5.Size = new System.Drawing.Size(75, 23);
501 this.button5.TabIndex = 41; 503 this.button5.TabIndex = 41;
@@ -538,7 +540,7 @@ @@ -538,7 +540,7 @@
538 this.panel1.Controls.Add(this.textBox3); 540 this.panel1.Controls.Add(this.textBox3);
539 this.panel1.Location = new System.Drawing.Point(371, 72); 541 this.panel1.Location = new System.Drawing.Point(371, 72);
540 this.panel1.Name = "panel1"; 542 this.panel1.Name = "panel1";
541 - this.panel1.Size = new System.Drawing.Size(109, 506); 543 + this.panel1.Size = new System.Drawing.Size(109, 521);
542 this.panel1.TabIndex = 43; 544 this.panel1.TabIndex = 43;
543 this.panel1.Visible = false; 545 this.panel1.Visible = false;
544 // 546 //
@@ -588,7 +590,7 @@ @@ -588,7 +590,7 @@
588 // 590 //
589 // textBox30 591 // textBox30
590 // 592 //
591 - this.textBox30.Location = new System.Drawing.Point(3, 471); 593 + this.textBox30.Location = new System.Drawing.Point(3, 487);
592 this.textBox30.MaxLength = 1; 594 this.textBox30.MaxLength = 1;
593 this.textBox30.Name = "textBox30"; 595 this.textBox30.Name = "textBox30";
594 this.textBox30.ReadOnly = true; 596 this.textBox30.ReadOnly = true;
@@ -763,7 +765,7 @@ @@ -763,7 +765,7 @@
763 // 765 //
764 // button7 766 // button7
765 // 767 //
766 - this.button7.Location = new System.Drawing.Point(405, 608); 768 + this.button7.Location = new System.Drawing.Point(405, 616);
767 this.button7.Name = "button7"; 769 this.button7.Name = "button7";
768 this.button7.Size = new System.Drawing.Size(75, 23); 770 this.button7.Size = new System.Drawing.Size(75, 23);
769 this.button7.TabIndex = 45; 771 this.button7.TabIndex = 45;
@@ -848,11 +850,22 @@ @@ -848,11 +850,22 @@
848 this.textBox34.TextChanged += new System.EventHandler(this.textBox34_TextChanged); 850 this.textBox34.TextChanged += new System.EventHandler(this.textBox34_TextChanged);
849 this.textBox34.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox34_KeyPress); 851 this.textBox34.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox34_KeyPress);
850 // 852 //
  853 + // label26
  854 + //
  855 + this.label26.AutoSize = true;
  856 + this.label26.ForeColor = System.Drawing.SystemColors.ActiveBorder;
  857 + this.label26.Location = new System.Drawing.Point(8, 548);
  858 + this.label26.Name = "label26";
  859 + this.label26.Size = new System.Drawing.Size(269, 12);
  860 + this.label26.TabIndex = 52;
  861 + this.label26.Text = "――――――――――――――――――――――";
  862 + //
851 // Form2 863 // Form2
852 // 864 //
853 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); 865 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
854 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 866 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
855 - this.ClientSize = new System.Drawing.Size(492, 643); 867 + this.ClientSize = new System.Drawing.Size(492, 651);
  868 + this.Controls.Add(this.label26);
856 this.Controls.Add(this.textBox34); 869 this.Controls.Add(this.textBox34);
857 this.Controls.Add(this.textBox33); 870 this.Controls.Add(this.textBox33);
858 this.Controls.Add(this.label25); 871 this.Controls.Add(this.label25);
@@ -989,5 +1002,6 @@ @@ -989,5 +1002,6 @@
989 private System.Windows.Forms.TextBox textBox37; 1002 private System.Windows.Forms.TextBox textBox37;
990 private System.Windows.Forms.TextBox textBox36; 1003 private System.Windows.Forms.TextBox textBox36;
991 private System.Windows.Forms.TextBox textBox35; 1004 private System.Windows.Forms.TextBox textBox35;
  1005 + private System.Windows.Forms.Label label26;
992 } 1006 }
993 } 1007 }
@@ -897,22 +897,26 @@ namespace MedicalCheckInputTool @@ -897,22 +897,26 @@ namespace MedicalCheckInputTool
897 897
898 private void textBox15_TextChanged(object sender, EventArgs e) //希望場所 898 private void textBox15_TextChanged(object sender, EventArgs e) //希望場所
899 { 899 {
  900 + dspModify(textBox15, label17);
900 sendTabKey(textBox15, 1); 901 sendTabKey(textBox15, 1);
901 } 902 }
902 903
903 private void textBox33_TextChanged(object sender, EventArgs e) //希望場所（本庁個別） 904 private void textBox33_TextChanged(object sender, EventArgs e) //希望場所（本庁個別）
904 { 905 {
  906 + dspModify(textBox33, label24);
905 sendTabKey(textBox15, 1); 907 sendTabKey(textBox15, 1);
906 } 908 }
907 909
908 private void textBox34_TextChanged(object sender, EventArgs e)//希望場所（石巻ロイヤル） 910 private void textBox34_TextChanged(object sender, EventArgs e)//希望場所（石巻ロイヤル）
909 { 911 {
  912 + dspModify(textBox34, label25);
910 sendTabKey(textBox15, 1); 913 sendTabKey(textBox15, 1);
911 } 914 }
912 915
913 916
914 private void textBox16_TextChanged(object sender, EventArgs e) //身体不自由 917 private void textBox16_TextChanged(object sender, EventArgs e) //身体不自由
915 { 918 {
  919 + dspModify(textBox16, label18);
916 sendTabKey(textBox16, 1); 920 sendTabKey(textBox16, 1);
917 } 921 }
918 922
@@ -1672,6 +1676,8 @@ namespace MedicalCheckInputTool @@ -1672,6 +1676,8 @@ namespace MedicalCheckInputTool
1672 } 1676 }
1673 else if ("１回目の保存".Equals(btxt)) 1677 else if ("１回目の保存".Equals(btxt))
1674 { 1678 {
  1679 + changeEdit(false);
  1680 + button6.Text = "１回目の編集";
1675 //データ保存 1681 //データ保存
1676 updateDataOnce(conn); 1682 updateDataOnce(conn);
1677 } 1683 }
@@ -118,6 +118,7 @@ @@ -118,6 +118,7 @@
118 this.button2.TabIndex = 3; 118 this.button2.TabIndex = 3;
119 this.button2.Text = "チェック"; 119 this.button2.Text = "チェック";
120 this.button2.UseVisualStyleBackColor = true; 120 this.button2.UseVisualStyleBackColor = true;
  121 + this.button2.Visible = false;
121 this.button2.Click += new System.EventHandler(this.button2_Click); 122 this.button2.Click += new System.EventHandler(this.button2_Click);
122 // 123 //
123 // checkBox1 124 // checkBox1
@@ -342,6 +342,10 @@ namespace MedicalCheckInputTool @@ -342,6 +342,10 @@ namespace MedicalCheckInputTool
342 { 342 {
343 // 整理番号を取得 343 // 整理番号を取得
344 string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString(); 344 string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
  345 + if ("".Equals(serialNo)) //なかったら２回目の番号を入れて起動
  346 + {
  347 + serialNo = dgv.Rows[e.RowIndex].Cells["s_整理番号"].Value.ToString();
  348 + }
345 Global.lotNo = EditParam.lotNo; 349 Global.lotNo = EditParam.lotNo;
346 Global.times = "１回目"; 350 Global.times = "１回目";
347 Global.inputUser = EditParam.inputUser; 351 Global.inputUser = EditParam.inputUser;
@@ -355,7 +359,11 @@ namespace MedicalCheckInputTool @@ -355,7 +359,11 @@ namespace MedicalCheckInputTool
355 if (dgv.Columns[e.ColumnIndex].Name == "編集2") 359 if (dgv.Columns[e.ColumnIndex].Name == "編集2")
356 { 360 {
357 // 整理番号を取得 361 // 整理番号を取得
358 - string serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString(); 362 + string serialNo = dgv.Rows[e.RowIndex].Cells["s_整理番号"].Value.ToString();
  363 + if ("".Equals(serialNo)) //なかったら１回目の番号を入れて起動
  364 + {
  365 + serialNo = dgv.Rows[e.RowIndex].Cells["f_整理番号"].Value.ToString();
  366 + }
359 Global.lotNo = EditParam.lotNo; 367 Global.lotNo = EditParam.lotNo;
360 Global.times = "２回目"; 368 Global.times = "２回目";
361 Global.inputUser = EditParam.inputUser; 369 Global.inputUser = EditParam.inputUser;
Please register or login to post a comment