From 67848b69eaed9d8e91fefe7f8d547b100a0c35e6 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 27 Mar 2018 15:22:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E6=98=AF=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E5=86=97=E4=BD=99=E7=95=B8=E5=BD=A2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 394 +++++++++++++++++++++ .../operate/web/facade/MatDeliverFacade.java | 42 ++- .../operate/web/request/MatDeliverAddRequest.java | 1 + 3 files changed, 436 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 19e7870..df1e82e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -7,6 +7,7 @@ import org.springframework.data.mongodb.core.mapping.Field; import java.util.Date; import java.util.List; +import java.util.Map; /** * 新生儿模型 @@ -230,6 +231,399 @@ public class BabyModel extends BaseModel { //档案编号 滦平需求 private String fileCode; + //nbna评分(神经测定) + private String nbnaNum; + + /***畸形详情****/ + //无脑畸形 + private boolean jxWn; + //脊柱裂 + private boolean jxJzl; + //脑彭出 + private boolean jxNpc; + //先天性脑积水 + private boolean jxNjs; + //腭裂 + private boolean jxEl; + //腭裂左中右 + private Map jxelSele; + //唇裂 + private boolean jxCl; + //腭裂左中右 + private Map jxClSele; + //唇裂合并腭裂 + private boolean jxClhb; + //唇裂合并腭裂左中右 + private Map jxClhbSele; + //小耳(包括无耳) + private boolean jxXe; + //小耳(包括无耳)左右 + private Map jxXeSele; + //外耳其他畸形(小耳、无耳除外) + private boolean jxWe; + //外耳其他畸形(小耳、无耳除外)左右 + private Map jxWeSele; + //食道闭锁或狭窄 + private boolean jxSdbs; + //直肠肛门闭锁或狭窄(包括无肛) + private boolean jxZcgm; + //尿道下裂 + private boolean jxNdxl; + //膀胱外翻 + private boolean jxPwwf; + //马蹄内翻足 + private boolean jxMtn; + //马蹄内翻足左右 + private Map jxMtnSele; + //多指 + private boolean jxDz; + //多指左右 + private Map jxDzSele; + //多趾 + private boolean jxDc; + //多趾左右 + private Map jxDcSele; + //并指 + private boolean jxBz; + //并指左右 + private Map jxBzSele; + //并趾 + private boolean jxBc; + //并趾左右 + private Map jxBcSele; + //肢体短缩包括缺指(趾)、裂手(足)] + private boolean jxZtds; + //肢体短缩包括缺指上肢左右 + private Map jxZtdsTopSele; + //肢体短缩包括缺指下肢左右 + private Map jxZtdsBottomSele; + //先天性隔疝 + private boolean jxXtxe; + //脐膨出 + private boolean jxQpc; + //腹裂 + private boolean jxFl; + //联体双胎 + private boolean jxLtst; + //唐氏综合征(21-三体综合征) + private boolean jxTszh; + //先天性心脏病 + private boolean jxXtx; + //其他(写明病名并详细描述) + private Map jxOther; + + public String getNbnaNum() { + return nbnaNum; + } + + public void setNbnaNum(String nbnaNum) { + this.nbnaNum = nbnaNum; + } + + public boolean isJxWn() { + return jxWn; + } + + public void setJxWn(boolean jxWn) { + this.jxWn = jxWn; + } + + public boolean isJxJzl() { + return jxJzl; + } + + public void setJxJzl(boolean jxJzl) { + this.jxJzl = jxJzl; + } + + public boolean isJxNpc() { + return jxNpc; + } + + public void setJxNpc(boolean jxNpc) { + this.jxNpc = jxNpc; + } + + public boolean isJxNjs() { + return jxNjs; + } + + public void setJxNjs(boolean jxNjs) { + this.jxNjs = jxNjs; + } + + public boolean isJxEl() { + return jxEl; + } + + public void setJxEl(boolean jxEl) { + this.jxEl = jxEl; + } + + public Map getJxelSele() { + return jxelSele; + } + + public void setJxelSele(Map jxelSele) { + this.jxelSele = jxelSele; + } + + public boolean isJxCl() { + return jxCl; + } + + public void setJxCl(boolean jxCl) { + this.jxCl = jxCl; + } + + public Map getJxClSele() { + return jxClSele; + } + + public void setJxClSele(Map jxClSele) { + this.jxClSele = jxClSele; + } + + public boolean isJxClhb() { + return jxClhb; + } + + public void setJxClhb(boolean jxClhb) { + this.jxClhb = jxClhb; + } + + public Map getJxClhbSele() { + return jxClhbSele; + } + + public void setJxClhbSele(Map jxClhbSele) { + this.jxClhbSele = jxClhbSele; + } + + public boolean isJxXe() { + return jxXe; + } + + public void setJxXe(boolean jxXe) { + this.jxXe = jxXe; + } + + public Map getJxXeSele() { + return jxXeSele; + } + + public void setJxXeSele(Map jxXeSele) { + this.jxXeSele = jxXeSele; + } + + public boolean isJxWe() { + return jxWe; + } + + public void setJxWe(boolean jxWe) { + this.jxWe = jxWe; + } + + public Map getJxWeSele() { + return jxWeSele; + } + + public void setJxWeSele(Map jxWeSele) { + this.jxWeSele = jxWeSele; + } + + public boolean isJxSdbs() { + return jxSdbs; + } + + public void setJxSdbs(boolean jxSdbs) { + this.jxSdbs = jxSdbs; + } + + public boolean isJxZcgm() { + return jxZcgm; + } + + public void setJxZcgm(boolean jxZcgm) { + this.jxZcgm = jxZcgm; + } + + public boolean isJxNdxl() { + return jxNdxl; + } + + public void setJxNdxl(boolean jxNdxl) { + this.jxNdxl = jxNdxl; + } + + public boolean isJxPwwf() { + return jxPwwf; + } + + public void setJxPwwf(boolean jxPwwf) { + this.jxPwwf = jxPwwf; + } + + public boolean isJxMtn() { + return jxMtn; + } + + public void setJxMtn(boolean jxMtn) { + this.jxMtn = jxMtn; + } + + public Map getJxMtnSele() { + return jxMtnSele; + } + + public void setJxMtnSele(Map jxMtnSele) { + this.jxMtnSele = jxMtnSele; + } + + public boolean isJxDz() { + return jxDz; + } + + public void setJxDz(boolean jxDz) { + this.jxDz = jxDz; + } + + public Map getJxDzSele() { + return jxDzSele; + } + + public void setJxDzSele(Map jxDzSele) { + this.jxDzSele = jxDzSele; + } + + public boolean isJxDc() { + return jxDc; + } + + public void setJxDc(boolean jxDc) { + this.jxDc = jxDc; + } + + public Map getJxDcSele() { + return jxDcSele; + } + + public void setJxDcSele(Map jxDcSele) { + this.jxDcSele = jxDcSele; + } + + public boolean isJxBz() { + return jxBz; + } + + public void setJxBz(boolean jxBz) { + this.jxBz = jxBz; + } + + public Map getJxBzSele() { + return jxBzSele; + } + + public void setJxBzSele(Map jxBzSele) { + this.jxBzSele = jxBzSele; + } + + public boolean isJxBc() { + return jxBc; + } + + public void setJxBc(boolean jxBc) { + this.jxBc = jxBc; + } + + public Map getJxBcSele() { + return jxBcSele; + } + + public void setJxBcSele(Map jxBcSele) { + this.jxBcSele = jxBcSele; + } + + public boolean isJxZtds() { + return jxZtds; + } + + public void setJxZtds(boolean jxZtds) { + this.jxZtds = jxZtds; + } + + public Map getJxZtdsTopSele() { + return jxZtdsTopSele; + } + + public void setJxZtdsTopSele(Map jxZtdsTopSele) { + this.jxZtdsTopSele = jxZtdsTopSele; + } + + public Map getJxZtdsBottomSele() { + return jxZtdsBottomSele; + } + + public void setJxZtdsBottomSele(Map jxZtdsBottomSele) { + this.jxZtdsBottomSele = jxZtdsBottomSele; + } + + public boolean isJxXtxe() { + return jxXtxe; + } + + public void setJxXtxe(boolean jxXtxe) { + this.jxXtxe = jxXtxe; + } + + public boolean isJxQpc() { + return jxQpc; + } + + public void setJxQpc(boolean jxQpc) { + this.jxQpc = jxQpc; + } + + public boolean isJxFl() { + return jxFl; + } + + public void setJxFl(boolean jxFl) { + this.jxFl = jxFl; + } + + public boolean isJxLtst() { + return jxLtst; + } + + public void setJxLtst(boolean jxLtst) { + this.jxLtst = jxLtst; + } + + public boolean isJxTszh() { + return jxTszh; + } + + public void setJxTszh(boolean jxTszh) { + this.jxTszh = jxTszh; + } + + public boolean isJxXtx() { + return jxXtx; + } + + public void setJxXtx(boolean jxXtx) { + this.jxXtx = jxXtx; + } + + public Map getJxOther() { + return jxOther; + } + + public void setJxOther(Map jxOther) { + this.jxOther = jxOther; + } + public String getFileCode() { return fileCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 99dd80c..293a767 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -646,6 +646,46 @@ public class MatDeliverFacade { babyList.add(baby1); //填充小孩基本信息 BabyModel babyModel = fillBaby(patients, deliverAddRequest); + babyModel.setNbnaNum(baby1.getNbnaNum()); + babyModel.setJxWn(baby1.isJxWn()); + babyModel.setJxJzl(baby1.isJxJzl()); + babyModel.setJxNpc(baby1.isJxNpc()); + babyModel.setJxNjs(baby1.isJxNjs()); + babyModel.setJxEl(baby1.isJxEl()); + babyModel.setJxelSele(baby1.getJxelSele()); + babyModel.setJxCl(baby1.isJxCl()); + babyModel.setJxClSele(baby1.getJxClSele()); + babyModel.setJxClhb(baby1.isJxClhb()); + babyModel.setJxClhbSele(baby1.getJxClhbSele()); + babyModel.setJxXe(baby1.isJxXe()); + babyModel.setJxXeSele(baby1.getJxXeSele()); + babyModel.setJxWe(baby1.isJxWe()); + babyModel.setJxWeSele(baby1.getJxWeSele()); + babyModel.setJxSdbs(baby1.isJxSdbs()); + babyModel.setJxZcgm(baby1.isJxZcgm()); + babyModel.setJxNdxl(baby1.isJxNdxl()); + babyModel.setJxPwwf(baby1.isJxPwwf()); + babyModel.setJxMtn(baby1.isJxMtn()); + babyModel.setJxMtnSele(baby1.getJxMtnSele()); + babyModel.setJxDz(baby1.isJxDz()); + babyModel.setJxDzSele(baby1.getJxDzSele()); + babyModel.setJxDc(baby1.isJxDc()); + babyModel.setJxDcSele(baby1.getJxDcSele()); + babyModel.setJxBz(baby1.isJxBz()); + babyModel.setJxBzSele(baby1.getJxBzSele()); + babyModel.setJxBc(baby1.isJxBc()); + babyModel.setJxBcSele(baby1.getJxBcSele()); + babyModel.setJxZtds(baby1.isJxZtds()); + babyModel.setJxZtdsTopSele(baby1.getJxZtdsTopSele()); + babyModel.setJxZtdsBottomSele(baby1.getJxZtdsBottomSele()); + babyModel.setJxXtxe(baby1.isJxXtxe()); + babyModel.setJxQpc(baby1.isJxQpc()); + babyModel.setJxFl(baby1.isJxFl()); + babyModel.setJxLtst(baby1.isJxLtst()); + babyModel.setJxTszh(baby1.isJxTszh()); + babyModel.setJxXtx(baby1.isJxXtx()); + babyModel.setJxOther(baby1.getJxOther()); + babyModel.setDeliverOrg(deliverAddRequest.getFmHospital()); baby.setId(baby1.getId()); babyModel.setBirth(DateUtil.parseYMDHM(baby.getDueTime())); @@ -1584,7 +1624,7 @@ public class MatDeliverFacade { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setParentIdList(parentIdList); matDeliverQuery.setYn(YnEnums.YES.getId()); - System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery()); + // System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery()); List maternalDeliverModelList = matDeliverService.query(matDeliverQuery); List childbirthManagerQueryModelList = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index 5ff7925..d4b26ec 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -624,6 +624,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert