diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java index 20e6cfc..4e6de82 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java @@ -116,8 +116,20 @@ public class BabyKindergartenCheckModel extends BaseModel { private String quchi; //屈光左 private String leftRefraction; + //屈光左DS + private String leftRefractionDS; + //屈光左DC + private String leftRefractionDC; + //屈光左Axis + private String leftRefractionAxis; //屈光右 private String rightRefraction; + //屈光右DS + private String rightRefractionDS; + //屈光右DC + private String rightRefractionDC; + //屈光右Axis + private String rightRefractionAxis; //智能筛查: private String znsc; @@ -136,6 +148,54 @@ public class BabyKindergartenCheckModel extends BaseModel { //体检日期 private Date checkDate; + public String getLeftRefractionDS() { + return leftRefractionDS; + } + + public void setLeftRefractionDS(String leftRefractionDS) { + this.leftRefractionDS = leftRefractionDS; + } + + public String getLeftRefractionDC() { + return leftRefractionDC; + } + + public void setLeftRefractionDC(String leftRefractionDC) { + this.leftRefractionDC = leftRefractionDC; + } + + public String getLeftRefractionAxis() { + return leftRefractionAxis; + } + + public void setLeftRefractionAxis(String leftRefractionAxis) { + this.leftRefractionAxis = leftRefractionAxis; + } + + public String getRightRefractionDS() { + return rightRefractionDS; + } + + public void setRightRefractionDS(String rightRefractionDS) { + this.rightRefractionDS = rightRefractionDS; + } + + public String getRightRefractionDC() { + return rightRefractionDC; + } + + public void setRightRefractionDC(String rightRefractionDC) { + this.rightRefractionDC = rightRefractionDC; + } + + public String getRightRefractionAxis() { + return rightRefractionAxis; + } + + public void setRightRefractionAxis(String rightRefractionAxis) { + this.rightRefractionAxis = rightRefractionAxis; + } + public String getJcjg() { return jcjg; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java index 9321d82..bb2b49c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java @@ -112,8 +112,16 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { model.setRightEar(request.getRightEar()); model.setYashu(request.getYashu()); model.setQuchi(request.getQuchi()); + model.setLeftRefraction(request.getLeftRefraction()); + model.setLeftRefractionDS(request.getLeftRefractionDS()); + model.setLeftRefractionDC(request.getLeftRefractionDC()); + model.setLeftRefractionAxis(request.getLeftRefractionAxis()); model.setRightRefraction(request.getRightRefraction()); + model.setRightRefractionDS(request.getRightRefractionDS()); + model.setRightRefractionDC(request.getRightRefractionDC()); + model.setRightRefractionAxis(request.getRightRefractionAxis()); + model.setZnsc(request.getZnsc()); model.setXhdb(request.getXhdb()); model.setGbzam(request.getGbzam()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java index 3cb5ede..8926e53 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java @@ -119,8 +119,22 @@ public class BabyKindergartenCheckRequest { private String quchi; //屈光左 private String leftRefraction; + //屈光左DS + private String leftRefractionDS; + //屈光左DC + private String leftRefractionDC; + //屈光左Axis + private String leftRefractionAxis; //屈光右 private String rightRefraction; + //屈光右DS + private String rightRefractionDS; + //屈光右DC + private String rightRefractionDC; + //屈光右Axis + private String rightRefractionAxis; + + //智能筛查: private String znsc; @@ -139,6 +153,54 @@ public class BabyKindergartenCheckRequest { //体检日期 private String checkDate; + public String getLeftRefractionDS() { + return leftRefractionDS; + } + + public void setLeftRefractionDS(String leftRefractionDS) { + this.leftRefractionDS = leftRefractionDS; + } + + public String getLeftRefractionDC() { + return leftRefractionDC; + } + + public void setLeftRefractionDC(String leftRefractionDC) { + this.leftRefractionDC = leftRefractionDC; + } + + public String getLeftRefractionAxis() { + return leftRefractionAxis; + } + + public void setLeftRefractionAxis(String leftRefractionAxis) { + this.leftRefractionAxis = leftRefractionAxis; + } + + public String getRightRefractionDS() { + return rightRefractionDS; + } + + public void setRightRefractionDS(String rightRefractionDS) { + this.rightRefractionDS = rightRefractionDS; + } + + public String getRightRefractionDC() { + return rightRefractionDC; + } + + public void setRightRefractionDC(String rightRefractionDC) { + this.rightRefractionDC = rightRefractionDC; + } + + public String getRightRefractionAxis() { + return rightRefractionAxis; + } + + public void setRightRefractionAxis(String rightRefractionAxis) { + this.rightRefractionAxis = rightRefractionAxis; + } + public String getJcjg() { return jcjg; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java index 96bbce9..c1b3fa0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java @@ -121,8 +121,20 @@ public class BabyKindergartenCheckResult implements IBasicResultConvert