Commit 9227377674b25d05679d83fdd440e8c0a90df01c
1 parent
844dfcb218
Exists in
master
and in
6 other branches
隆化:屈光筛查异常值
Showing 1 changed file with 50 additions and 26 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java
View file @
9227377
| ... | ... | @@ -70,7 +70,7 @@ |
| 70 | 70 | (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8>babyCheck.getLhsljcstRight()) || |
| 71 | 71 | ("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6>babyCheck.getLhsljcstLeft()) || |
| 72 | 72 | (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8>babyCheck.getLhsljcstLeft()) || |
| 73 | - "2".equals(babyCheck.getLhsldcRight()) || "2".equals(babyCheck.getLhsldcLeft()) || dioptricAnomaly(babyCheck) | |
| 73 | + "2".equals(babyCheck.getLhsldcRight()) || "2".equals(babyCheck.getLhsldcLeft()) || (Boolean) dioptricAnomaly(babyCheck).get("state") | |
| 74 | 74 | |
| 75 | 75 | ){ |
| 76 | 76 | babyCheck.setPositiveType("2"); |
| ... | ... | @@ -401,7 +401,7 @@ |
| 401 | 401 | if("2".equals(babyCheck.getLhsldcLeft())){ |
| 402 | 402 | abnormal+="视力低常(左);"; |
| 403 | 403 | } |
| 404 | - if(dioptricAnomaly(babyCheck)){ | |
| 404 | + if((Boolean) dioptricAnomaly(babyCheck).get("state")){ | |
| 405 | 405 | abnormal+="屈光筛查"; |
| 406 | 406 | } |
| 407 | 407 | |
| ... | ... | @@ -423,8 +423,9 @@ |
| 423 | 423 | (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > babyCheck.getLhsljcstLeft())){ |
| 424 | 424 | abnormalInfo+="视力检查(左):"+babyCheck.getLhsljcstLeft()+";"; |
| 425 | 425 | } |
| 426 | - if(dioptricAnomaly(babyCheck)){ | |
| 427 | - abnormalInfo+="屈光筛查值异常;"; | |
| 426 | + Map map=dioptricAnomaly(babyCheck); | |
| 427 | + if((Boolean) map.get("state")){ | |
| 428 | + abnormalInfo+="屈光异常值:"+map.get("value"); | |
| 428 | 429 | } |
| 429 | 430 | |
| 430 | 431 | return abnormalInfo; |
| 431 | 432 | |
| 432 | 433 | |
| 433 | 434 | |
| 434 | 435 | |
| ... | ... | @@ -435,29 +436,36 @@ |
| 435 | 436 | * @param babyCheck |
| 436 | 437 | * @return |
| 437 | 438 | */ |
| 438 | - public boolean dioptricAnomaly(LhBabyEyeCheck babyCheck){ | |
| 439 | + public Map<String,Object> dioptricAnomaly(LhBabyEyeCheck babyCheck){ | |
| 440 | + Map<String,Object> map=new HashMap<>(); | |
| 441 | + map.put("state",false); | |
| 442 | + map.put("value",""); | |
| 439 | 443 | //6月-1岁 |
| 440 | 444 | if(Arrays.asList("6","8","12").contains(babyCheck.getCheckMonthId())){ |
| 441 | 445 | if(NumberUtils.isNumber(babyCheck.getLhdsr())){ |
| 442 | 446 | if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) ){ |
| 443 | - return true; | |
| 447 | + map.put("state",true); | |
| 448 | + map.put("value","DS-R:"+babyCheck.getLhdsr()+";"); | |
| 444 | 449 | } |
| 445 | 450 | } |
| 446 | 451 | if(NumberUtils.isNumber(babyCheck.getLhdcr())){ |
| 447 | 452 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || |
| 448 | 453 | 0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))){ |
| 449 | - return true; | |
| 454 | + map.put("state",true); | |
| 455 | + map.put("value",map.get("value")+"DC-R:"+babyCheck.getLhdcr()+";"); | |
| 450 | 456 | } |
| 451 | 457 | } |
| 452 | 458 | if(NumberUtils.isNumber(babyCheck.getLhdsl())){ |
| 453 | 459 | if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) ){ |
| 454 | - return true; | |
| 460 | + map.put("state",true); | |
| 461 | + map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); | |
| 455 | 462 | } |
| 456 | 463 | } |
| 457 | 464 | if(NumberUtils.isNumber(babyCheck.getLhdcl())){ |
| 458 | 465 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) || |
| 459 | 466 | 0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl()))){ |
| 460 | - return true; | |
| 467 | + map.put("state",true); | |
| 468 | + map.put("value",map.get("value")+"DC-L:"+babyCheck.getLhdcl()+";"); | |
| 461 | 469 | } |
| 462 | 470 | } |
| 463 | 471 | |
| 464 | 472 | |
| 465 | 473 | |
| 466 | 474 | |
| ... | ... | @@ -466,24 +474,28 @@ |
| 466 | 474 | if(Arrays.asList("24","30","36").contains(babyCheck.getCheckMonthId())) { |
| 467 | 475 | if (NumberUtils.isNumber(babyCheck.getLhdsr())) { |
| 468 | 476 | if (2.0d > Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))) { |
| 469 | - return true; | |
| 477 | + map.put("state",true); | |
| 478 | + map.put("value",map.get("value")+"DS-R:"+babyCheck.getLhdsr()+";"); | |
| 470 | 479 | } |
| 471 | 480 | } |
| 472 | 481 | if (NumberUtils.isNumber(babyCheck.getLhdcr())) { |
| 473 | 482 | if (-0.5d > Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || |
| 474 | 483 | 0.5d < Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))) { |
| 475 | - return true; | |
| 484 | + map.put("state",true); | |
| 485 | + map.put("value",map.get("value")+"DC-R:"+babyCheck.getLhdcr()+";"); | |
| 476 | 486 | } |
| 477 | 487 | } |
| 478 | 488 | if (NumberUtils.isNumber(babyCheck.getLhdsl())) { |
| 479 | 489 | if (2.0d > Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl()))) { |
| 480 | - return true; | |
| 490 | + map.put("state",true); | |
| 491 | + map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); | |
| 481 | 492 | } |
| 482 | 493 | } |
| 483 | 494 | if (NumberUtils.isNumber(babyCheck.getLhdcl())) { |
| 484 | 495 | if (-0.5d > Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) || |
| 485 | 496 | 0.5d < Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl()))) { |
| 486 | - return true; | |
| 497 | + map.put("state",true); | |
| 498 | + map.put("value",map.get("value")+"DC-L:"+babyCheck.getLhdcl()+";"); | |
| 487 | 499 | } |
| 488 | 500 | } |
| 489 | 501 | } |
| 490 | 502 | |
| 491 | 503 | |
| 492 | 504 | |
| ... | ... | @@ -491,24 +503,28 @@ |
| 491 | 503 | if(Arrays.asList("48","60").contains(babyCheck.getCheckMonthId())){ |
| 492 | 504 | if(NumberUtils.isNumber(babyCheck.getLhdsr())){ |
| 493 | 505 | if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) ){ |
| 494 | - return true; | |
| 506 | + map.put("state",true); | |
| 507 | + map.put("value",map.get("value")+"DS-R:"+babyCheck.getLhdsr()+";"); | |
| 495 | 508 | } |
| 496 | 509 | } |
| 497 | 510 | if(NumberUtils.isNumber(babyCheck.getLhdcr())){ |
| 498 | 511 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || |
| 499 | 512 | 0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))){ |
| 500 | - return true; | |
| 513 | + map.put("state",true); | |
| 514 | + map.put("value",map.get("value")+"DC-R:"+babyCheck.getLhdcr()+";"); | |
| 501 | 515 | } |
| 502 | 516 | } |
| 503 | 517 | if(NumberUtils.isNumber(babyCheck.getLhdsl())){ |
| 504 | 518 | if(2.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) ){ |
| 505 | - return true; | |
| 519 | + map.put("state",true); | |
| 520 | + map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); | |
| 506 | 521 | } |
| 507 | 522 | } |
| 508 | 523 | if(NumberUtils.isNumber(babyCheck.getLhdcl())){ |
| 509 | 524 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) || |
| 510 | 525 | 0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl()))){ |
| 511 | - return true; | |
| 526 | + map.put("state",true); | |
| 527 | + map.put("value",map.get("value")+"DC-L:"+babyCheck.getLhdcl()+";"); | |
| 512 | 528 | } |
| 513 | 529 | } |
| 514 | 530 | } |
| 515 | 531 | |
| 516 | 532 | |
| 517 | 533 | |
| ... | ... | @@ -517,25 +533,29 @@ |
| 517 | 533 | if(NumberUtils.isNumber(babyCheck.getLhdsr())){ |
| 518 | 534 | if(1.0d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr())) || |
| 519 | 535 | 1.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))){ |
| 520 | - return true; | |
| 536 | + map.put("state",true); | |
| 537 | + map.put("value",map.get("value")+"DS-R:"+babyCheck.getLhdsr()+";"); | |
| 521 | 538 | } |
| 522 | 539 | } |
| 523 | 540 | if(NumberUtils.isNumber(babyCheck.getLhdcr())){ |
| 524 | 541 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || |
| 525 | 542 | 0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))){ |
| 526 | - return true; | |
| 543 | + map.put("state",true); | |
| 544 | + map.put("value",map.get("value")+"DC-R:"+babyCheck.getLhdcr()+";"); | |
| 527 | 545 | } |
| 528 | 546 | } |
| 529 | 547 | if(NumberUtils.isNumber(babyCheck.getLhdsl())){ |
| 530 | 548 | if(1.0d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl())) || |
| 531 | 549 | 1.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl()))){ |
| 532 | - return true; | |
| 550 | + map.put("state",true); | |
| 551 | + map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); | |
| 533 | 552 | } |
| 534 | 553 | } |
| 535 | 554 | if(NumberUtils.isNumber(babyCheck.getLhdcl())){ |
| 536 | 555 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) || |
| 537 | 556 | 0.5d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl()))){ |
| 538 | - return true; | |
| 557 | + map.put("state",true); | |
| 558 | + map.put("value",map.get("value")+"DC-L:"+babyCheck.getLhdcl()+";"); | |
| 539 | 559 | } |
| 540 | 560 | } |
| 541 | 561 | } |
| 542 | 562 | |
| 543 | 563 | |
| 544 | 564 | |
| 545 | 565 | |
| ... | ... | @@ -543,28 +563,32 @@ |
| 543 | 563 | if(NumberUtils.isNumber(babyCheck.getCheckMonthId()) && 96<Integer.valueOf(babyCheck.getCheckMonthId())){ |
| 544 | 564 | if(NumberUtils.isNumber(babyCheck.getLhdsr())){ |
| 545 | 565 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsr()))){ |
| 546 | - return true; | |
| 566 | + map.put("state",true); | |
| 567 | + map.put("value",map.get("value")+"DS-R:"+babyCheck.getLhdsr()+";"); | |
| 547 | 568 | } |
| 548 | 569 | } |
| 549 | 570 | if(NumberUtils.isNumber(babyCheck.getLhdcr())){ |
| 550 | 571 | if(-1.0d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr())) || |
| 551 | 572 | 1.0d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcr()))){ |
| 552 | - return true; | |
| 573 | + map.put("state",true); | |
| 574 | + map.put("value",map.get("value")+"DC-R:"+babyCheck.getLhdcr()+";"); | |
| 553 | 575 | } |
| 554 | 576 | } |
| 555 | 577 | if(NumberUtils.isNumber(babyCheck.getLhdsl())){ |
| 556 | 578 | if(-0.5d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdsl()))){ |
| 557 | - return true; | |
| 579 | + map.put("state",true); | |
| 580 | + map.put("value",map.get("value")+"DS-L:"+babyCheck.getLhdsl()+";"); | |
| 558 | 581 | } |
| 559 | 582 | } |
| 560 | 583 | if(NumberUtils.isNumber(babyCheck.getLhdcl())){ |
| 561 | 584 | if(-1.0d>Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl())) || |
| 562 | 585 | 1.0d<Double.valueOf(NumberUtils.strDel(babyCheck.getLhdcl()))){ |
| 563 | - return true; | |
| 586 | + map.put("state",true); | |
| 587 | + map.put("value",map.get("value")+"DC-L:"+babyCheck.getLhdcl()+";"); | |
| 564 | 588 | } |
| 565 | 589 | } |
| 566 | 590 | } |
| 567 | - return false; | |
| 591 | + return map; | |
| 568 | 592 | } |
| 569 | 593 | |
| 570 | 594 | } |