From be1932398aa20a722ea65d83b8cb1aa834d6ac2b Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 31 Jul 2020 16:20:36 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/BabyCheckModel.java | 121 +++++++++++++++++++ .../operate/web/facade/BabyCheckFacade.java | 43 +++++++ .../platform/operate/web/facade/ViewFacade.java | 17 +++ .../operate/web/request/BabyCheckRequest.java | 129 ++++++++++++++++++++- .../operate/web/result/BabyCheckPageResult.java | 127 ++++++++++++++++++++ .../operate/web/result/BabyCheckResult.java | 118 +++++++++++++++++++ .../operate/web/result/BabyChooseResult.java | 9 ++ .../web/service/impl/PatientWeightServiceImpl.java | 12 +- 8 files changed, 566 insertions(+), 10 deletions(-) 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 76d80f7..0093518 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 @@ -25,6 +25,21 @@ public class BabyCheckModel extends BaseModel { private String bim; private String testName; + private String month; //实际月龄 + private String ddz; //大动作 + private String sxdz; //数细动作 + private String rs; //认识 + private String yy;// 言语 + private String sqxw;// 社区行为 + private String slpj; //商力平均值 + + private String xlddz; //大动作(心理月龄) + private String xlsxdz; //数细动作(心理月龄) + private String xlrs; //认识(心理月龄) + private String xlyy;// 言语(心理月龄) + private String xlsqxw;// 社区行为(心理月龄) + private String xlpj; //心里平均值(心理月龄) + private Integer yn; private String buildId; @@ -1859,6 +1874,72 @@ public class BabyCheckModel extends BaseModel { this.hematuria = hematuria; } + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } + + + + public String getDdz() { + return ddz; + } + + public void setDdz(String ddz) { + this.ddz = ddz; + } + + public String getSxdz() { + return sxdz; + } + + public void setSxdz(String sxdz) { + this.sxdz = sxdz; + } + + public String getRs() { + return rs; + } + + public void setRs(String rs) { + this.rs = rs; + } + + public String getYy() { + return yy; + } + + public void setYy(String yy) { + this.yy = yy; + } + + public String getSqxw() { + return sqxw; + } + + public void setSqxw(String sqxw) { + this.sqxw = sqxw; + } + + public String getXlpj() { + return xlpj; + } + + public void setXlpj(String xlpj) { + this.xlpj = xlpj; + } + + public String getSlpj() { + return slpj; + } + + public void setSlpj(String slpj) { + this.slpj = slpj; + } + public String getOtherUrine() { return otherUrine; } @@ -1891,6 +1972,46 @@ public class BabyCheckModel extends BaseModel { this.checkDate = checkDate; } + public String getXlddz() { + return xlddz; + } + + public void setXlddz(String xlddz) { + this.xlddz = xlddz; + } + + public String getXlsxdz() { + return xlsxdz; + } + + public void setXlsxdz(String xlsxdz) { + this.xlsxdz = xlsxdz; + } + + public String getXlrs() { + return xlrs; + } + + public void setXlrs(String xlrs) { + this.xlrs = xlrs; + } + + public String getXlyy() { + return xlyy; + } + + public void setXlyy(String xlyy) { + this.xlyy = xlyy; + } + + public String getXlsqxw() { + return xlsqxw; + } + + public void setXlsqxw(String xlsqxw) { + this.xlsqxw = xlsqxw; + } + public String getBuildId() { return buildId; } 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 507dcb2..7627b72 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 @@ -222,6 +222,21 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setWeightEvaluateStandard(request.getWeightEvaluateStandard()); model.setBim(request.getBim()); model.setTestName(request.getTestName()); + + model.setMonth(request.getMonth()); + model.setDdz(request.getDdz()); + model.setSxdz(request.getSxdz()); + model.setRs(request.getRs()); + model.setYy(request.getYy()); + model.setSqxw(request.getSqxw()); + model.setSlpj(request.getSlpj()); + + model.setXlddz(request.getXlddz()); + model.setXlsxdz(request.getXlsxdz()); + model.setXlrs(request.getXlrs()); + model.setXlyy(request.getXlyy()); + model.setXlpj(request.getXlpj()); + //结案 /*model.setEndCase(request.getEndCase()); //表示选中结案 @@ -1468,6 +1483,18 @@ public class BabyCheckFacade extends BaseServiceImpl { result.setId(model.getId()); result.setPid(model.getPid()); result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); + Integer days = DateUtil.getDays(model.getBirth(), new Date()); + Double tureMonthAge= 0.0; + if(days!=null){ + Double aDouble = Double.valueOf(days.toString()); + aDouble = aDouble / 3; + if(aDouble.toString().contains(".")){ + String substring = aDouble.toString().substring(0, aDouble.toString().indexOf(".") + 2); + result.setTureMonthAge(substring); + } + } +// tureMonthAge = Math.ceil(aDouble); +// result.setTureMonthAge(tureMonthAge.toString()); result.setGender(SexEnum.getTextById(model.getSex())); result.setName(model.getName()); result.setBirth(DateUtil.getyyyy_MM_dd(model.getBirth())); @@ -1604,6 +1631,22 @@ public class BabyCheckFacade extends BaseServiceImpl { /*秦皇岛儿保检查使用*/ model.setBim(checkModel.getBim()); model.setTestName(checkModel.getTestName()); + + model.setMonth(checkModel.getMonth()); + model.setDdz(checkModel.getDdz()); + model.setSxdz(checkModel.getSxdz()); + model.setRs(checkModel.getRs()); + model.setYy(checkModel.getYy()); + model.setSqxw(checkModel.getSqxw()); + model.setSlpj(checkModel.getSlpj()); + + model.setXlddz(checkModel.getXlddz()); + model.setXlsxdz(checkModel.getXlsxdz()); + model.setXlrs(checkModel.getXlrs()); + model.setXlyy(checkModel.getXlyy()); + model.setXlpj(checkModel.getXlpj()); + model.setXlsqxw(checkModel.getXlsqxw()); + model.setExercise(checkModel.getExercise()); model.setLanguage(checkModel.getLanguage()); model.setSocialContact(checkModel.getSocialContact()); 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 77c868f..34454da 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 @@ -5255,6 +5255,23 @@ public class ViewFacade { /*秦皇岛儿保检查使用*/ model.setBim(checkModel.getBim()); model.setTestName(checkModel.getTestName()); + + model.setMonth(checkModel.getMonth()); + model.setDdz(checkModel.getDdz()); + model.setSxdz(checkModel.getSxdz()); + model.setRs(checkModel.getRs()); + model.setYy(checkModel.getYy()); + model.setSqxw(checkModel.getSqxw()); + model.setSlpj(checkModel.getSlpj()); + + model.setXlddz(checkModel.getXlddz()); + model.setXlsxdz(checkModel.getXlsxdz()); + model.setXlrs(checkModel.getXlrs()); + model.setXlyy(checkModel.getXlyy()); + model.setXlpj(checkModel.getXlpj()); + model.setXlsqxw(checkModel.getXlsqxw()); + + model.setExercise(checkModel.getExercise()); model.setLanguage(checkModel.getLanguage()); model.setSocialContact(checkModel.getSocialContact()); 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 f09e4a7..fddc9e3 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 @@ -27,6 +27,22 @@ public class BabyCheckRequest { private String mainFoster; private String bim; private String testName; + private String month; //实际月龄 + + private String ddz; //大动作 + private String sxdz; //数细动作 + private String rs; //认识 + private String yy;// 言语 + private String sqxw;// 社区行为 + private String slpj; //商力平均值 + + private String xlddz; //大动作(心理月龄) + private String xlsxdz; //数细动作(心理月龄) + private String xlrs; //认识(心理月龄) + private String xlyy;// 言语(心理月龄) + private String xlsqxw;// 社区行为(心理月龄) + private String xlpj; //心里平均值(心理月龄) + //喂养方式 private String feedType; //小便 @@ -712,10 +728,6 @@ public class BabyCheckRequest { return assistFood; } - public void setAssistFood(Map assistFood) { - this.assistFood = assistFood; - } - public String getCyNum() { return cyNum; } @@ -1870,4 +1882,113 @@ public class BabyCheckRequest { public void setTestName(String testName) { this.testName = testName; } + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } + + + + public String getDdz() { + return ddz; + } + + public void setDdz(String ddz) { + this.ddz = ddz; + } + + public String getSxdz() { + return sxdz; + } + + public void setSxdz(String sxdz) { + this.sxdz = sxdz; + } + + public String getRs() { + return rs; + } + + public void setRs(String rs) { + this.rs = rs; + } + + public String getYy() { + return yy; + } + + public void setYy(String yy) { + this.yy = yy; + } + + public String getSqxw() { + return sqxw; + } + + public void setSqxw(String sqxw) { + this.sqxw = sqxw; + } + + public String getXlpj() { + return xlpj; + } + + public void setXlpj(String xlpj) { + this.xlpj = xlpj; + } + + public String getSlpj() { + return slpj; + } + + public String getXlddz() { + return xlddz; + } + + public void setXlddz(String xlddz) { + this.xlddz = xlddz; + } + + public String getXlsxdz() { + return xlsxdz; + } + + public void setXlsxdz(String xlsxdz) { + this.xlsxdz = xlsxdz; + } + + public String getXlrs() { + return xlrs; + } + + public void setXlrs(String xlrs) { + this.xlrs = xlrs; + } + + public String getXlyy() { + return xlyy; + } + + public void setXlyy(String xlyy) { + this.xlyy = xlyy; + } + + public String getXlsqxw() { + return xlsqxw; + } + + public void setXlsqxw(String xlsqxw) { + this.xlsqxw = xlsqxw; + } + + public void setAssistFood(Map assistFood) { + this.assistFood = assistFood; + } + + public void setSlpj(String slpj) { + this.slpj = slpj; + } } 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 5b49440..133e449 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 @@ -11,6 +11,133 @@ public class BabyCheckPageResult { /*秦皇岛修改的儿保检查内容*/ private String bim; private String testName; + private String month; //实际月龄 + private String xlvalue; //心理月龄 + private String ddz; //大动作 + private String sxdz; //数细动作 + private String rs; //认识 + private String yy;// 言语 + private String sqxw;// 社区行为 + private String xlpj; //心里平均值 + private String slpj; //商力平均值 + private String xlddz; //大动作(心理月龄) + private String xlsxdz; //数细动作(心理月龄) + private String xlrs; //认识(心理月龄) + private String xlyy;// 言语(心理月龄) + private String xlsqxw;// 社区行为(心理月龄) + + public String getXlddz() { + return xlddz; + } + + public void setXlddz(String xlddz) { + this.xlddz = xlddz; + } + + public String getXlsxdz() { + return xlsxdz; + } + + public void setXlsxdz(String xlsxdz) { + this.xlsxdz = xlsxdz; + } + + public String getXlrs() { + return xlrs; + } + + public void setXlrs(String xlrs) { + this.xlrs = xlrs; + } + + public String getXlyy() { + return xlyy; + } + + public void setXlyy(String xlyy) { + this.xlyy = xlyy; + } + + public String getXlsqxw() { + return xlsqxw; + } + + public void setXlsqxw(String xlsqxw) { + this.xlsqxw = xlsqxw; + } + + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } + + public String getXlvalue() { + return xlvalue; + } + + public void setXlvalue(String xlvalue) { + this.xlvalue = xlvalue; + } + + public String getDdz() { + return ddz; + } + + public void setDdz(String ddz) { + this.ddz = ddz; + } + + public String getSxdz() { + return sxdz; + } + + public void setSxdz(String sxdz) { + this.sxdz = sxdz; + } + + public String getRs() { + return rs; + } + + public void setRs(String rs) { + this.rs = rs; + } + + public String getYy() { + return yy; + } + + public void setYy(String yy) { + this.yy = yy; + } + + public String getSqxw() { + return sqxw; + } + + public void setSqxw(String sqxw) { + this.sqxw = sqxw; + } + + public String getXlpj() { + return xlpj; + } + + public void setXlpj(String xlpj) { + this.xlpj = xlpj; + } + + public String getSlpj() { + return slpj; + } + + public void setSlpj(String slpj) { + this.slpj = slpj; + } + //运动 private String exercise ; //语言 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 8004622..6f6f4d0 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 @@ -10,6 +10,124 @@ public class BabyCheckResult { private String id; private String bim; private String testName; + private String month; //实际月龄 + private String ddz; //大动作 + private String sxdz; //数细动作 + private String rs; //认识 + private String yy;// 言语 + private String sqxw;// 社区行为 + private String xlpj; //心里平均值 + private String slpj; //商力平均值 + private String xlddz; //大动作(心理月龄) + private String xlsxdz; //数细动作(心理月龄) + private String xlrs; //认识(心理月龄) + private String xlyy;// 言语(心理月龄) + private String xlsqxw;// 社区行为(心理月龄) + + public String getXlddz() { + return xlddz; + } + + public void setXlddz(String xlddz) { + this.xlddz = xlddz; + } + + public String getXlsxdz() { + return xlsxdz; + } + + public void setXlsxdz(String xlsxdz) { + this.xlsxdz = xlsxdz; + } + + public String getXlrs() { + return xlrs; + } + + public void setXlrs(String xlrs) { + this.xlrs = xlrs; + } + + public String getXlyy() { + return xlyy; + } + + public void setXlyy(String xlyy) { + this.xlyy = xlyy; + } + + public String getXlsqxw() { + return xlsqxw; + } + + public void setXlsqxw(String xlsqxw) { + this.xlsqxw = xlsqxw; + } + + public String getMonth() { + return month; + } + + public void setMonth(String month) { + this.month = month; + } + + + public String getDdz() { + return ddz; + } + + public void setDdz(String ddz) { + this.ddz = ddz; + } + + public String getSxdz() { + return sxdz; + } + + public void setSxdz(String sxdz) { + this.sxdz = sxdz; + } + + public String getRs() { + return rs; + } + + public void setRs(String rs) { + this.rs = rs; + } + + public String getYy() { + return yy; + } + + public void setYy(String yy) { + this.yy = yy; + } + + public String getSqxw() { + return sqxw; + } + + public void setSqxw(String sqxw) { + this.sqxw = sqxw; + } + + public String getXlpj() { + return xlpj; + } + + public void setXlpj(String xlpj) { + this.xlpj = xlpj; + } + + public String getSlpj() { + return slpj; + } + + public void setSlpj(String slpj) { + this.slpj = slpj; + } //运动 private String exercise ; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java index a357d47..d25dffb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyChooseResult.java @@ -9,11 +9,20 @@ public class BabyChooseResult { private String birth; private String gender; private String monthAge; + private String tureMonthAge; private String pid; private String hospitalId; private String hospitalName; private String blNo; + public String getTureMonthAge() { + return tureMonthAge; + } + + public void setTureMonthAge(String tureMonthAge) { + this.tureMonthAge = tureMonthAge; + } + public String getBlNo() { return blNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index bb9605f..f31e073 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -346,12 +346,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient * * @param month 实际月龄 * @param xlvalue 心理月龄 - * @param ddz - * @param sxdz - * @param rs - * @param yy - * @param sqxw - * @param type 1大动作,2数细动作 3认识 4言语 5社区行为 6平均值 + * @param ddz 大动作 + * @param sxdz 数细动作 + * @param rs 认识 + * @param yy 言语 + * @param sqxw 社区行为 + * @param type 6平均值 * @Author: 武涛涛 * @Date: 2020/7/31 13:16 */ -- 1.8.3.1