diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java index a5bb4ec..b4df99e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java @@ -143,8 +143,10 @@ public class BabyCheckModel extends BaseModel { //腹部 private String belly; - //脊柱四肢 + //脊柱四肢(脊柱) private String spineFours; + //四肢 yesOrNo yes○正常 no○异常:noValue异常内容_____ + private Map limb; //肝门/生殖器 private String portaGenitals; @@ -1550,6 +1552,14 @@ public class BabyCheckModel extends BaseModel { return sleep; } + public Map getLimb() { + return limb; + } + + public void setLimb(Map limb) { + this.limb = limb; + } + public void setSleep(String sleep) { this.sleep = sleep; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 25610cd..adf1e14 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -447,6 +447,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setChest(JsonUtil.obj2JsonString(request.getChest())); model.setBelly(request.getBelly()); model.setSpineFours(request.getSpineFours()); + model.setLimb(request.getLimb()); model.setPortaGenitals(JsonUtil.obj2JsonString(request.getPortaGenitals())); model.setStepStatus(request.getStepStatus()); model.setStoopStatus(JsonUtil.obj2JsonString(request.getStoopStatus())); @@ -1849,6 +1850,7 @@ public class BabyCheckFacade extends BaseServiceImpl { } result = getBabyCheckResult(checkModel, babyModel); + result.setLimb(checkModel.getLimb()); result.setCouponCode(couponService.findByType(id, 8)); /** 优惠券编号 */ String hemoglobinCoupon = couponService.findByType(id, 10); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index eee72fc..f1e2236 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -5425,6 +5425,7 @@ public class ViewFacade { result = getBabyCheckResult(checkModel, babyModel); result.setId(checkModel.getId()); + result.setLimb(checkModel.getLimb()); /** 优惠券编号 */ result.setCouponCode(couponService.findByType(id, 8)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java index 3c6cc07..2770581 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java @@ -150,8 +150,10 @@ public class BabyCheckRequest { private Map chest; //腹部 private String belly; - //脊柱四肢 + //脊柱四肢(脊柱) private String spineFours; + //四肢 yesOrNo yes○正常 no○异常:noValue异常内容_____ + private Map limb; //肛门/生殖器 private Map portaGenitals; //步态 @@ -2126,4 +2128,12 @@ public class BabyCheckRequest { public void setSlscx(Map slscx) { this.slscx = slscx; } + + public Map getLimb() { + return limb; + } + + public void setLimb(Map limb) { + this.limb = limb; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index bcf47b1..e7adcc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -1265,6 +1265,19 @@ public class BabyBuildResult { public void setDueType(String dueType) { this.dueType = dueType; + if ("1".equals(dueType)) { + this.fmfs = "shun"; + } else if ("2".equals(dueType)) { + this.fmfs = "pao"; + } + } + + public String getFmfs() { + return fmfs; + } + + public void setFmfs(String fmfs) { + this.fmfs = fmfs; } public String getFetusCount() { @@ -1391,23 +1404,7 @@ public class BabyBuildResult { this.mHighRiskReason2 = mHighRiskReason2; } - /* - - shun 顺产 pao剖宫产 - */ - public String getFmfs() { - if ("0".equals(dueType)){ - fmfs = "shun"; - }else if("1".equals(dueType)){ - fmfs = "pao"; - } - return fmfs; - } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index d617a9f..fd097e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -347,8 +347,10 @@ public class BabyCheckPageResult { //腹部 private String belly; - //脊柱四肢 + //脊柱四肢(脊柱) private String spineFours; + //四肢 yesOrNo yes○正常 no○异常:noValue异常内容_____ + private Map limb; //肝门/生殖器 private String portaGenitals; @@ -2200,6 +2202,14 @@ public class BabyCheckPageResult { this.otherUrine = otherUrine; } + public Map getLimb() { + return limb; + } + + public void setLimb(Map limb) { + this.limb = limb; + } + public String getCheckDiagnose() { return checkDiagnose; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index 0194e57..831204e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -308,8 +308,10 @@ public class BabyCheckResult { //腹部 private String belly; - //脊柱四肢 + //脊柱四肢(脊柱) private String spineFours; + //四肢 yesOrNo yes○正常 no○异常:noValue异常内容_____ + private Map limb; //肝门/生殖器 private String portaGenitals; @@ -2100,6 +2102,14 @@ public class BabyCheckResult { this.nextDate = nextDate; } + public Map getLimb() { + return limb; + } + + public void setLimb(Map limb) { + this.limb = limb; + } + public Integer getHighRisk() { return highRisk; }