Tools / 2016PE · Commits

Commit c2c1acac6f30e64d18279516cc0da3e84c32cb54

Authored by r-ujihara
1 parent 3a24af2b
build: skipped

レビュー内容反映（１回目）

Inline Side-by-side
Showing 6 changed files with 926 additions and 203 deletions
... ... @@ -70,6 +70,10 @@
70 70 this.button5 = new System.Windows.Forms.Button();
71 71 this.button6 = new System.Windows.Forms.Button();
72 72 this.panel1 = new System.Windows.Forms.Panel();
  73 + this.textBox38 = new System.Windows.Forms.TextBox();
  74 + this.textBox37 = new System.Windows.Forms.TextBox();
  75 + this.textBox36 = new System.Windows.Forms.TextBox();
  76 + this.textBox35 = new System.Windows.Forms.TextBox();
73 77 this.textBox30 = new System.Windows.Forms.TextBox();
74 78 this.textBox29 = new System.Windows.Forms.TextBox();
75 79 this.textBox28 = new System.Windows.Forms.TextBox();
... ... @@ -85,13 +89,23 @@
85 89 this.textBox18 = new System.Windows.Forms.TextBox();
86 90 this.textBox17 = new System.Windows.Forms.TextBox();
87 91 this.textBox3 = new System.Windows.Forms.TextBox();
  92 + this.label21 = new System.Windows.Forms.Label();
  93 + this.button7 = new System.Windows.Forms.Button();
  94 + this.textBox31 = new System.Windows.Forms.TextBox();
  95 + this.textBox32 = new System.Windows.Forms.TextBox();
  96 + this.label22 = new System.Windows.Forms.Label();
  97 + this.label23 = new System.Windows.Forms.Label();
  98 + this.label24 = new System.Windows.Forms.Label();
  99 + this.label25 = new System.Windows.Forms.Label();
  100 + this.textBox33 = new System.Windows.Forms.TextBox();
  101 + this.textBox34 = new System.Windows.Forms.TextBox();
88 102 this.panel1.SuspendLayout();
89 103 this.SuspendLayout();
90 104 //
91 105 // textBox1
92 106 //
93 107 this.textBox1.ImeMode = System.Windows.Forms.ImeMode.Off;
94   - this.textBox1.Location = new System.Drawing.Point(105, 65);
  108 + this.textBox1.Location = new System.Drawing.Point(163, 78);
95 109 this.textBox1.MaxLength = 10;
96 110 this.textBox1.Name = "textBox1";
97 111 this.textBox1.Size = new System.Drawing.Size(100, 19);
... ... @@ -103,7 +117,7 @@
103 117 // label1
104 118 //
105 119 this.label1.AutoSize = true;
106   - this.label1.Location = new System.Drawing.Point(32, 68);
  120 + this.label1.Location = new System.Drawing.Point(94, 81);
107 121 this.label1.Name = "label1";
108 122 this.label1.Size = new System.Drawing.Size(53, 12);
109 123 this.label1.TabIndex = 1;
... ... @@ -112,7 +126,7 @@
112 126 // label2
113 127 //
114 128 this.label2.AutoSize = true;
115   - this.label2.Location = new System.Drawing.Point(32, 93);
  129 + this.label2.Location = new System.Drawing.Point(94, 106);
116 130 this.label2.Name = "label2";
117 131 this.label2.Size = new System.Drawing.Size(53, 12);
118 132 this.label2.TabIndex = 2;
... ... @@ -121,7 +135,7 @@
121 135 // textBox2
122 136 //
123 137 this.textBox2.ImeMode = System.Windows.Forms.ImeMode.Off;
124   - this.textBox2.Location = new System.Drawing.Point(105, 90);
  138 + this.textBox2.Location = new System.Drawing.Point(163, 103);
125 139 this.textBox2.MaxLength = 10;
126 140 this.textBox2.Name = "textBox2";
127 141 this.textBox2.Size = new System.Drawing.Size(100, 19);
... ... @@ -132,7 +146,7 @@
132 146 // label4
133 147 //
134 148 this.label4.AutoSize = true;
135   - this.label4.Location = new System.Drawing.Point(56, 118);
  149 + this.label4.Location = new System.Drawing.Point(118, 131);
136 150 this.label4.Name = "label4";
137 151 this.label4.Size = new System.Drawing.Size(29, 12);
138 152 this.label4.TabIndex = 6;
... ... @@ -141,7 +155,7 @@
141 155 // label5
142 156 //
143 157 this.label5.AutoSize = true;
144   - this.label5.Location = new System.Drawing.Point(56, 143);
  158 + this.label5.Location = new System.Drawing.Point(118, 156);
145 159 this.label5.Name = "label5";
146 160 this.label5.Size = new System.Drawing.Size(29, 12);
147 161 this.label5.TabIndex = 7;
... ... @@ -150,7 +164,7 @@
150 164 // textBox4
151 165 //
152 166 this.textBox4.ImeMode = System.Windows.Forms.ImeMode.Off;
153   - this.textBox4.Location = new System.Drawing.Point(105, 115);
  167 + this.textBox4.Location = new System.Drawing.Point(163, 128);
154 168 this.textBox4.MaxLength = 15;
155 169 this.textBox4.Name = "textBox4";
156 170 this.textBox4.Size = new System.Drawing.Size(100, 19);
... ... @@ -161,7 +175,7 @@
161 175 // textBox5
162 176 //
163 177 this.textBox5.ImeMode = System.Windows.Forms.ImeMode.Off;
164   - this.textBox5.Location = new System.Drawing.Point(105, 140);
  178 + this.textBox5.Location = new System.Drawing.Point(163, 153);
165 179 this.textBox5.MaxLength = 15;
166 180 this.textBox5.Name = "textBox5";
167 181 this.textBox5.Size = new System.Drawing.Size(100, 19);
... ... @@ -173,7 +187,7 @@
173 187 //
174 188 this.label6.AutoSize = true;
175 189 this.label6.ForeColor = System.Drawing.SystemColors.ActiveBorder;
176   - this.label6.Location = new System.Drawing.Point(12, 162);
  190 + this.label6.Location = new System.Drawing.Point(12, 175);
177 191 this.label6.Name = "label6";
178 192 this.label6.Size = new System.Drawing.Size(269, 12);
179 193 this.label6.TabIndex = 10;
... ... @@ -182,7 +196,7 @@
182 196 // label7
183 197 //
184 198 this.label7.AutoSize = true;
185   - this.label7.Location = new System.Drawing.Point(32, 180);
  199 + this.label7.Location = new System.Drawing.Point(94, 189);
186 200 this.label7.Name = "label7";
187 201 this.label7.Size = new System.Drawing.Size(53, 12);
188 202 this.label7.TabIndex = 11;
... ... @@ -191,7 +205,7 @@
191 205 // textBox6
192 206 //
193 207 this.textBox6.ImeMode = System.Windows.Forms.ImeMode.Off;
194   - this.textBox6.Location = new System.Drawing.Point(105, 177);
  208 + this.textBox6.Location = new System.Drawing.Point(163, 186);
195 209 this.textBox6.MaxLength = 1;
196 210 this.textBox6.Name = "textBox6";
197 211 this.textBox6.Size = new System.Drawing.Size(31, 19);
... ... @@ -202,7 +216,7 @@
202 216 // label8
203 217 //
204 218 this.label8.AutoSize = true;
205   - this.label8.Location = new System.Drawing.Point(18, 205);
  219 + this.label8.Location = new System.Drawing.Point(80, 214);
206 220 this.label8.Name = "label8";
207 221 this.label8.Size = new System.Drawing.Size(67, 12);
208 222 this.label8.TabIndex = 13;
... ... @@ -211,7 +225,7 @@
211 225 // textBox7
212 226 //
213 227 this.textBox7.ImeMode = System.Windows.Forms.ImeMode.Off;
214   - this.textBox7.Location = new System.Drawing.Point(105, 202);
  228 + this.textBox7.Location = new System.Drawing.Point(163, 211);
215 229 this.textBox7.MaxLength = 1;
216 230 this.textBox7.Name = "textBox7";
217 231 this.textBox7.Size = new System.Drawing.Size(31, 19);
... ... @@ -222,7 +236,7 @@
222 236 // label9
223 237 //
224 238 this.label9.AutoSize = true;
225   - this.label9.Location = new System.Drawing.Point(48, 230);
  239 + this.label9.Location = new System.Drawing.Point(110, 239);
226 240 this.label9.Name = "label9";
227 241 this.label9.Size = new System.Drawing.Size(37, 12);
228 242 this.label9.TabIndex = 15;
... ... @@ -231,7 +245,7 @@
231 245 // label10
232 246 //
233 247 this.label10.AutoSize = true;
234   - this.label10.Location = new System.Drawing.Point(36, 255);
  248 + this.label10.Location = new System.Drawing.Point(98, 264);
235 249 this.label10.Name = "label10";
236 250 this.label10.Size = new System.Drawing.Size(49, 12);
237 251 this.label10.TabIndex = 16;
... ... @@ -240,7 +254,7 @@
240 254 // label11
241 255 //
242 256 this.label11.AutoSize = true;
243   - this.label11.Location = new System.Drawing.Point(24, 280);
  257 + this.label11.Location = new System.Drawing.Point(86, 289);
244 258 this.label11.Name = "label11";
245 259 this.label11.Size = new System.Drawing.Size(61, 12);
246 260 this.label11.TabIndex = 17;
... ... @@ -249,7 +263,7 @@
249 263 // label12
250 264 //
251 265 this.label12.AutoSize = true;
252   - this.label12.Location = new System.Drawing.Point(32, 305);
  266 + this.label12.Location = new System.Drawing.Point(94, 314);
253 267 this.label12.Name = "label12";
254 268 this.label12.Size = new System.Drawing.Size(53, 12);
255 269 this.label12.TabIndex = 18;
... ... @@ -258,7 +272,7 @@
258 272 // label13
259 273 //
260 274 this.label13.AutoSize = true;
261   - this.label13.Location = new System.Drawing.Point(32, 330);
  275 + this.label13.Location = new System.Drawing.Point(94, 339);
262 276 this.label13.Name = "label13";
263 277 this.label13.Size = new System.Drawing.Size(53, 12);
264 278 this.label13.TabIndex = 19;
... ... @@ -267,25 +281,25 @@
267 281 // label14
268 282 //
269 283 this.label14.AutoSize = true;
270   - this.label14.Location = new System.Drawing.Point(24, 355);
  284 + this.label14.Location = new System.Drawing.Point(8, 364);
271 285 this.label14.Name = "label14";
272   - this.label14.Size = new System.Drawing.Size(61, 12);
  286 + this.label14.Size = new System.Drawing.Size(139, 12);
273 287 this.label14.TabIndex = 20;
274   - this.label14.Text = "子宮頸がん";
  288 + this.label14.Text = "子宮頸がん-総合支所集団";
275 289 //
276 290 // label15
277 291 //
278 292 this.label15.AutoSize = true;
279   - this.label15.Location = new System.Drawing.Point(48, 380);
  293 + this.label15.Location = new System.Drawing.Point(32, 414);
280 294 this.label15.Name = "label15";
281   - this.label15.Size = new System.Drawing.Size(37, 12);
  295 + this.label15.Size = new System.Drawing.Size(115, 12);
282 296 this.label15.TabIndex = 21;
283   - this.label15.Text = "乳がん";
  297 + this.label15.Text = "乳がん-総合支所集団";
284 298 //
285 299 // textBox8
286 300 //
287 301 this.textBox8.ImeMode = System.Windows.Forms.ImeMode.Off;
288   - this.textBox8.Location = new System.Drawing.Point(105, 227);
  302 + this.textBox8.Location = new System.Drawing.Point(163, 236);
289 303 this.textBox8.MaxLength = 1;
290 304 this.textBox8.Name = "textBox8";
291 305 this.textBox8.Size = new System.Drawing.Size(31, 19);
... ... @@ -296,7 +310,7 @@
296 310 // textBox9
297 311 //
298 312 this.textBox9.ImeMode = System.Windows.Forms.ImeMode.Off;
299   - this.textBox9.Location = new System.Drawing.Point(105, 252);
  313 + this.textBox9.Location = new System.Drawing.Point(163, 261);
300 314 this.textBox9.MaxLength = 1;
301 315 this.textBox9.Name = "textBox9";
302 316 this.textBox9.Size = new System.Drawing.Size(31, 19);
... ... @@ -307,7 +321,7 @@
307 321 // textBox10
308 322 //
309 323 this.textBox10.ImeMode = System.Windows.Forms.ImeMode.Off;
310   - this.textBox10.Location = new System.Drawing.Point(105, 277);
  324 + this.textBox10.Location = new System.Drawing.Point(163, 286);
311 325 this.textBox10.MaxLength = 1;
312 326 this.textBox10.Name = "textBox10";
313 327 this.textBox10.Size = new System.Drawing.Size(31, 19);
... ... @@ -318,7 +332,7 @@
318 332 // textBox11
319 333 //
320 334 this.textBox11.ImeMode = System.Windows.Forms.ImeMode.Off;
321   - this.textBox11.Location = new System.Drawing.Point(105, 302);
  335 + this.textBox11.Location = new System.Drawing.Point(163, 311);
322 336 this.textBox11.MaxLength = 1;
323 337 this.textBox11.Name = "textBox11";
324 338 this.textBox11.Size = new System.Drawing.Size(31, 19);
... ... @@ -329,7 +343,7 @@
329 343 // textBox12
330 344 //
331 345 this.textBox12.ImeMode = System.Windows.Forms.ImeMode.Off;
332   - this.textBox12.Location = new System.Drawing.Point(105, 327);
  346 + this.textBox12.Location = new System.Drawing.Point(163, 336);
333 347 this.textBox12.MaxLength = 1;
334 348 this.textBox12.Name = "textBox12";
335 349 this.textBox12.Size = new System.Drawing.Size(31, 19);
... ... @@ -340,7 +354,7 @@
340 354 // textBox13
341 355 //
342 356 this.textBox13.ImeMode = System.Windows.Forms.ImeMode.Off;
343   - this.textBox13.Location = new System.Drawing.Point(105, 352);
  357 + this.textBox13.Location = new System.Drawing.Point(163, 361);
344 358 this.textBox13.MaxLength = 1;
345 359 this.textBox13.Name = "textBox13";
346 360 this.textBox13.Size = new System.Drawing.Size(31, 19);
... ... @@ -351,11 +365,11 @@
351 365 // textBox14
352 366 //
353 367 this.textBox14.ImeMode = System.Windows.Forms.ImeMode.Off;
354   - this.textBox14.Location = new System.Drawing.Point(105, 377);
  368 + this.textBox14.Location = new System.Drawing.Point(163, 411);
355 369 this.textBox14.MaxLength = 1;
356 370 this.textBox14.Name = "textBox14";
357 371 this.textBox14.Size = new System.Drawing.Size(31, 19);
358   - this.textBox14.TabIndex = 28;
  372 + this.textBox14.TabIndex = 29;
359 373 this.textBox14.TextChanged += new System.EventHandler(this.textBox14_TextChanged);
360 374 this.textBox14.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox14_KeyPress);
361 375 //
... ... @@ -363,7 +377,7 @@
363 377 //
364 378 this.label16.AutoSize = true;
365 379 this.label16.ForeColor = System.Drawing.SystemColors.ActiveBorder;
366   - this.label16.Location = new System.Drawing.Point(12, 399);
  380 + this.label16.Location = new System.Drawing.Point(8, 457);
367 381 this.label16.Name = "label16";
368 382 this.label16.Size = new System.Drawing.Size(269, 12);
369 383 this.label16.TabIndex = 29;
... ... @@ -372,16 +386,16 @@
372 386 // label17
373 387 //
374 388 this.label17.AutoSize = true;
375   - this.label17.Location = new System.Drawing.Point(32, 417);
  389 + this.label17.Location = new System.Drawing.Point(70, 475);
376 390 this.label17.Name = "label17";
377   - this.label17.Size = new System.Drawing.Size(53, 12);
  391 + this.label17.Size = new System.Drawing.Size(77, 12);
378 392 this.label17.TabIndex = 30;
379   - this.label17.Text = "希望場所";
  393 + this.label17.Text = "総合健診希望";
380 394 //
381 395 // label18
382 396 //
383 397 this.label18.AutoSize = true;
384   - this.label18.Location = new System.Drawing.Point(20, 444);
  398 + this.label18.Location = new System.Drawing.Point(82, 550);
385 399 this.label18.Name = "label18";
386 400 this.label18.Size = new System.Drawing.Size(65, 12);
387 401 this.label18.TabIndex = 31;
... ... @@ -390,48 +404,48 @@
390 404 // textBox15
391 405 //
392 406 this.textBox15.ImeMode = System.Windows.Forms.ImeMode.Off;
393   - this.textBox15.Location = new System.Drawing.Point(105, 414);
  407 + this.textBox15.Location = new System.Drawing.Point(163, 472);
394 408 this.textBox15.MaxLength = 1;
395 409 this.textBox15.Name = "textBox15";
396 410 this.textBox15.Size = new System.Drawing.Size(31, 19);
397   - this.textBox15.TabIndex = 32;
  411 + this.textBox15.TabIndex = 31;
398 412 this.textBox15.TextChanged += new System.EventHandler(this.textBox15_TextChanged);
399 413 this.textBox15.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox15_KeyPress);
400 414 //
401 415 // textBox16
402 416 //
403 417 this.textBox16.ImeMode = System.Windows.Forms.ImeMode.Off;
404   - this.textBox16.Location = new System.Drawing.Point(105, 441);
  418 + this.textBox16.Location = new System.Drawing.Point(163, 547);
405 419 this.textBox16.MaxLength = 1;
406 420 this.textBox16.Name = "textBox16";
407 421 this.textBox16.Size = new System.Drawing.Size(31, 19);
408   - this.textBox16.TabIndex = 33;
  422 + this.textBox16.TabIndex = 34;
409 423 this.textBox16.TextChanged += new System.EventHandler(this.textBox16_TextChanged);
410 424 this.textBox16.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox16_KeyPress);
411 425 //
412 426 // button1
413 427 //
414   - this.button1.Location = new System.Drawing.Point(231, 482);
  428 + this.button1.Location = new System.Drawing.Point(232, 608);
415 429 this.button1.Name = "button1";
416 430 this.button1.Size = new System.Drawing.Size(75, 23);
417   - this.button1.TabIndex = 34;
  431 + this.button1.TabIndex = 35;
418 432 this.button1.Text = "保存";
419 433 this.button1.UseVisualStyleBackColor = true;
420 434 this.button1.Click += new System.EventHandler(this.button1_Click);
421 435 //
422 436 // button2
423 437 //
424   - this.button2.Location = new System.Drawing.Point(315, 482);
  438 + this.button2.Location = new System.Drawing.Point(313, 608);
425 439 this.button2.Name = "button2";
426 440 this.button2.Size = new System.Drawing.Size(86, 23);
427   - this.button2.TabIndex = 35;
  441 + this.button2.TabIndex = 36;
428 442 this.button2.Text = "保存して次へ";
429 443 this.button2.UseVisualStyleBackColor = true;
430 444 this.button2.Click += new System.EventHandler(this.button2_Click);
431 445 //
432 446 // button3
433 447 //
434   - this.button3.Location = new System.Drawing.Point(211, 63);
  448 + this.button3.Location = new System.Drawing.Point(269, 76);
435 449 this.button3.Name = "button3";
436 450 this.button3.Size = new System.Drawing.Size(75, 23);
437 451 this.button3.TabIndex = 36;
... ... @@ -442,7 +456,7 @@
442 456 //
443 457 // button4
444 458 //
445   - this.button4.Location = new System.Drawing.Point(10, 482);
  459 + this.button4.Location = new System.Drawing.Point(10, 608);
446 460 this.button4.Name = "button4";
447 461 this.button4.Size = new System.Drawing.Size(75, 23);
448 462 this.button4.TabIndex = 37;
... ... @@ -454,16 +468,17 @@
454 468 // label3
455 469 //
456 470 this.label3.AutoSize = true;
457   - this.label3.Location = new System.Drawing.Point(12, 18);
  471 + this.label3.Font = new System.Drawing.Font("MS UI Gothic", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
  472 + this.label3.Location = new System.Drawing.Point(12, 9);
458 473 this.label3.Name = "label3";
459   - this.label3.Size = new System.Drawing.Size(65, 12);
  474 + this.label3.Size = new System.Drawing.Size(36, 13);
460 475 this.label3.TabIndex = 38;
461   - this.label3.Text = "行政区番号";
  476 + this.label3.Text = "ロット";
462 477 //
463 478 // label19
464 479 //
465 480 this.label19.AutoSize = true;
466   - this.label19.Location = new System.Drawing.Point(209, 18);
  481 + this.label19.Location = new System.Drawing.Point(13, 32);
467 482 this.label19.Name = "label19";
468 483 this.label19.Size = new System.Drawing.Size(23, 12);
469 484 this.label19.TabIndex = 39;
... ... @@ -472,7 +487,7 @@
472 487 // label20
473 488 //
474 489 this.label20.AutoSize = true;
475   - this.label20.Location = new System.Drawing.Point(105, 47);
  490 + this.label20.Location = new System.Drawing.Point(161, 63);
476 491 this.label20.Name = "label20";
477 492 this.label20.Size = new System.Drawing.Size(56, 12);
478 493 this.label20.TabIndex = 40;
... ... @@ -480,7 +495,7 @@
480 495 //
481 496 // button5
482 497 //
483   - this.button5.Location = new System.Drawing.Point(91, 482);
  498 + this.button5.Location = new System.Drawing.Point(91, 608);
484 499 this.button5.Name = "button5";
485 500 this.button5.Size = new System.Drawing.Size(75, 23);
486 501 this.button5.TabIndex = 41;
... ... @@ -491,17 +506,21 @@
491 506 //
492 507 // button6
493 508 //
494   - this.button6.Location = new System.Drawing.Point(317, 12);
  509 + this.button6.Location = new System.Drawing.Point(371, 43);
495 510 this.button6.Name = "button6";
496 511 this.button6.Size = new System.Drawing.Size(84, 23);
497 512 this.button6.TabIndex = 42;
498 513 this.button6.TabStop = false;
499   - this.button6.Text = "１回目の入力";
  514 + this.button6.Text = "１回目の表示";
500 515 this.button6.UseVisualStyleBackColor = true;
501 516 this.button6.Click += new System.EventHandler(this.button6_Click);
502 517 //
503 518 // panel1
504 519 //
  520 + this.panel1.Controls.Add(this.textBox38);
  521 + this.panel1.Controls.Add(this.textBox37);
  522 + this.panel1.Controls.Add(this.textBox36);
  523 + this.panel1.Controls.Add(this.textBox35);
505 524 this.panel1.Controls.Add(this.textBox30);
506 525 this.panel1.Controls.Add(this.textBox29);
507 526 this.panel1.Controls.Add(this.textBox28);
... ... @@ -517,152 +536,333 @@
517 536 this.panel1.Controls.Add(this.textBox18);
518 537 this.panel1.Controls.Add(this.textBox17);
519 538 this.panel1.Controls.Add(this.textBox3);
520   - this.panel1.Location = new System.Drawing.Point(292, 59);
  539 + this.panel1.Location = new System.Drawing.Point(371, 72);
521 540 this.panel1.Name = "panel1";
522   - this.panel1.Size = new System.Drawing.Size(109, 417);
  541 + this.panel1.Size = new System.Drawing.Size(109, 506);
523 542 this.panel1.TabIndex = 43;
524 543 this.panel1.Visible = false;
525 544 //
  545 + // textBox38
  546 + //
  547 + this.textBox38.Location = new System.Drawing.Point(4, 450);
  548 + this.textBox38.MaxLength = 1;
  549 + this.textBox38.Name = "textBox38";
  550 + this.textBox38.ReadOnly = true;
  551 + this.textBox38.Size = new System.Drawing.Size(30, 19);
  552 + this.textBox38.TabIndex = 18;
  553 + this.textBox38.TabStop = false;
  554 + this.textBox38.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox38_KeyPress);
  555 + //
  556 + // textBox37
  557 + //
  558 + this.textBox37.Location = new System.Drawing.Point(4, 422);
  559 + this.textBox37.MaxLength = 1;
  560 + this.textBox37.Name = "textBox37";
  561 + this.textBox37.ReadOnly = true;
  562 + this.textBox37.Size = new System.Drawing.Size(30, 19);
  563 + this.textBox37.TabIndex = 17;
  564 + this.textBox37.TabStop = false;
  565 + this.textBox37.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox37_KeyPress);
  566 + //
  567 + // textBox36
  568 + //
  569 + this.textBox36.Location = new System.Drawing.Point(3, 365);
  570 + this.textBox36.MaxLength = 1;
  571 + this.textBox36.Name = "textBox36";
  572 + this.textBox36.ReadOnly = true;
  573 + this.textBox36.Size = new System.Drawing.Size(31, 19);
  574 + this.textBox36.TabIndex = 16;
  575 + this.textBox36.TabStop = false;
  576 + this.textBox36.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox36_KeyPress);
  577 + //
  578 + // textBox35
  579 + //
  580 + this.textBox35.Location = new System.Drawing.Point(3, 314);
  581 + this.textBox35.MaxLength = 1;
  582 + this.textBox35.Name = "textBox35";
  583 + this.textBox35.ReadOnly = true;
  584 + this.textBox35.Size = new System.Drawing.Size(31, 19);
  585 + this.textBox35.TabIndex = 15;
  586 + this.textBox35.TabStop = false;
  587 + this.textBox35.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox35_KeyPress);
  588 + //
526 589 // textBox30
527 590 //
528   - this.textBox30.Location = new System.Drawing.Point(3, 378);
  591 + this.textBox30.Location = new System.Drawing.Point(4, 475);
  592 + this.textBox30.MaxLength = 1;
529 593 this.textBox30.Name = "textBox30";
530 594 this.textBox30.ReadOnly = true;
531   - this.textBox30.Size = new System.Drawing.Size(31, 19);
  595 + this.textBox30.Size = new System.Drawing.Size(30, 19);
532 596 this.textBox30.TabIndex = 14;
533 597 this.textBox30.TabStop = false;
  598 + this.textBox30.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox30_KeyPress);
534 599 //
535 600 // textBox29
536 601 //
537   - this.textBox29.Location = new System.Drawing.Point(3, 351);
  602 + this.textBox29.Location = new System.Drawing.Point(3, 396);
  603 + this.textBox29.MaxLength = 1;
538 604 this.textBox29.Name = "textBox29";
539 605 this.textBox29.ReadOnly = true;
540 606 this.textBox29.Size = new System.Drawing.Size(31, 19);
541 607 this.textBox29.TabIndex = 13;
542 608 this.textBox29.TabStop = false;
  609 + this.textBox29.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox29_KeyPress);
543 610 //
544 611 // textBox28
545 612 //
546   - this.textBox28.Location = new System.Drawing.Point(3, 314);
  613 + this.textBox28.Location = new System.Drawing.Point(3, 339);
  614 + this.textBox28.MaxLength = 1;
547 615 this.textBox28.Name = "textBox28";
548 616 this.textBox28.ReadOnly = true;
549 617 this.textBox28.Size = new System.Drawing.Size(31, 19);
550 618 this.textBox28.TabIndex = 12;
551 619 this.textBox28.TabStop = false;
  620 + this.textBox28.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox28_KeyPress);
552 621 //
553 622 // textBox27
554 623 //
555 624 this.textBox27.Location = new System.Drawing.Point(3, 289);
  625 + this.textBox27.MaxLength = 1;
556 626 this.textBox27.Name = "textBox27";
557 627 this.textBox27.ReadOnly = true;
558 628 this.textBox27.Size = new System.Drawing.Size(31, 19);
559 629 this.textBox27.TabIndex = 11;
560 630 this.textBox27.TabStop = false;
  631 + this.textBox27.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox27_KeyPress);
561 632 //
562 633 // textBox26
563 634 //
564 635 this.textBox26.Location = new System.Drawing.Point(3, 264);
  636 + this.textBox26.MaxLength = 1;
565 637 this.textBox26.Name = "textBox26";
566 638 this.textBox26.ReadOnly = true;
567 639 this.textBox26.Size = new System.Drawing.Size(31, 19);
568 640 this.textBox26.TabIndex = 10;
569 641 this.textBox26.TabStop = false;
  642 + this.textBox26.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox26_KeyPress);
570 643 //
571 644 // textBox25
572 645 //
573 646 this.textBox25.Location = new System.Drawing.Point(3, 239);
  647 + this.textBox25.MaxLength = 1;
574 648 this.textBox25.Name = "textBox25";
575 649 this.textBox25.ReadOnly = true;
576 650 this.textBox25.Size = new System.Drawing.Size(31, 19);
577 651 this.textBox25.TabIndex = 9;
578 652 this.textBox25.TabStop = false;
  653 + this.textBox25.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox25_KeyPress);
579 654 //
580 655 // textBox24
581 656 //
582 657 this.textBox24.Location = new System.Drawing.Point(3, 214);
  658 + this.textBox24.MaxLength = 1;
583 659 this.textBox24.Name = "textBox24";
584 660 this.textBox24.ReadOnly = true;
585 661 this.textBox24.Size = new System.Drawing.Size(31, 19);
586 662 this.textBox24.TabIndex = 8;
587 663 this.textBox24.TabStop = false;
  664 + this.textBox24.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox24_KeyPress);
588 665 //
589 666 // textBox23
590 667 //
591 668 this.textBox23.Location = new System.Drawing.Point(3, 189);
  669 + this.textBox23.MaxLength = 1;
592 670 this.textBox23.Name = "textBox23";
593 671 this.textBox23.ReadOnly = true;
594 672 this.textBox23.Size = new System.Drawing.Size(31, 19);
595 673 this.textBox23.TabIndex = 7;
596 674 this.textBox23.TabStop = false;
  675 + this.textBox23.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox23_KeyPress);
597 676 //
598 677 // textBox22
599 678 //
600 679 this.textBox22.Location = new System.Drawing.Point(3, 164);
  680 + this.textBox22.MaxLength = 1;
601 681 this.textBox22.Name = "textBox22";
602 682 this.textBox22.ReadOnly = true;
603 683 this.textBox22.Size = new System.Drawing.Size(31, 19);
604 684 this.textBox22.TabIndex = 6;
605 685 this.textBox22.TabStop = false;
  686 + this.textBox22.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox22_KeyPress);
606 687 //
607 688 // textBox21
608 689 //
609 690 this.textBox21.Location = new System.Drawing.Point(3, 139);
  691 + this.textBox21.MaxLength = 1;
610 692 this.textBox21.Name = "textBox21";
611 693 this.textBox21.ReadOnly = true;
612 694 this.textBox21.Size = new System.Drawing.Size(31, 19);
613 695 this.textBox21.TabIndex = 5;
614 696 this.textBox21.TabStop = false;
  697 + this.textBox21.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox21_KeyPress);
615 698 //
616 699 // textBox20
617 700 //
618 701 this.textBox20.Location = new System.Drawing.Point(3, 114);
  702 + this.textBox20.MaxLength = 1;
619 703 this.textBox20.Name = "textBox20";
620 704 this.textBox20.ReadOnly = true;
621 705 this.textBox20.Size = new System.Drawing.Size(31, 19);
622 706 this.textBox20.TabIndex = 4;
623 707 this.textBox20.TabStop = false;
  708 + this.textBox20.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox20_KeyPress);
624 709 //
625 710 // textBox19
626 711 //
627 712 this.textBox19.Location = new System.Drawing.Point(3, 81);
  713 + this.textBox19.MaxLength = 15;
628 714 this.textBox19.Name = "textBox19";
629 715 this.textBox19.ReadOnly = true;
630 716 this.textBox19.Size = new System.Drawing.Size(100, 19);
631 717 this.textBox19.TabIndex = 3;
632 718 this.textBox19.TabStop = false;
  719 + this.textBox19.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox19_KeyPress);
633 720 //
634 721 // textBox18
635 722 //
636 723 this.textBox18.Location = new System.Drawing.Point(3, 56);
  724 + this.textBox18.MaxLength = 15;
637 725 this.textBox18.Name = "textBox18";
638 726 this.textBox18.ReadOnly = true;
639 727 this.textBox18.Size = new System.Drawing.Size(100, 19);
640 728 this.textBox18.TabIndex = 2;
641 729 this.textBox18.TabStop = false;
  730 + this.textBox18.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox18_KeyPress);
642 731 //
643 732 // textBox17
644 733 //
645 734 this.textBox17.Location = new System.Drawing.Point(3, 31);
  735 + this.textBox17.MaxLength = 10;
646 736 this.textBox17.Name = "textBox17";
647 737 this.textBox17.ReadOnly = true;
648 738 this.textBox17.Size = new System.Drawing.Size(100, 19);
649 739 this.textBox17.TabIndex = 1;
650 740 this.textBox17.TabStop = false;
  741 + this.textBox17.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox17_KeyPress);
651 742 //
652 743 // textBox3
653 744 //
654 745 this.textBox3.Location = new System.Drawing.Point(3, 6);
  746 + this.textBox3.MaxLength = 10;
655 747 this.textBox3.Name = "textBox3";
656 748 this.textBox3.ReadOnly = true;
657 749 this.textBox3.Size = new System.Drawing.Size(100, 19);
658 750 this.textBox3.TabIndex = 0;
659 751 this.textBox3.TabStop = false;
  752 + this.textBox3.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox3_KeyPress);
  753 + //
  754 + // label21
  755 + //
  756 + this.label21.AutoSize = true;
  757 + this.label21.Font = new System.Drawing.Font("MS UI Gothic", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
  758 + this.label21.Location = new System.Drawing.Point(88, 7);
  759 + this.label21.Name = "label21";
  760 + this.label21.Size = new System.Drawing.Size(87, 15);
  761 + this.label21.TabIndex = 44;
  762 + this.label21.Text = "行政区番号";
  763 + //
  764 + // button7
  765 + //
  766 + this.button7.Location = new System.Drawing.Point(405, 608);
  767 + this.button7.Name = "button7";
  768 + this.button7.Size = new System.Drawing.Size(75, 23);
  769 + this.button7.TabIndex = 45;
  770 + this.button7.TabStop = false;
  771 + this.button7.Text = "閉じる";
  772 + this.button7.UseVisualStyleBackColor = true;
  773 + this.button7.Click += new System.EventHandler(this.button7_Click);
  774 + //
  775 + // textBox31
  776 + //
  777 + this.textBox31.Location = new System.Drawing.Point(163, 386);
  778 + this.textBox31.MaxLength = 1;
  779 + this.textBox31.Name = "textBox31";
  780 + this.textBox31.Size = new System.Drawing.Size(31, 19);
  781 + this.textBox31.TabIndex = 28;
  782 + this.textBox31.TextChanged += new System.EventHandler(this.textBox31_TextChanged);
  783 + this.textBox31.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox31_KeyPress);
  784 + //
  785 + // textBox32
  786 + //
  787 + this.textBox32.Location = new System.Drawing.Point(163, 436);
  788 + this.textBox32.MaxLength = 1;
  789 + this.textBox32.Name = "textBox32";
  790 + this.textBox32.Size = new System.Drawing.Size(31, 19);
  791 + this.textBox32.TabIndex = 30;
  792 + this.textBox32.TextChanged += new System.EventHandler(this.textBox32_TextChanged);
  793 + this.textBox32.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox32_KeyPress);
  794 + //
  795 + // label22
  796 + //
  797 + this.label22.AutoSize = true;
  798 + this.label22.Location = new System.Drawing.Point(8, 389);
  799 + this.label22.Name = "label22";
  800 + this.label22.Size = new System.Drawing.Size(139, 12);
  801 + this.label22.TabIndex = 48;
  802 + this.label22.Text = "子宮頸がん-指定医療機関";
  803 + //
  804 + // label23
  805 + //
  806 + this.label23.AutoSize = true;
  807 + this.label23.Location = new System.Drawing.Point(32, 440);
  808 + this.label23.Name = "label23";
  809 + this.label23.Size = new System.Drawing.Size(115, 12);
  810 + this.label23.TabIndex = 49;
  811 + this.label23.Text = "乳がん-石巻市医師会";
  812 + //
  813 + // label24
  814 + //
  815 + this.label24.AutoSize = true;
  816 + this.label24.Location = new System.Drawing.Point(46, 500);
  817 + this.label24.Name = "label24";
  818 + this.label24.Size = new System.Drawing.Size(101, 12);
  819 + this.label24.TabIndex = 50;
  820 + this.label24.Text = "本庁個別健診希望";
  821 + //
  822 + // label25
  823 + //
  824 + this.label25.AutoSize = true;
  825 + this.label25.Location = new System.Drawing.Point(32, 525);
  826 + this.label25.Name = "label25";
  827 + this.label25.Size = new System.Drawing.Size(115, 12);
  828 + this.label25.TabIndex = 51;
  829 + this.label25.Text = "石巻ロイヤル病院希望";
  830 + //
  831 + // textBox33
  832 + //
  833 + this.textBox33.Location = new System.Drawing.Point(163, 497);
  834 + this.textBox33.MaxLength = 1;
  835 + this.textBox33.Name = "textBox33";
  836 + this.textBox33.Size = new System.Drawing.Size(31, 19);
  837 + this.textBox33.TabIndex = 32;
  838 + this.textBox33.TextChanged += new System.EventHandler(this.textBox33_TextChanged);
  839 + this.textBox33.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox33_KeyPress);
  840 + //
  841 + // textBox34
  842 + //
  843 + this.textBox34.Location = new System.Drawing.Point(163, 522);
  844 + this.textBox34.MaxLength = 1;
  845 + this.textBox34.Name = "textBox34";
  846 + this.textBox34.Size = new System.Drawing.Size(31, 19);
  847 + this.textBox34.TabIndex = 33;
  848 + this.textBox34.TextChanged += new System.EventHandler(this.textBox34_TextChanged);
  849 + this.textBox34.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox34_KeyPress);
660 850 //
661 851 // Form2
662 852 //
663 853 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
664 854 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
665   - this.ClientSize = new System.Drawing.Size(411, 517);
  855 + this.ClientSize = new System.Drawing.Size(492, 643);
  856 + this.Controls.Add(this.textBox34);
  857 + this.Controls.Add(this.textBox33);
  858 + this.Controls.Add(this.label25);
  859 + this.Controls.Add(this.label24);
  860 + this.Controls.Add(this.label23);
  861 + this.Controls.Add(this.label22);
  862 + this.Controls.Add(this.textBox32);
  863 + this.Controls.Add(this.textBox31);
  864 + this.Controls.Add(this.button7);
  865 + this.Controls.Add(this.label21);
666 866 this.Controls.Add(this.panel1);
667 867 this.Controls.Add(this.button6);
668 868 this.Controls.Add(this.button5);
... ... @@ -775,5 +975,19 @@
775 975 private System.Windows.Forms.TextBox textBox18;
776 976 private System.Windows.Forms.TextBox textBox17;
777 977 private System.Windows.Forms.TextBox textBox3;
  978 + private System.Windows.Forms.Label label21;
  979 + private System.Windows.Forms.Button button7;
  980 + private System.Windows.Forms.TextBox textBox31;
  981 + private System.Windows.Forms.TextBox textBox32;
  982 + private System.Windows.Forms.Label label22;
  983 + private System.Windows.Forms.Label label23;
  984 + private System.Windows.Forms.Label label24;
  985 + private System.Windows.Forms.Label label25;
  986 + private System.Windows.Forms.TextBox textBox33;
  987 + private System.Windows.Forms.TextBox textBox34;
  988 + private System.Windows.Forms.TextBox textBox38;
  989 + private System.Windows.Forms.TextBox textBox37;
  990 + private System.Windows.Forms.TextBox textBox36;
  991 + private System.Windows.Forms.TextBox textBox35;
778 992 }
779 993 }
\ No newline at end of file
... ...
... ... @@ -29,7 +29,8 @@ namespace MedicalCheckInputTool
29 29
30 30 this.Text = "ロット：" + Global.lotNo + " " + Global.times + " " + "ユーザ：" + Global.inputUser;
31 31
32   - label3.Text = "ロット " + Global.lotNo + " 行政区番号 " + Global.adminCode;
  32 + label3.Text = "ロット：" + Global.lotNo;
  33 + label21.Text = "行政区番号：" + Global.adminCode + " " + Global.adminName;
33 34
34 35 label20.Text = ""; //エラーメッセージなし
35 36
... ... @@ -50,7 +51,6 @@ namespace MedicalCheckInputTool
50 51 string code = serialNo.PadLeft(10, '0');
51 52
52 53 textBox1.Text = code;
53   - bool err = false;
54 54 MySqlCommand cmd = new MySqlCommand("select * from `" + Global.times + "` where `ロット番号` = @lotNo and `整理番号` = @serialNo", conn);
55 55 // パラメータ設定
56 56 cmd.Parameters.Add(new MySqlParameter("lotNo", Global.lotNo));
... ... @@ -80,10 +80,79 @@ namespace MedicalCheckInputTool
80 80 textBox10.Text = isDBNull(reader, "前立腺がん");
81 81 textBox11.Text = isDBNull(reader, "骨粗鬆症");
82 82 textBox12.Text = isDBNull(reader, "成人歯科");
83   - textBox13.Text = isDBNull(reader, "子宮頸がん");
84   - textBox14.Text = isDBNull(reader, "乳がん");
85   - textBox15.Text = isDBNull(reader, "希望場所");
86   - textBox16.Text = isDBNull(reader, "身体不自由");
  83 +
  84 + string cervicalCancer = isDBNull(reader, "子宮頸がん");
  85 + if ("".Equals(cervicalCancer))
  86 + {
  87 + textBox13.Text = "";
  88 + textBox31.Text = "";
  89 + }
  90 + else if ("9".Equals(cervicalCancer))
  91 + {
  92 + textBox13.Text = "0";
  93 + textBox31.Text = "";
  94 + }
  95 + else if ("0".Equals(cervicalCancer))
  96 + {
  97 + textBox13.Text = "";
  98 + textBox31.Text = "0";
  99 + }
  100 + else
  101 + {
  102 + textBox13.Text = cervicalCancer;
  103 + textBox31.Text = "";
  104 + }
  105 +
  106 + string breastCancer = isDBNull(reader, "乳がん");
  107 + if ("".Equals(breastCancer))
  108 + {
  109 + textBox14.Text = "";
  110 + textBox32.Text = "";
  111 + }
  112 + else if ("9".Equals(breastCancer))
  113 + {
  114 + textBox14.Text = "0";
  115 + textBox32.Text = "";
  116 + }
  117 + else if ("0".Equals(breastCancer))
  118 + {
  119 + textBox14.Text = "";
  120 + textBox32.Text = "0";
  121 + }
  122 + else
  123 + {
  124 + textBox14.Text = breastCancer;
  125 + textBox32.Text = "";
  126 + }
  127 +
  128 + string place = isDBNull(reader, "希望場所");
  129 +
  130 + if ("".Equals(place))
  131 + {
  132 + textBox15.Text = "";
  133 + textBox33.Text = "";
  134 + textBox34.Text = "";
  135 + }
  136 + else if ("1".Equals(place))
  137 + {
  138 + textBox15.Text = "0";
  139 + textBox33.Text = "";
  140 + textBox34.Text = "";
  141 + }
  142 + if ("2".Equals(place))
  143 + {
  144 + textBox15.Text = "";
  145 + textBox33.Text = "0";
  146 + textBox34.Text = "";
  147 + }
  148 + if ("3".Equals(place))
  149 + {
  150 + textBox15.Text = "";
  151 + textBox33.Text = "";
  152 + textBox34.Text = "0";
  153 + }
  154 +
  155 + textBox16.Text = "".Equals(isDBNull(reader, "身体不自由")) ? "" : "0";
87 156
88 157 Global.adminCode = isDBNull(reader, "行政区コード");
89 158 Global.adminName = isDBNull(reader, "行政区名称");
... ... @@ -129,7 +198,7 @@ namespace MedicalCheckInputTool
129 198 SaveData sv = makeSaveData(); //保存用データ生成（パディング済み）
130 199
131 200 //マッチングチェック
132   - bool matchErr = matchInput(sv);
  201 + bool matchErr = matchInput(sv, Global.times);
133 202 //一致しない場合、エラー表示はするが保存は実行してしまう
134 203 if(matchErr)
135 204 {
... ... @@ -178,9 +247,65 @@ namespace MedicalCheckInputTool
178 247 sv.prostateCancer = textBox10.Text; //前立腺がん
179 248 sv.osteoporosis = textBox11.Text; //骨粗鬆症
180 249 sv.dental = textBox12.Text; //成人歯科
181   - sv.cervicalCancer = textBox13.Text; //子宮頸がん
182   - sv.breastCancer = textBox14.Text; //乳がん
183   - sv.place = textBox15.Text; //希望場所
  250 + if ("".Equals(textBox13.Text) && "".Equals(textBox31.Text))
  251 + {
  252 + sv.cervicalCancer = ""; //子宮頸がん
  253 + }
  254 + else
  255 + {
  256 + if("0".Equals(textBox13.Text))
  257 + {
  258 + sv.cervicalCancer = "9"; //子宮頸がん
  259 + }
  260 + else if("0".Equals(textBox31.Text))
  261 + {
  262 + sv.cervicalCancer = "0"; //子宮頸がん
  263 + }
  264 + else
  265 + {
  266 + sv.cervicalCancer = "".Equals(textBox31) ? textBox13.Text : textBox31.Text; //子宮頸がん
  267 + }
  268 + }
  269 +
  270 + if ("".Equals(textBox14.Text) && "".Equals(textBox32.Text))
  271 + {
  272 + sv.breastCancer = ""; //乳がん
  273 + }
  274 + else
  275 + {
  276 + if ("0".Equals(textBox14.Text))
  277 + {
  278 + sv.breastCancer = "9"; //乳がん
  279 + }
  280 + else if ("0".Equals(textBox32.Text))
  281 + {
  282 + sv.breastCancer = "0"; //乳がん
  283 + }
  284 + else
  285 + {
  286 + sv.breastCancer = "".Equals(textBox32) ? textBox14.Text : textBox32.Text; //乳がん
  287 + }
  288 + }
  289 +
  290 + if ("".Equals(textBox15) && "".Equals(textBox33.Text) && "".Equals(textBox34))
  291 + {
  292 + sv.place = ""; //希望場所
  293 + }
  294 + else
  295 + {
  296 + if("0".Equals(textBox15.Text))
  297 + {
  298 + sv.place = "1"; //希望場所
  299 + }
  300 + else if ("0".Equals(textBox33.Text))
  301 + {
  302 + sv.place = "2"; //希望場所
  303 + }
  304 + else if ("0".Equals(textBox34.Text))
  305 + {
  306 + sv.place = "3"; //希望場所
  307 + }
  308 + }
184 309 sv.handicapped = "".Equals(textBox16.Text) ? "" : "8"; //身体不自由
185 310 sv.phone = textBox4.Text; //電話番号
186 311 sv.mobilePhone = textBox5.Text; //携帯番号
... ... @@ -280,10 +405,79 @@ namespace MedicalCheckInputTool
280 405 textBox10.Text = isDBNull(reader, "前立腺がん");
281 406 textBox11.Text = isDBNull(reader, "骨粗鬆症");
282 407 textBox12.Text = isDBNull(reader, "成人歯科");
283   - textBox13.Text = isDBNull(reader, "子宮頸がん");
284   - textBox14.Text = isDBNull(reader, "乳がん");
285   - textBox15.Text = isDBNull(reader, "希望場所");
286   - textBox16.Text = isDBNull(reader, "身体不自由");
  408 +
  409 + string cervicalCancer = isDBNull(reader, "子宮頸がん");
  410 + if ("".Equals(cervicalCancer))
  411 + {
  412 + textBox13.Text = "";
  413 + textBox31.Text = "";
  414 + }
  415 + else if ("9".Equals(cervicalCancer))
  416 + {
  417 + textBox13.Text = "0";
  418 + textBox31.Text = "";
  419 + }
  420 + else if ("0".Equals(cervicalCancer))
  421 + {
  422 + textBox13.Text = "";
  423 + textBox31.Text = "0";
  424 + }
  425 + else
  426 + {
  427 + textBox13.Text = cervicalCancer;
  428 + textBox31.Text = "";
  429 + }
  430 +
  431 + string breastCancer = isDBNull(reader, "乳がん");
  432 + if ("".Equals(breastCancer))
  433 + {
  434 + textBox14.Text = "";
  435 + textBox32.Text = "";
  436 + }
  437 + else if ("9".Equals(breastCancer))
  438 + {
  439 + textBox14.Text = "0";
  440 + textBox32.Text = "";
  441 + }
  442 + else if ("0".Equals(breastCancer))
  443 + {
  444 + textBox14.Text = "";
  445 + textBox32.Text = "0";
  446 + }
  447 + else
  448 + {
  449 + textBox14.Text = breastCancer;
  450 + textBox32.Text = "";
  451 + }
  452 +
  453 + string place = isDBNull(reader, "希望場所");
  454 +
  455 + if("".Equals(place))
  456 + {
  457 + textBox15.Text = "";
  458 + textBox33.Text = "";
  459 + textBox34.Text = "";
  460 + }
  461 + else if ("1".Equals(place))
  462 + {
  463 + textBox15.Text = "0";
  464 + textBox33.Text = "";
  465 + textBox34.Text = "";
  466 + }
  467 + if ("2".Equals(place))
  468 + {
  469 + textBox15.Text = "";
  470 + textBox33.Text = "0";
  471 + textBox34.Text = "";
  472 + }
  473 + if ("3".Equals(place))
  474 + {
  475 + textBox15.Text = "";
  476 + textBox33.Text = "";
  477 + textBox34.Text = "0";
  478 + }
  479 +
  480 + textBox16.Text = "".Equals(isDBNull(reader, "身体不自由")) ? "" : "0";
287 481 }
288 482 reader.Close();
289 483 }
... ... @@ -331,14 +525,14 @@ namespace MedicalCheckInputTool
331 525 return isExist;
332 526 }
333 527
334   - private bool matchInput(SaveData sv)
  528 + private bool matchInput(SaveData sv, string times)
335 529 {
336 530 MySqlConnection conn;
337 531 string connstr = System.Configuration.ConfigurationManager.AppSettings["Conn"];
338 532 conn = new MySqlConnection(connstr);
339 533 conn.Open();
340 534
341   - string tableName = "１回目".Equals(Global.times) ? "２回目" : "１回目";
  535 + string tableName = "１回目".Equals(times) ? "２回目" : "１回目";
342 536 MySqlCommand cmd = new MySqlCommand("select * from `" + tableName + "` where `ロット番号` = @lotNo and `整理番号` = @serialNo", conn);
343 537 // パラメータ設定
344 538 cmd.Parameters.Add(new MySqlParameter("lotNo", sv.lotNo));
... ... @@ -358,8 +552,12 @@ namespace MedicalCheckInputTool
358 552 textBox11.BackColor = Color.Empty;
359 553 textBox12.BackColor = Color.Empty;
360 554 textBox13.BackColor = Color.Empty;
  555 + textBox31.BackColor = Color.Empty;
361 556 textBox14.BackColor = Color.Empty;
  557 + textBox32.BackColor = Color.Empty;
362 558 textBox15.BackColor = Color.Empty;
  559 + textBox33.BackColor = Color.Empty;
  560 + textBox34.BackColor = Color.Empty;
363 561 textBox16.BackColor = Color.Empty;
364 562
365 563 try
... ... @@ -368,7 +566,7 @@ namespace MedicalCheckInputTool
368 566 if (!reader.HasRows)
369 567 {
370 568 //無かった
371   - if("２回目".Equals(Global.times))
  569 + if("２回目".Equals(times))
372 570 {
373 571 textBox1.BackColor = Color.Pink;
374 572 }
... ... @@ -382,7 +580,7 @@ namespace MedicalCheckInputTool
382 580 {
383 581 if (!sv.houseNo.Equals(isDBNull(reader, "世帯番号")))
384 582 {
385   - if("２回目".Equals(Global.times))
  583 + if("２回目".Equals(times))
386 584 {
387 585 textBox2.BackColor = Color.Pink;
388 586 }
... ... @@ -390,7 +588,7 @@ namespace MedicalCheckInputTool
390 588 }
391 589 if (!sv.phone.Equals(isDBNull(reader, "電話番号")))
392 590 {
393   - if("２回目".Equals(Global.times))
  591 + if("２回目".Equals(times))
394 592 {
395 593 textBox4.BackColor = Color.Pink;
396 594 }
... ... @@ -398,7 +596,7 @@ namespace MedicalCheckInputTool
398 596 }
399 597 if (!sv.mobilePhone.Equals(isDBNull(reader, "携帯番号")))
400 598 {
401   - if("２回目".Equals(Global.times))
  599 + if("２回目".Equals(times))
402 600 {
403 601 textBox5.BackColor = Color.Pink;
404 602 }
... ... @@ -406,12 +604,15 @@ namespace MedicalCheckInputTool
406 604 }
407 605 if (!sv.healthCheck.Equals(isDBNull(reader, "健康診査")))
408 606 {
409   - textBox6.BackColor = Color.Pink;
  607 + if ("２回目".Equals(times))
  608 + {
  609 + textBox6.BackColor = Color.Pink;
  610 + }
410 611 err = true;
411 612 }
412 613 if (!sv.lungCancer.Equals(isDBNull(reader, "結核肺がん")))
413 614 {
414   - if("２回目".Equals(Global.times))
  615 + if("２回目".Equals(times))
415 616 {
416 617 textBox7.BackColor = Color.Pink;
417 618 }
... ... @@ -419,7 +620,7 @@ namespace MedicalCheckInputTool
419 620 }
420 621 if (!sv.stomachCancer.Equals(isDBNull(reader, "胃がん")))
421 622 {
422   - if("２回目".Equals(Global.times))
  623 + if("２回目".Equals(times))
423 624 {
424 625 textBox8.BackColor = Color.Pink;
425 626 }
... ... @@ -427,7 +628,7 @@ namespace MedicalCheckInputTool
427 628 }
428 629 if (!sv.colorectalCancer.Equals(isDBNull(reader, "大腸がん")))
429 630 {
430   - if("２回目".Equals(Global.times))
  631 + if("２回目".Equals(times))
431 632 {
432 633 textBox9.BackColor = Color.Pink;
433 634 }
... ... @@ -435,7 +636,7 @@ namespace MedicalCheckInputTool
435 636 }
436 637 if (!sv.prostateCancer.Equals(isDBNull(reader, "前立腺がん")))
437 638 {
438   - if("２回目".Equals(Global.times))
  639 + if("２回目".Equals(times))
439 640 {
440 641 textBox10.BackColor = Color.Pink;
441 642 }
... ... @@ -443,7 +644,7 @@ namespace MedicalCheckInputTool
443 644 }
444 645 if (!sv.osteoporosis.Equals(isDBNull(reader, "骨粗鬆症")))
445 646 {
446   - if("２回目".Equals(Global.times))
  647 + if("２回目".Equals(times))
447 648 {
448 649 textBox11.BackColor = Color.Pink;
449 650 }
... ... @@ -451,7 +652,7 @@ namespace MedicalCheckInputTool
451 652 }
452 653 if (!sv.dental.Equals(isDBNull(reader, "成人歯科")))
453 654 {
454   - if("２回目".Equals(Global.times))
  655 + if("２回目".Equals(times))
455 656 {
456 657 textBox12.BackColor = Color.Pink;
457 658 }
... ... @@ -459,31 +660,35 @@ namespace MedicalCheckInputTool
459 660 }
460 661 if (!sv.cervicalCancer.Equals(isDBNull(reader, "子宮頸がん")))
461 662 {
462   - if("２回目".Equals(Global.times))
  663 + if("２回目".Equals(times))
463 664 {
464 665 textBox13.BackColor = Color.Pink;
  666 + textBox31.BackColor = Color.Pink;
465 667 }
466 668 err = true;
467 669 }
468 670 if (!sv.breastCancer.Equals(isDBNull(reader, "乳がん")))
469 671 {
470   - if("２回目".Equals(Global.times))
  672 + if("２回目".Equals(times))
471 673 {
472 674 textBox14.BackColor = Color.Pink;
  675 + textBox32.BackColor = Color.Pink;
473 676 }
474 677 err = true;
475 678 }
476 679 if (!sv.place.Equals(isDBNull(reader, "希望場所")))
477 680 {
478   - if("２回目".Equals(Global.times))
  681 + if("２回目".Equals(times))
479 682 {
480 683 textBox15.BackColor = Color.Pink;
  684 + textBox33.BackColor = Color.Pink;
  685 + textBox34.BackColor = Color.Pink;
481 686 }
482 687 err = true;
483 688 }
484 689 if (!sv.handicapped.Equals(isDBNull(reader, "身体不自由")))
485 690 {
486   - if("２回目".Equals(Global.times))
  691 + if("２回目".Equals(times))
487 692 {
488 693 textBox16.BackColor = Color.Pink;
489 694 }
... ... @@ -747,8 +952,12 @@ namespace MedicalCheckInputTool
747 952 textBox11.BackColor = Color.Empty;
748 953 textBox12.BackColor = Color.Empty;
749 954 textBox13.BackColor = Color.Empty;
  955 + textBox31.BackColor = Color.Empty;
750 956 textBox14.BackColor = Color.Empty;
  957 + textBox32.BackColor = Color.Empty;
751 958 textBox15.BackColor = Color.Empty;
  959 + textBox33.BackColor = Color.Empty;
  960 + textBox34.BackColor = Color.Empty;
752 961 textBox16.BackColor = Color.Empty;
753 962
754 963 textBox1.Text = "";
... ... @@ -763,8 +972,12 @@ namespace MedicalCheckInputTool
763 972 textBox11.Text = "";
764 973 textBox12.Text = "";
765 974 textBox13.Text = "";
  975 + textBox31.Text = "";
766 976 textBox14.Text = "";
  977 + textBox32.Text = "";
767 978 textBox15.Text = "";
  979 + textBox33.Text = "";
  980 + textBox34.Text = "";
768 981 textBox16.Text = "";
769 982
770 983 label20.Text = "";
... ... @@ -772,6 +985,7 @@ namespace MedicalCheckInputTool
772 985 textBox1.Focus();
773 986
774 987 panel1.Visible = false;
  988 + button6.Text = "１回目の表示";
775 989 }
776 990
777 991 private void textBox1_TextChanged(object sender, EventArgs e) //整理番号
... ... @@ -796,126 +1010,87 @@ namespace MedicalCheckInputTool
796 1010
797 1011 private void textBox6_TextChanged(object sender, EventArgs e) //健康診査
798 1012 {
799   - if("".Equals(textBox6.Text))
800   - {
801   - label7.ForeColor = Color.Black;
802   - }
803   - else
804   - {
805   - label7.ForeColor = Color.Blue;
806   - }
  1013 + dspModify(textBox6, label7);
807 1014 sendTabKey(textBox6, 1);
808 1015 }
809 1016
810 1017 private void textBox7_TextChanged(object sender, EventArgs e) //結核肺がん
811 1018 {
812   - if ("".Equals(textBox7.Text))
813   - {
814   - label8.ForeColor = Color.Black;
815   - }
816   - else
817   - {
818   - label8.ForeColor = Color.Blue;
819   - }
  1019 + dspModify(textBox7, label8);
820 1020 sendTabKey(textBox7, 1);
821 1021 }
822 1022
823 1023 private void textBox8_TextChanged(object sender, EventArgs e) //胃がん
824 1024 {
825   - if ("".Equals(textBox8.Text))
826   - {
827   - label9.ForeColor = Color.Black;
828   - }
829   - else
830   - {
831   - label9.ForeColor = Color.Blue;
832   - }
  1025 + dspModify(textBox8, label9);
833 1026 sendTabKey(textBox8, 1);
834 1027 }
835 1028
836 1029 private void textBox9_TextChanged(object sender, EventArgs e) //大腸がん
837 1030 {
838   - if ("".Equals(textBox9.Text))
839   - {
840   - label10.ForeColor = Color.Black;
841   - }
842   - else
843   - {
844   - label10.ForeColor = Color.Blue;
845   - }
  1031 + dspModify(textBox9, label10);
846 1032 sendTabKey(textBox9, 1);
847 1033 }
848 1034
849 1035 private void textBox10_TextChanged(object sender, EventArgs e) //前立腺がん
850 1036 {
851   - if ("".Equals(textBox10.Text))
852   - {
853   - label11.ForeColor = Color.Black;
854   - }
855   - else
856   - {
857   - label11.ForeColor = Color.Blue;
858   - }
  1037 + dspModify(textBox10, label11);
859 1038 sendTabKey(textBox10, 1);
860 1039 }
861 1040
862 1041 private void textBox11_TextChanged(object sender, EventArgs e) //骨粗鬆症
863 1042 {
864   - if ("".Equals(textBox11.Text))
865   - {
866   - label12.ForeColor = Color.Black;
867   - }
868   - else
869   - {
870   - label12.ForeColor = Color.Blue;
871   - }
  1043 + dspModify(textBox11, label12);
872 1044 sendTabKey(textBox11, 1);
873 1045 }
874 1046
875 1047 private void textBox12_TextChanged(object sender, EventArgs e) //成人歯科
876 1048 {
877   - if ("".Equals(textBox12.Text))
878   - {
879   - label13.ForeColor = Color.Black;
880   - }
881   - else
882   - {
883   - label13.ForeColor = Color.Blue;
884   - }
  1049 + dspModify(textBox12, label13);
885 1050 sendTabKey(textBox12, 1);
886 1051 }
887 1052
888 1053 private void textBox13_TextChanged(object sender, EventArgs e) //子宮頸がん
889 1054 {
890   - if ("".Equals(textBox13.Text))
891   - {
892   - label14.ForeColor = Color.Black;
893   - }
894   - else
895   - {
896   - label14.ForeColor = Color.Blue;
897   - }
  1055 + dspModify(textBox13, label14);
898 1056 sendTabKey(textBox13, 1);
899 1057 }
900 1058
  1059 + private void textBox31_TextChanged(object sender, EventArgs e) //子宮頸がん（指定医療機関）
  1060 + {
  1061 + dspModify(textBox31, label22);
  1062 + sendTabKey(textBox31, 1);
  1063 + }
  1064 +
901 1065 private void textBox14_TextChanged(object sender, EventArgs e) //乳がん
902 1066 {
903   - if ("".Equals(textBox14.Text))
904   - {
905   - label15.ForeColor = Color.Black;
906   - }
907   - else
908   - {
909   - label15.ForeColor = Color.Blue;
910   - }
  1067 + dspModify(textBox14, label15);
911 1068 sendTabKey(textBox14, 1);
912 1069 }
913 1070
  1071 + private void textBox32_TextChanged(object sender, EventArgs e) //石巻市医師会
  1072 + {
  1073 + dspModify(textBox32, label23);
  1074 + sendTabKey(textBox32, 1);
  1075 +
  1076 + }
  1077 +
914 1078 private void textBox15_TextChanged(object sender, EventArgs e) //希望場所
915 1079 {
916 1080 sendTabKey(textBox15, 1);
917 1081 }
918 1082
  1083 + private void textBox33_TextChanged(object sender, EventArgs e) //希望場所（本庁個別）
  1084 + {
  1085 + sendTabKey(textBox15, 1);
  1086 + }
  1087 +
  1088 + private void textBox34_TextChanged(object sender, EventArgs e)//希望場所（石巻ロイヤル）
  1089 + {
  1090 + sendTabKey(textBox15, 1);
  1091 + }
  1092 +
  1093 +
919 1094 private void textBox16_TextChanged(object sender, EventArgs e) //身体不自由
920 1095 {
921 1096 sendTabKey(textBox16, 1);
... ... @@ -934,7 +1109,7 @@ namespace MedicalCheckInputTool
934 1109
935 1110 SaveData sv = makeSaveData(); //保存用データ作成（パディング済み）
936 1111
937   - bool matchErr = matchInput(sv);
  1112 + bool matchErr = matchInput(sv, Global.times);
938 1113 if (matchErr)
939 1114 {
940 1115 if ("２回目".Equals(Global.times))
... ... @@ -1070,6 +1245,13 @@ namespace MedicalCheckInputTool
1070 1245 {
1071 1246 if ("２回目".Equals(Global.times))
1072 1247 {
  1248 + if ("".Equals(textBox1.Text))
  1249 + {
  1250 + label20.Text = "";
  1251 + label20.ForeColor = Color.Empty;
  1252 + return;
  1253 + }
  1254 +
1073 1255 bool isExist = false;
1074 1256
1075 1257 MySqlConnection conn;
... ... @@ -1096,122 +1278,195 @@ namespace MedicalCheckInputTool
1096 1278 }
1097 1279 }
1098 1280
1099   - private void shortcutKey(object sender, KeyPressEventArgs e)
  1281 + //入力可能(数字とハイフンとBS)
  1282 + private void inputAllNumber(object sender, KeyPressEventArgs e)
1100 1283 {
1101   - if (e.KeyChar == '/') // 「/」BackSpace
  1284 + if ((e.KeyChar < '0' || e.KeyChar > '9') && (e.KeyChar != '\b') && (e.KeyChar != '-'))
1102 1285 {
1103   - SendKeys.Send("{BS}");
1104 1286 e.Handled = true;
1105 1287 }
1106   - if (e.KeyChar == '+') // 「+」次へ
  1288 + }
  1289 +
  1290 + //入力可能(0～5とBS)
  1291 + private void inputNumber(object sender, KeyPressEventArgs e)
  1292 + {
  1293 + if ((e.KeyChar < '0' || e.KeyChar > '5') && (e.KeyChar != '\b'))
1107 1294 {
1108   -// button2.Focus();
1109   -// button2.PerformClick();
1110 1295 e.Handled = true;
1111 1296 }
1112   - if (e.KeyChar == '*') // 「*」Tab
  1297 + }
  1298 +
  1299 + //入力可能(0とBS)
  1300 + private void inputZero(object sender, KeyPressEventArgs e)
  1301 + {
  1302 + if ((e.KeyChar != '0') && (e.KeyChar != '\b'))
1113 1303 {
1114   -// SendKeys.Send("{Tab}");
1115 1304 e.Handled = true;
1116 1305 }
1117 1306 }
1118 1307
  1308 + private void dspModify(TextBox tb, Label lb)
  1309 + {
  1310 + if ("".Equals(tb.Text))
  1311 + {
  1312 + lb.ForeColor = Color.Black;
  1313 + lb.Font = new Font(lb.Font, FontStyle.Regular);
  1314 + }
  1315 + else
  1316 + {
  1317 + if ("0".Equals(tb.Text))
  1318 + {
  1319 + lb.ForeColor = Color.Red;
  1320 + lb.Font = new Font(lb.Font, FontStyle.Bold);
  1321 + }
  1322 + else
  1323 + {
  1324 + lb.ForeColor = Color.Blue;
  1325 + lb.Font = new Font(lb.Font, FontStyle.Regular);
  1326 + }
  1327 + }
  1328 + }
  1329 +
1119 1330 private void textBox1_KeyPress(object sender, KeyPressEventArgs e)
1120 1331 {
1121   - shortcutKey(sender, e);
  1332 + inputAllNumber(sender, e);
1122 1333 }
1123 1334
1124 1335 private void textBox2_KeyPress(object sender, KeyPressEventArgs e)
1125 1336 {
1126   - shortcutKey(sender, e);
  1337 + inputAllNumber(sender, e);
1127 1338 }
1128 1339
1129 1340 private void textBox4_KeyPress(object sender, KeyPressEventArgs e)
1130 1341 {
1131   - shortcutKey(sender, e);
  1342 + inputAllNumber(sender, e);
1132 1343 }
1133 1344
1134 1345 private void textBox5_KeyPress(object sender, KeyPressEventArgs e)
1135 1346 {
1136   - shortcutKey(sender, e);
  1347 + inputAllNumber(sender, e);
1137 1348 }
1138 1349
1139 1350 private void textBox6_KeyPress(object sender, KeyPressEventArgs e)
1140 1351 {
1141   - shortcutKey(sender, e);
  1352 + inputNumber(sender, e);
1142 1353 }
1143 1354
1144 1355 private void textBox7_KeyPress(object sender, KeyPressEventArgs e)
1145 1356 {
1146   - shortcutKey(sender, e);
  1357 + inputNumber(sender, e);
1147 1358 }
1148 1359
1149 1360 private void textBox8_KeyPress(object sender, KeyPressEventArgs e)
1150 1361 {
1151   - shortcutKey(sender, e);
  1362 + inputNumber(sender, e);
1152 1363 }
1153 1364
1154 1365 private void textBox9_KeyPress(object sender, KeyPressEventArgs e)
1155 1366 {
1156   - shortcutKey(sender, e);
  1367 + inputNumber(sender, e);
1157 1368 }
1158 1369
1159 1370 private void textBox10_KeyPress(object sender, KeyPressEventArgs e)
1160 1371 {
1161   - shortcutKey(sender, e);
  1372 + inputNumber(sender, e);
1162 1373 }
1163 1374
1164 1375 private void textBox11_KeyPress(object sender, KeyPressEventArgs e)
1165 1376 {
1166   - shortcutKey(sender, e);
  1377 + inputNumber(sender, e);
1167 1378 }
1168 1379
1169 1380 private void textBox12_KeyPress(object sender, KeyPressEventArgs e)
1170 1381 {
1171   - shortcutKey(sender, e);
  1382 + inputNumber(sender, e);
1172 1383 }
1173 1384
1174 1385 private void textBox13_KeyPress(object sender, KeyPressEventArgs e)
1175 1386 {
1176   - shortcutKey(sender, e);
  1387 + if ("".Equals(textBox31.Text)) //どちらかにしか入れさせない
  1388 + {
  1389 + inputNumber(sender, e);
  1390 + }
  1391 + else
  1392 + {
  1393 + e.Handled = true;
  1394 + }
  1395 + }
  1396 +
  1397 + private void textBox31_KeyPress(object sender, KeyPressEventArgs e) //子宮頸がん（指定医療機関）
  1398 + {
  1399 + if ("".Equals(textBox13.Text)) //どちらかにしか入れさせない
  1400 + {
  1401 + inputNumber(sender, e);
  1402 + }
  1403 + else
  1404 + {
  1405 + e.Handled = true;
  1406 + }
1177 1407 }
1178 1408
1179 1409 private void textBox14_KeyPress(object sender, KeyPressEventArgs e)
1180 1410 {
1181   - shortcutKey(sender, e);
  1411 + if ("".Equals(textBox32.Text)) //どちらかにしか入れさせない
  1412 + {
  1413 + inputNumber(sender, e);
  1414 + }
  1415 + else
  1416 + {
  1417 + e.Handled = true;
  1418 + }
1182 1419 }
1183 1420
  1421 + private void textBox32_KeyPress(object sender, KeyPressEventArgs e)//乳がん（石巻医師会）
  1422 + {
  1423 + if ("".Equals(textBox14.Text)) //どちらかにしか入れさせない
  1424 + {
  1425 + inputNumber(sender, e);
  1426 + }
  1427 + else
  1428 + {
  1429 + e.Handled = true;
  1430 + }
  1431 + }
  1432 +
  1433 +
1184 1434 private void textBox15_KeyPress(object sender, KeyPressEventArgs e)
1185 1435 {
1186   - shortcutKey(sender, e);
  1436 + inputZero(sender, e);
  1437 + }
  1438 +
  1439 + private void textBox33_KeyPress(object sender, KeyPressEventArgs e)//本庁個別
  1440 + {
  1441 + inputZero(sender, e);
  1442 + }
  1443 +
  1444 + private void textBox34_KeyPress(object sender, KeyPressEventArgs e)//石巻ロイヤル
  1445 + {
  1446 + inputZero(sender, e);
1187 1447 }
1188 1448
1189   - private void textBox16_KeyPress(object sender, KeyPressEventArgs e)
  1449 + private void textBox16_KeyPress(object sender, KeyPressEventArgs e)//身体不自由
1190 1450 {
1191   - shortcutKey(sender, e);
  1451 + inputZero(sender, e);
1192 1452 }
1193 1453
  1454 +
1194 1455 private void Form2_KeyDown(object sender, KeyEventArgs e)
1195 1456 {
1196   - if(e.KeyCode == Keys.Multiply)
  1457 + if (e.KeyCode == Keys.Enter)
1197 1458 {
1198 1459 SendKeys.Send("{Tab}");
1199 1460 e.Handled = true;
1200 1461 }
1201 1462
1202   - if(e.KeyCode == Keys.Add)
  1463 + if(e.KeyCode == Keys.Escape)
1203 1464 {
1204 1465 button2.Focus();
1205 1466 button2.PerformClick();
1206 1467 e.Handled = true;
1207 1468 }
1208 1469
1209   - if(e.KeyCode == Keys.Enter)
1210   - {
1211   -// button1.Focus();
1212   - button1.PerformClick();
1213   - e.Handled = true;
1214   - }
1215 1470 }
1216 1471
1217 1472 //削除
... ... @@ -1243,6 +1498,11 @@ namespace MedicalCheckInputTool
1243 1498 dspCount();
1244 1499 }
1245 1500
  1501 +
  1502 + /***************************************************************/
  1503 + /***************２回目時入力時の１回目修正用********************/
  1504 + /***************************************************************/
  1505 +
1246 1506 private bool selectDataOnce(string tableName, string lotNo, string serialNo, MySqlConnection conn)
1247 1507 {
1248 1508 bool err = false;
... ... @@ -1306,7 +1566,113 @@ namespace MedicalCheckInputTool
1306 1566 return err;
1307 1567 }
1308 1568
1309   - //１回目の入力
  1569 + //１回目の修正
  1570 + private void updateDataOnce(MySqlConnection conn)
  1571 + {
  1572 + bool match = false;
  1573 + //入力チェック
  1574 + if ("".Equals(textBox3.Text)) //必須は整理番号のみ
  1575 + {
  1576 + MessageBox.Show("整理番号が入力されていません");
  1577 + return;
  1578 + }
  1579 +
  1580 + SaveData sv = makeSaveDataOnce(); //保存用データ生成（パディング済み）
  1581 +
  1582 + //マッチングチェック
  1583 + bool matchErr = matchInput(sv, "１回目");
  1584 + //一致しない場合、エラー表示はするが保存は実行してしまう
  1585 + if (matchErr)
  1586 + {
  1587 + //保存へ進む
  1588 + }
  1589 + else
  1590 + {
  1591 + //エラーなしは完了フラグを立てる
  1592 + match = true;
  1593 + }
  1594 +
  1595 + //保存処理
  1596 + if (match)
  1597 + {
  1598 + sv.done = "1"; //マッチングOKの場合、完了フラグを立てる
  1599 + }
  1600 +
  1601 + sv.updateUser = Global.inputUser;
  1602 + bool err = updateData(sv, "１回目", conn);
  1603 +
  1604 + SaveData sv1 = new SaveData();
  1605 + sv1.lotNo = int.Parse(Global.lotNo);
  1606 + sv1.serialNo = sv.serialNo;
  1607 + sv1.done = sv.done;
  1608 + string tableName = "２回目";
  1609 + updateDoneFlag(sv1, tableName, conn);//別の回の完了フラグも立てる
  1610 +
  1611 + }
  1612 +
  1613 + private SaveData makeSaveDataOnce()
  1614 + {
  1615 + SaveData sv = new SaveData();
  1616 +
  1617 + sv.lotNo = int.Parse(Global.lotNo); //ロット番号
  1618 + sv.adminCode = Global.adminCode; //行政区コード
  1619 + sv.adminName = Global.adminName; //行政区名称
  1620 + sv.healthArea = Global.healthArea; //保健区
  1621 + sv.serialNo = textBox3.Text.PadLeft(10, '0'); //整理番号
  1622 + if ("".Equals(textBox17.Text))
  1623 + {
  1624 + sv.houseNo = "";
  1625 + }
  1626 + else
  1627 + {
  1628 + sv.houseNo = textBox17.Text.PadLeft(10, '0'); //世帯番号
  1629 + }
  1630 + sv.healthCheck = textBox20.Text; //健康診査
  1631 + sv.lungCancer = textBox21.Text; //結核肺がん
  1632 + sv.stomachCancer = textBox22.Text; //胃がん
  1633 + sv.colorectalCancer = textBox23.Text; //大腸がん
  1634 + sv.prostateCancer = textBox24.Text; //前立腺がん
  1635 + sv.osteoporosis = textBox25.Text; //骨粗鬆症
  1636 + sv.dental = textBox26.Text; //成人歯科
  1637 + sv.cervicalCancer = textBox27.Text; //子宮頸がん
  1638 + sv.breastCancer = textBox28.Text; //乳がん
  1639 + sv.place = textBox29.Text; //希望場所
  1640 + sv.handicapped = "".Equals(textBox30.Text) ? "" : "8"; //身体不自由
  1641 + sv.phone = textBox18.Text; //電話番号
  1642 + sv.mobilePhone = textBox19.Text; //携帯番号
  1643 + sv.inputDate = null; //入力日
  1644 + sv.inputUser = null; //入力者
  1645 + sv.updateDate = null; //修正日
  1646 + sv.updateUser = null; //修正者
  1647 + sv.done = ""; //完了
  1648 +
  1649 + return sv;
  1650 + }
  1651 +
  1652 + //編集可能に変更
  1653 + private void enableEdit()
  1654 + {
  1655 + textBox17.ReadOnly = false;
  1656 + textBox18.ReadOnly = false;
  1657 + textBox19.ReadOnly = false;
  1658 + textBox20.ReadOnly = false;
  1659 + textBox21.ReadOnly = false;
  1660 + textBox22.ReadOnly = false;
  1661 + textBox23.ReadOnly = false;
  1662 + textBox24.ReadOnly = false;
  1663 + textBox25.ReadOnly = false;
  1664 + textBox26.ReadOnly = false;
  1665 + textBox27.ReadOnly = false;
  1666 + textBox35.ReadOnly = false;
  1667 + textBox28.ReadOnly = false;
  1668 + textBox36.ReadOnly = false;
  1669 + textBox29.ReadOnly = false;
  1670 + textBox37.ReadOnly = false;
  1671 + textBox38.ReadOnly = false;
  1672 + textBox30.ReadOnly = false;
  1673 + }
  1674 +
  1675 + //１回目の表示
1310 1676 private void button6_Click(object sender, EventArgs e)
1311 1677 {
1312 1678 if("".Equals(textBox1.Text))
... ... @@ -1320,7 +1686,23 @@ namespace MedicalCheckInputTool
1320 1686 conn.Open();
1321 1687
1322 1688 string serialNo = textBox1.Text.PadLeft(10, '0');
1323   - selectDataOnce("１回目", Global.lotNo, serialNo, conn);//削除
  1689 +
  1690 + if ("１回目の表示".Equals(button6.Text))
  1691 + {
  1692 + selectDataOnce("１回目", Global.lotNo, serialNo, conn);//表示
  1693 + button6.Text = "１回目の編集";
  1694 + }
  1695 + else if("１回目の編集".Equals(button6.Text))
  1696 + {
  1697 + //編集可能に変更（整理番号だけダメにしたほうがいい？）
  1698 + enableEdit();
  1699 + button6.Text = "１回目の保存";
  1700 + }
  1701 + else if ("１回目の保存".Equals(button6.Text))
  1702 + {
  1703 + //データ保存
  1704 + updateDataOnce(conn);
  1705 + }
1324 1706
1325 1707 panel1.Visible = true;
1326 1708
... ... @@ -1328,6 +1710,107 @@ namespace MedicalCheckInputTool
1328 1710
1329 1711 }
1330 1712
  1713 + //閉じる
  1714 + private void button7_Click(object sender, EventArgs e)
  1715 + {
  1716 + this.Close();
  1717 + }
  1718 +
  1719 + private void textBox3_KeyPress(object sender, KeyPressEventArgs e)
  1720 + {
  1721 +
  1722 + }
  1723 +
  1724 + private void textBox17_KeyPress(object sender, KeyPressEventArgs e)
  1725 + {
  1726 +
  1727 + }
  1728 +
  1729 + private void textBox18_KeyPress(object sender, KeyPressEventArgs e)
  1730 + {
  1731 +
  1732 + }
  1733 +
  1734 + private void textBox19_KeyPress(object sender, KeyPressEventArgs e)
  1735 + {
  1736 +
  1737 + }
  1738 +
  1739 + private void textBox20_KeyPress(object sender, KeyPressEventArgs e)
  1740 + {
  1741 +
  1742 + }
  1743 +
  1744 + private void textBox21_KeyPress(object sender, KeyPressEventArgs e)
  1745 + {
  1746 +
  1747 + }
  1748 +
  1749 + private void textBox22_KeyPress(object sender, KeyPressEventArgs e)
  1750 + {
  1751 +
  1752 + }
  1753 +
  1754 + private void textBox23_KeyPress(object sender, KeyPressEventArgs e)
  1755 + {
  1756 +
  1757 + }
  1758 +
  1759 + private void textBox24_KeyPress(object sender, KeyPressEventArgs e)
  1760 + {
  1761 +
  1762 + }
  1763 +
  1764 + private void textBox25_KeyPress(object sender, KeyPressEventArgs e)
  1765 + {
  1766 +
  1767 + }
  1768 +
  1769 + private void textBox26_KeyPress(object sender, KeyPressEventArgs e)
  1770 + {
  1771 +
  1772 + }
  1773 +
  1774 + private void textBox27_KeyPress(object sender, KeyPressEventArgs e)
  1775 + {
  1776 +
  1777 + }
  1778 +
  1779 + private void textBox35_KeyPress(object sender, KeyPressEventArgs e)
  1780 + {
  1781 +
  1782 + }
  1783 +
  1784 + private void textBox28_KeyPress(object sender, KeyPressEventArgs e)
  1785 + {
  1786 +
  1787 + }
  1788 +
  1789 + private void textBox36_KeyPress(object sender, KeyPressEventArgs e)
  1790 + {
  1791 +
  1792 + }
  1793 +
  1794 + private void textBox29_KeyPress(object sender, KeyPressEventArgs e)
  1795 + {
  1796 +
  1797 + }
  1798 +
  1799 + private void textBox37_KeyPress(object sender, KeyPressEventArgs e)
  1800 + {
  1801 +
  1802 + }
  1803 +
  1804 + private void textBox38_KeyPress(object sender, KeyPressEventArgs e)
  1805 + {
  1806 +
  1807 + }
  1808 +
  1809 + private void textBox30_KeyPress(object sender, KeyPressEventArgs e)
  1810 + {
  1811 +
  1812 + }
  1813 +
1331 1814
1332 1815 }
1333 1816 }
... ...
... ... @@ -15,7 +15,7 @@ namespace MedicalCheckInputTool
15 15 {
16 16 public partial class Form3 : Form
17 17 {
18   - private const int PAGEMAX = 10;
  18 + private const int PAGEMAX = 100;
19 19 private int currentPageNo = 1;
20 20 private int maxPageNo = 1;
21 21
... ... @@ -451,7 +451,7 @@ namespace MedicalCheckInputTool
451 451 MySqlCommand readCmd = new MySqlCommand(readQuery, readerCon);
452 452 readCmd.Parameters.AddWithValue("lotNo", EditParam.lotNo);
453 453
454   - string countQuery = "select count(`世帯番号`) from `１回目` where `行政区コード`= @adminCode and `ロット番号` = @lotNo group by `行政区コード`";
  454 + string countQuery = "select count(distinct `世帯番号`) from `１回目` where `行政区コード`= @adminCode and `ロット番号` = @lotNo";
455 455 MySqlCommand countCmd = new MySqlCommand(countQuery, readerCon);
456 456
457 457 try
... ... @@ -476,6 +476,7 @@ namespace MedicalCheckInputTool
476 476 reader.Close();
477 477
478 478 StreamWriter writer = new StreamWriter("SummaryAdmin.csv", false, System.Text.Encoding.GetEncoding("shift_jis")); //ファイルストリーム
  479 + writer.WriteLine("行政区コード,行政区名称,データ作成件数,世帯数");
479 480
480 481 foreach (SummaryAdmin sa in adminList)
481 482 {
... ... @@ -515,7 +516,7 @@ namespace MedicalCheckInputTool
515 516 string readQuery = "select `行政区コード`,`行政区名称`,count(行政区コード) from `１回目` where (`ロット番号` = @lotNo) and (`保健区` = @healthArea) group by `行政区コード` order by `行政区コード`";
516 517 MySqlCommand readCmd = new MySqlCommand(readQuery, readerCon);
517 518
518   - string countQuery = "select count(`世帯番号`) from `１回目` where (`行政区コード`= @adminCode) and (`ロット番号` = @lotNo) and (`保健区` = @healthArea) group by `行政区コード`";
  519 + string countQuery = "select count(distinct `世帯番号`) from `１回目` where (`行政区コード`= @adminCode) and (`ロット番号` = @lotNo) and (`保健区` = @healthArea) ";
519 520 MySqlCommand countCmd = new MySqlCommand(countQuery, readerCon);
520 521
521 522 try
... ... @@ -561,6 +562,7 @@ namespace MedicalCheckInputTool
561 562 reader.Close();
562 563
563 564 StreamWriter writer = new StreamWriter("SummaryHealthArea_" + ha + ".csv", false, System.Text.Encoding.GetEncoding("shift_jis")); //ファイルストリーム
  565 + writer.WriteLine("行政区コード,行政区名称,件数,世帯数");
564 566
565 567 foreach (SummaryAdmin sa in adminList)
566 568 {
... ...
... ... @@ -91,6 +91,12 @@
91 91 <AutoGen>True</AutoGen>
92 92 <DependentUpon>Resources.resx</DependentUpon>
93 93 </Compile>
  94 + <None Include="adminName.json">
  95 + <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  96 + </None>
  97 + <None Include="healthArea.json">
  98 + <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  99 + </None>
94 100 <None Include="Properties\Settings.settings">
95 101 <Generator>SettingsSingleFileGenerator</Generator>
96 102 <LastGenOutput>Settings.Designer.cs</LastGenOutput>
... ...
  1 +--broken encoding: UTF-16BE
  2 + "adminName": {
  3 + "001011":"’†‰›ˆê’š–Ú‘æ‚P",
  4 + "001012":"’†‰›ˆê’š–Ú‘æ‚Q",
  5 + "001021":"’†‰›“ñ’š–Ú‘æ‚P",
  6 + "001022":"’†‰›“ñ’š–Ú‘æ‚Q",
  7 + "001090":"—§’¬ˆê’š–Ú"
  8 + }
  9 +}
\ No newline at end of file
... ...
  1 +{
  2 + "healthArea": {
  3 + "001011":"ΊŞ",
  4 + "001012":"ΊŞ",
  5 + "001021":"ΊŞ",
  6 + "001022":"ΊŞ",
  7 + "001090":"ŹZ‹g"
  8 + }
  9 +}
\ No newline at end of file
... ...
Please register or login to post a comment