From d3a20ae3a1079f3a12e052464dc2ec1100cf3abb Mon Sep 17 00:00:00 2001 From: wtt <1872109740@qq.com> Date: Thu, 4 Feb 2021 11:38:13 +0800 Subject: [PATCH] update --- .../lyms/platform/pojo/BabyHighRiskBabyModel.java | 136 +++++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 23 +++ .../operate/web/facade/BabyHighRiskBabyFacade.java | 38 +++++ .../web/request/BabyBookbuildingAddRequest.java | 11 ++ .../web/request/BabyHighRiskBabyRequest.java | 144 +++++++++++++++++- .../operate/web/result/BabyBuildResult.java | 11 ++ .../operate/web/result/BabyHighRiskBabyResult.java | 167 +++++++++++++++++++++ 7 files changed, 529 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java index 77606e5..2f21df2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java @@ -18,6 +18,37 @@ import java.util.Map; public class BabyHighRiskBabyModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.BabyHighRiskBabyModel.getCid(); + /*新增字段*/ + //身长别体重 + private String heightWeight; + //前囟{闭合、未闭合、未闭合尺寸x-y} + private Map bregma; + //面色 + private String ms; + //皮肤 + private String pf; + //心肺 + private String xf; + /*辅助检查*/ + //骨密度Z值 + private String gmdz; + //血红蛋白 + private String xhdb; + //心脏彩超 + private String xzcc; + //头颅彩超 + private String tlcc; + //头颅核磁 + private String tlhc; + //脑电图 下拉项：1正常；2临界；3轻度异常；4异常，5其他 ______ state:1,qt：123456 + private Map ndt; + //髋关节 左 返回也是yhipJoint: "Ⅰb型,Ⅱc型,Ⅲ型" + private String zhipJoint; + //髋关节 右 + private String yhipJoint; + + + /*基础信息*/ private String id; private Integer yn; @@ -652,6 +683,111 @@ public class BabyHighRiskBabyModel extends BaseModel { public void setRemarks(String remarks) { this.remarks = remarks; } + + + public String getHeightWeight() { + return heightWeight; + } + + public void setHeightWeight(String heightWeight) { + this.heightWeight = heightWeight; + } + + public Map getBregma() { + return bregma; + } + + public void setBregma(Map bregma) { + this.bregma = bregma; + } + + public String getMs() { + return ms; + } + + public void setMs(String ms) { + this.ms = ms; + } + + public String getPf() { + return pf; + } + + public void setPf(String pf) { + this.pf = pf; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public String getGmdz() { + return gmdz; + } + + public void setGmdz(String gmdz) { + this.gmdz = gmdz; + } + + public String getXhdb() { + return xhdb; + } + + public void setXhdb(String xhdb) { + this.xhdb = xhdb; + } + + public String getXzcc() { + return xzcc; + } + + public void setXzcc(String xzcc) { + this.xzcc = xzcc; + } + + public String getTlcc() { + return tlcc; + } + + public void setTlcc(String tlcc) { + this.tlcc = tlcc; + } + + public String getTlhc() { + return tlhc; + } + + public void setTlhc(String tlhc) { + this.tlhc = tlhc; + } + + public Map getNdt() { + return ndt; + } + + public void setNdt(Map ndt) { + this.ndt = ndt; + } + + public String getZhipJoint() { + return zhipJoint; + } + + public void setZhipJoint(String zhipJoint) { + this.zhipJoint = zhipJoint; + } + + public String getYhipJoint() { + return yhipJoint; + } + + public void setYhipJoint(String yhipJoint) { + this.yhipJoint = yhipJoint; + } } 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 fb99e19..f267ebd 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 @@ -1679,6 +1679,29 @@ public class BabyBookbuildingFacade { if (models != null && models.size() > 0) { BabyModel model = models.get(0); result = getBabyBuildResult(model); + //计算儿童的预产期 20210203 高危儿专科回填使用 + if (model.getBirth() != null && model.getDueWeek() != null && model.getDueWeek() < 37) {//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期 + String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth()); + Date ymdBirth = DateUtil.parseYMD(birthStr); + if (model.getDueDate() == null || ymdBirth.getTime() == model.getDueDate().getTime()) {//预产期为空或者预产期与生日一致进行计算真实预产期 + //根据出生孕周计算末次月经 + Date LastMens = DateUtil.addWeek(model.getBirth(), -model.getDueWeek()); + + if (model.getDueDay() != null) { + LastMens = DateUtil.addDay(LastMens, -model.getDueDay()); + } + + //根据末次月经计算预产期 + // Date dueDate = DateUtil.addMonth(LastMens, 9); + // dueDate = DateUtil.addDay(dueDate, 7); + Date dueDate = DateUtil.addDay(LastMens, 280); + //返回预产期 + result.setyChanQi(DateUtil.getyyyy_MM_dd(dueDate)); + } else { + result.setyChanQi(DateUtil.getyyyy_MM_dd(model.getDueDate())); + } + } + result.setYeymcId(model.getYeymcId()); Map getYeymcId = getBasicConfigYey(model.getYeymcId()); if (getYeymcId != null && getYeymcId.containsKey("name")) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java index c45dec3..a4dd005 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java @@ -92,6 +92,21 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { if(StringUtils.isEmpty(babyModel.getMname())){ model.setMname(request.getMname()); } + model.setHeightWeight(request.getHeightWeight()); + model.setBregma(request.getBregma()); + model.setMs(request.getMs()); + model.setPf(request.getPf()); + model.setXf(request.getXf()); + model.setGmdz(request.getGmdz()); + model.setXhdb(request.getXhdb()); + model.setXzcc(request.getXzcc()); + model.setTlcc(request.getTlcc()); + model.setTlhc(request.getTlhc()); + model.setNdt(request.getNdt()); + model.setZhipJoint(request.getZhipJoint()); + model.setYhipJoint(request.getYhipJoint()); + + model.setMage(request.getMage()); model.setJwrss(request.getJwrss()); model.setBirthDueDate(DateUtil.parseYMD(request.getBirthDueDate())); @@ -228,6 +243,28 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult(); highRiskBabyResult.convertToResult(babyHighRiskBabyModel); + String bregma = ""; + String bregmaValue = ""; + if (babyHighRiskBabyModel.getBregma()!=null) { + Map map = babyHighRiskBabyModel.getBregma(); + String yesOrNo = map.get("yeaOrNo") == null ? "" : map.get("yeaOrNo").toString(); + if ("yes".equals(yesOrNo)) { + bregma = "闭合"; + } else if ("no".equals(yesOrNo)) { + bregma = "未闭合"; + String one = map.get("wbhcc1") == null ? "" : map.get("wbhcc1").toString(); + String two = map.get("wbhcc2") == null ? "" : map.get("wbhcc2").toString(); + bregmaValue = one + "cm - " + two + "cm"; + } + } + highRiskBabyResult.setBregmaStr(bregma); + highRiskBabyResult.setBregmaValue(bregmaValue); + + + + + + if (StringUtils.isNotEmpty(babyHighRiskBabyModel.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(babyHighRiskBabyModel.getCheckDoctor())); if (users != null && StringUtils.isNotEmpty(users.getName())) { @@ -263,6 +300,7 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl { BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id); BabyHighRiskBabyResult babyHighRiskBabyResult = new BabyHighRiskBabyResult(); babyHighRiskBabyResult.convertToResult(babyHighRiskBabyModel); + babyHighRiskBabyResult.setBregma(babyHighRiskBabyModel.getBregma()); //将高危拼装成map List > list = new ArrayList <>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index ed5dc28..1c18257 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -13,6 +13,9 @@ import java.util.Map; @Form public class BabyBookbuildingAddRequest { + //预产期避免前端误传报错 + private String yChanQi; + //幼儿园名称,使用基础配置 private String yeymcId; @@ -1351,6 +1354,14 @@ public class BabyBookbuildingAddRequest { this.serviceType = serviceType; } + public String getyChanQi() { + return yChanQi; + } + + public void setyChanQi(String yChanQi) { + this.yChanQi = yChanQi; + } + public String getVcCardNo() { return vcCardNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java index 8c58b1a..2977267 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java @@ -5,6 +5,7 @@ import org.hibernate.validator.constraints.NotEmpty; import java.util.Date; import java.util.List; +import java.util.Map; /** * 高危儿专科 入参类 @@ -13,6 +14,43 @@ import java.util.List; * @Date: 2020/8/18 19:28 */ public class BabyHighRiskBabyRequest { + /*新增字段*/ + //身长别体重 + private String heightWeight; + /* + 前囟{闭合、未闭合、未闭合尺寸x-y} + "bregma": { + "yeaOrNo": "yes", + "wbhcc1": "", + "wbhcc2": "" + } + */ + private Map bregma; + //面色 + private String ms; + //皮肤 + private String pf; + //心肺 + private String xf; + /*辅助检查*/ + //骨密度Z值 + private String gmdz; + //血红蛋白 + private String xhdb; + //心脏彩超 + private String xzcc; + //头颅彩超 + private String tlcc; + //头颅核磁 + private String tlhc; + //脑电图 下拉项：1正常；2临界；3轻度异常；4异常，5 其他______ state:1,qt：123456 + private Map ndt; + //髋关节 左 返回也是yhipJoint: "Ⅰb型,Ⅱc型,Ⅲ型" + private String zhipJoint; + //髋关节 右 + private String yhipJoint; + + /*基础信息*/ private String id; private Integer yn; @@ -114,7 +152,7 @@ public class BabyHighRiskBabyRequest { private String weight; //头围cm private String head; - //前囟 cm + //前囟 cm 不在使用 private String anterior; //面色/皮肤 private String skin; @@ -673,4 +711,108 @@ public class BabyHighRiskBabyRequest { public void setRemarks(String remarks) { this.remarks = remarks; } + + public String getHeightWeight() { + return heightWeight; + } + + public void setHeightWeight(String heightWeight) { + this.heightWeight = heightWeight; + } + + public Map getBregma() { + return bregma; + } + + public void setBregma(Map bregma) { + this.bregma = bregma; + } + + public String getMs() { + return ms; + } + + public void setMs(String ms) { + this.ms = ms; + } + + public String getPf() { + return pf; + } + + public void setPf(String pf) { + this.pf = pf; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public String getGmdz() { + return gmdz; + } + + public void setGmdz(String gmdz) { + this.gmdz = gmdz; + } + + public String getXhdb() { + return xhdb; + } + + public void setXhdb(String xhdb) { + this.xhdb = xhdb; + } + + public String getXzcc() { + return xzcc; + } + + public void setXzcc(String xzcc) { + this.xzcc = xzcc; + } + + public String getTlcc() { + return tlcc; + } + + public void setTlcc(String tlcc) { + this.tlcc = tlcc; + } + + public String getTlhc() { + return tlhc; + } + + public void setTlhc(String tlhc) { + this.tlhc = tlhc; + } + + public Map getNdt() { + return ndt; + } + + public void setNdt(Map ndt) { + this.ndt = ndt; + } + + public String getZhipJoint() { + return zhipJoint; + } + + public void setZhipJoint(String zhipJoint) { + this.zhipJoint = zhipJoint; + } + + public String getYhipJoint() { + return yhipJoint; + } + + public void setYhipJoint(String yhipJoint) { + this.yhipJoint = yhipJoint; + } } 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 f8cb924..9fa2f40 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 @@ -9,6 +9,9 @@ import java.util.Map; */ public class BabyBuildResult { + //预产期 + private String yChanQi; + private String yeymcId;//幼儿园名称,使用基础配置 private Map yeymcIdMap;//幼儿园名称,使用基础配置 @@ -737,6 +740,14 @@ public class BabyBuildResult { return jxMtn; } + public String getyChanQi() { + return yChanQi; + } + + public void setyChanQi(String yChanQi) { + this.yChanQi = yChanQi; + } + public void setJxMtn(boolean jxMtn) { this.jxMtn = jxMtn; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java index 5d6e696..62cf86c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java @@ -11,6 +11,39 @@ import java.util.Map; public class BabyHighRiskBabyResult implements IBasicResultConvert { + /*新增字段*/ + //身长别体重 + private String heightWeight; + //前囟{闭合、未闭合、未闭合尺寸x-y} + private Map bregma; + private String bregmaStr; + private String bregmaValue; + //面色 + private String ms; + //皮肤 + private String pf; + //心肺 + private String xf; + /*辅助检查*/ + //骨密度Z值 + private String gmdz; + //血红蛋白 + private String xhdb; + //心脏彩超 + private String xzcc; + //头颅彩超 + private String tlcc; + //头颅核磁 + private String tlhc; + //脑电图 下拉项：1正常；2临界；3轻度异常；4异常 5 其他 ______ state:1,qt：123456 + private Map ndt; + //髋关节 左 返回也是yhipJoint: "Ⅰb型,Ⅱc型,Ⅲ型" + private String zhipJoint; + //髋关节 右 + private String yhipJoint; + + + /*基础信息*/ private String id; @@ -690,10 +723,144 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert getBregma() { + return bregma; + } + + public void setBregma(Map bregma) { + this.bregma = bregma; + } + + public String getBregmaValue() { + return bregmaValue; + } + + public void setBregmaValue(String bregmaValue) { + this.bregmaValue = bregmaValue; + } + + public String getMs() { + return ms; + } + + public void setMs(String ms) { + this.ms = ms; + } + + public String getPf() { + return pf; + } + + public void setPf(String pf) { + this.pf = pf; + } + + public String getXf() { + return xf; + } + + public void setXf(String xf) { + this.xf = xf; + } + + public String getGmdz() { + return gmdz; + } + + public void setGmdz(String gmdz) { + this.gmdz = gmdz; + } + + public String getXhdb() { + return xhdb; + } + + public void setXhdb(String xhdb) { + this.xhdb = xhdb; + } + + public String getXzcc() { + return xzcc; + } + + public void setXzcc(String xzcc) { + this.xzcc = xzcc; + } + + public String getTlcc() { + return tlcc; + } + + public void setTlcc(String tlcc) { + this.tlcc = tlcc; + } + + public String getTlhc() { + return tlhc; + } + + public void setTlhc(String tlhc) { + this.tlhc = tlhc; + } + + public Map getNdt() { + return ndt; + } + + public void setNdt(Map ndt) { + this.ndt = ndt; + } + + public String getZhipJoint() { + return zhipJoint; + } + + public void setZhipJoint(String zhipJoint) { + this.zhipJoint = zhipJoint; + } + + public String getYhipJoint() { + return yhipJoint; + } + + public void setYhipJoint(String yhipJoint) { + this.yhipJoint = yhipJoint; + } + + public String getBregmaStr() { + return bregmaStr; + } + + public void setBregmaStr(String bregmaStr) { + this.bregmaStr = bregmaStr; + } + @Override public BabyHighRiskBabyResult convertToResult(BabyHighRiskBabyModel destModel) { try { + setHeightWeight(destModel.getHeightWeight()); + setMs(destModel.getMs()); + setPf(destModel.getPf()); + setXf(destModel.getXf()); + setGmdz(destModel.getGmdz()); + setXhdb(destModel.getXhdb()); + setXzcc(destModel.getXzcc()); + setTlcc(destModel.getTlcc()); + setTlhc(destModel.getTlhc()); + setNdt(destModel.getNdt()); + setZhipJoint(destModel.getZhipJoint()); + setYhipJoint(destModel.getYhipJoint()); + + setId(destModel.getId()); setBuildId(destModel.getBuildId()); setPid(destModel.getPid()); -- 1.8.3.1