jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 18ebba32669c730c19ba80ad2a419e33d8dd408b

Authored by liquanyu
1 parent 27d497c398
Exists in master and in 3 other branches dev, fengning2023-06-06, luanping

眼保健

Showing 2 changed files with 16 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyEyeCheck.java View file @ 18ebba3
... ... @@ -456,22 +456,16 @@
456 456 this.lhywjcqt = lhywjcqt;
457 457 }
458 458  
459   - public Double getLhsljcstRight() {
460   - if (lhsljcstRight != null){
461   - return Double.parseDouble(lhsljcstRight);
462   - }
463   - return null;
  459 + public String getLhsljcstRight() {
  460 + return lhsljcstRight;
464 461 }
465 462  
466 463 public void setLhsljcstRight(String lhsljcstRight) {
467 464 this.lhsljcstRight = lhsljcstRight;
468 465 }
469 466  
470   - public Double getLhsljcstLeft() {
471   - if (lhsljcstLeft != null){
472   - return Double.parseDouble(lhsljcstLeft);
473   - }
474   - return null;
  467 + public String getLhsljcstLeft() {
  468 + return lhsljcstLeft;
475 469 }
476 470  
477 471 public void setLhsljcstLeft(String lhsljcstLeft) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java View file @ 18ebba3
... ... @@ -71,10 +71,10 @@
71 71 "2".equals(babyCheck.getLhgzfyRight()) || "2".equals(babyCheck.getLhgzfyLeft()) || "2".equals(babyCheck.getLhhqsy()) ||
72 72 "2".equals(babyCheck.getLhhgfsRight()) || "2".equals(babyCheck.getLhhgfsLeft()) || "2".equals(babyCheck.getLhkyqgbzRight()) ||
73 73 "2".equals(babyCheck.getLhkyqgbzLeft()) || "2".equals(babyCheck.getLhdyyesyRight()) || "2".equals(babyCheck.getLhdyyesyLeft()) ||
74   - "2".equals(babyCheck.getLhywjc()) || ("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.6>babyCheck.getLhsljcstRight()) ||
75   - (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8>babyCheck.getLhsljcstRight()) ||
76   - ("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6>babyCheck.getLhsljcstLeft()) ||
77   - (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8>babyCheck.getLhsljcstLeft()) ||
  74 + "2".equals(babyCheck.getLhywjc()) || ("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.6> Double.parseDouble(babyCheck.getLhsljcstRight())) ||
  75 + (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8> Double.parseDouble(babyCheck.getLhsljcstRight())) ||
  76 + ("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6> Double.parseDouble(babyCheck.getLhsljcstLeft())) ||
  77 + (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8> Double.parseDouble(babyCheck.getLhsljcstLeft())) ||
78 78 "2".equals(babyCheck.getLhsldcRight()) || "2".equals(babyCheck.getLhsldcLeft()) || (Boolean) dioptricAnomalyState(babyCheck).get("state")
79 79  
80 80 ){
81 81  
... ... @@ -407,12 +407,12 @@
407 407 if("2".equals(babyCheck.getLhywjc())){
408 408 abnormal+="眼位检查;";
409 409 }
410   - if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.6 > babyCheck.getLhsljcstRight()) ||
411   - (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8 > babyCheck.getLhsljcstRight())){
  410 + if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.6 > Double.parseDouble(babyCheck.getLhsljcstRight())) ||
  411 + (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8 > Double.parseDouble(babyCheck.getLhsljcstRight()))){
412 412 abnormal+="视力检查（右）;";
413 413 }
414   - if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6 > babyCheck.getLhsljcstLeft()) ||
415   - (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > babyCheck.getLhsljcstLeft())){
  414 + if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6 > Double.parseDouble(babyCheck.getLhsljcstLeft())) ||
  415 + (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > Double.parseDouble(babyCheck.getLhsljcstLeft()))){
416 416 abnormal+="视力检查（左）;";
417 417 }
418 418 if("2".equals(babyCheck.getLhsldcRight())){
419 419  
... ... @@ -435,12 +435,12 @@
435 435 */
436 436 public String getAbnormalInfo(LhBabyEyeCheck babyCheck){
437 437 String abnormalInfo="";
438   - if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.6 > babyCheck.getLhsljcstRight()) ||
439   - (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8 > babyCheck.getLhsljcstRight())){
  438 + if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.6 > Double.parseDouble(babyCheck.getLhsljcstRight())) ||
  439 + (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstRight() && 0.8 > Double.parseDouble(babyCheck.getLhsljcstRight()))){
440 440 abnormalInfo+="视力检查（右）:"+babyCheck.getLhsljcstRight()+";";
441 441 }
442   - if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6 > babyCheck.getLhsljcstLeft()) ||
443   - (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > babyCheck.getLhsljcstLeft())){
  442 + if(("48".equals(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.6 > Double.parseDouble(babyCheck.getLhsljcstLeft())) ||
  443 + (Arrays.asList("60","72").contains(babyCheck.getCheckMonthId()) && null!=babyCheck.getLhsljcstLeft() && 0.8 > Double.parseDouble(babyCheck.getLhsljcstLeft()))){
444 444 abnormalInfo+="视力检查（左）:"+babyCheck.getLhsljcstLeft()+";";
445 445 }
446 446 Map map=dioptricAnomalyState(babyCheck);