From e06633c61cb03eaf9654e9bcce1d026f79303877 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 20 Jun 2018 12:10:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 40 ++++++++++++++++++++++ .../platform/operate/web/request/BabyEarBase.java | 17 +++++++++ .../operate/web/result/BabyBuildResult.java | 12 +++++++ 3 files changed, 69 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 7fd383a..1fa14b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2506,6 +2506,46 @@ public class BabyBookbuildingFacade { result.setExpVip(babyModel.getExpVip()); result.setMremark(babyModel.getMremark() == null ? "" : babyModel.getMremark()); + + result.setNbnaNum(babyModel.getNbnaNum()); + result.setJxWn(babyModel.isJxWn()); + result.setJxJzl(babyModel.isJxJzl()); + result.setJxNpc(babyModel.isJxNpc()); + result.setJxNjs(babyModel.isJxNjs()); + result.setJxEl(babyModel.isJxEl()); + result.setJxelSele(babyModel.getJxelSele()); + result.setJxCl(babyModel.isJxCl()); + result.setJxClSele(babyModel.getJxClSele()); + result.setJxClhb(babyModel.isJxClhb()); + result.setJxClhbSele(babyModel.getJxClhbSele()); + result.setJxXe(babyModel.isJxXe()); + result.setJxXeSele(babyModel.getJxXeSele()); + result.setJxWe(babyModel.isJxWe()); + result.setJxWeSele(babyModel.getJxWeSele()); + result.setJxSdbs(babyModel.isJxSdbs()); + result.setJxZcgm(babyModel.isJxZcgm()); + result.setJxNdxl(babyModel.isJxNdxl()); + result.setJxPwwf(babyModel.isJxPwwf()); + result.setJxMtn(babyModel.isJxMtn()); + result.setJxMtnSele(babyModel.getJxMtnSele()); + result.setJxDz(babyModel.isJxDz()); + result.setJxDzSele(babyModel.getJxDzSele()); + result.setJxDc(babyModel.isJxDc()); + result.setJxDcSele(babyModel.getJxDcSele()); + result.setJxBz(babyModel.isJxBz()); + result.setJxBzSele(babyModel.getJxBzSele()); + result.setJxBc(babyModel.isJxBc()); + result.setJxBcSele(babyModel.getJxBcSele()); + result.setJxZtds(babyModel.isJxZtds()); + result.setJxZtdsTopSele(babyModel.getJxZtdsTopSele()); + result.setJxZtdsBottomSele(babyModel.getJxZtdsBottomSele()); + result.setJxXtxe(babyModel.isJxXtxe()); + result.setJxQpc(babyModel.isJxQpc()); + result.setJxFl(babyModel.isJxFl()); + result.setJxLtst(babyModel.isJxLtst()); + result.setJxTszh(babyModel.isJxTszh()); + result.setJxXtx(babyModel.isJxXtx()); + result.setJxOther(babyModel.getJxOther()); } result.setYn(babyModel.getYn()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java index 2c40fea..45f001c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.enums.PatientSerEnums; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.result.PatientSerResult; import com.lyms.platform.pojo.BabyModel; @@ -140,6 +141,16 @@ public class BabyEarBase implements IBasicRequestConvert { //月龄 private String monthAge; + private Integer dataStatus; + + public Integer getDataStatus() { + return dataStatus; + } + + public void setDataStatus(Integer dataStatus) { + this.dataStatus = dataStatus; + } + public BabyEarBase(BabyModel babyModel) { setFileCode(babyModel.getFileCode()); setBabyId(babyModel.getId()); @@ -234,6 +245,12 @@ public class BabyEarBase implements IBasicRequestConvert { babyModel.setFbirth(DateUtil.parseYMD(fbirth)); babyModel.setFproTypeId(fproTypeId); babyModel.setFileCode(fileCode); + + if (dataStatus != null && dataStatus == 1) + { + babyModel.setYn(YnEnums.YES.getId()); + } + return babyModel; } public BabyEarBase() { 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 5a49103..9a46961 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 @@ -119,6 +119,10 @@ public class BabyBuildResult { private Integer malformation; /***畸形详情****/ + + //nbna评分(神经测定) + private String nbnaNum; + //无脑畸形 private boolean jxWn; //脊柱裂 @@ -264,6 +268,14 @@ public class BabyBuildResult { //显示服务信息 private List patientSerResults; + public String getNbnaNum() { + return nbnaNum; + } + + public void setNbnaNum(String nbnaNum) { + this.nbnaNum = nbnaNum; + } + public Integer getYn() { return yn; } -- 1.8.3.1