From d6f19bab883b2f7a938a890635470ae3203d3b98 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 16 Mar 2022 14:12:53 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E5=84=BF=E4=BF=9D=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E9=97=AE=E9=A2=982022.1.4-=E5=84=BF=E7=AB=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=85=A5=E5=9B=AD=E4=BD=93=E6=A3=80=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=9A=E5=85=B6=E4=BB=96/?= =?UTF-8?q?=E5=8C=BB=E7=94=9F=E7=94=B5=E5=AD=90=E7=AD=BE=E5=90=8D/?= =?UTF-8?q?=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0=EF=BC=8C=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=AB=98=E5=8D=B1=E5=9B=A0=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/BabyKindergartenCheckModel.java | 36 ++++++++++++++++++-- .../platform/query/BabyKindergartenCheckQuery.java | 12 +++++++ .../web/facade/BabyKindergartenCheckFacade.java | 11 +++++++ .../web/request/BabyKindergartenCheckRequest.java | 38 ++++++++++++++++++++-- .../web/result/BabyKindergartenCheckResult.java | 38 ++++++++++++++++++++-- 5 files changed, 127 insertions(+), 8 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java index 9484b6b..2e58bb7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyKindergartenCheckModel.java @@ -147,18 +147,48 @@ public class BabyKindergartenCheckModel extends BaseModel { private String checkDoctor; //体检日期 private Date checkDate; - //隆化-编号 - private String code; - /** * 隆化儿保需求问题2022.1.4 */ + //隆化-编号 + private String code; + //轻度贫血 private Map mildAnaemia; //中度贫血 private Map moderateAnaemia; //心脏杂音 private Map heartMurmur; + //其他 + private String other; + //医生电子签名 + private String doctorSign; + //高危因素 + private List highRisk; + + public List getHighRisk() { + return highRisk; + } + + public void setHighRisk(List highRisk) { + this.highRisk = highRisk; + } + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } public Map getMildAnaemia() { return mildAnaemia; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java index f11d2cd..6c32489 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyKindergartenCheckQuery.java @@ -51,7 +51,16 @@ public class BabyKindergartenCheckQuery extends BaseQuery implements IConvertToN private String sort; + //高危因素 + private List highRisk; + public List getHighRisk() { + return highRisk; + } + + public void setHighRisk(List highRisk) { + this.highRisk = highRisk; + } //电话 private String phon; @@ -243,6 +252,9 @@ public class BabyKindergartenCheckQuery extends BaseQuery implements IConvertToN if (StringUtils.isNotEmpty(phon)) { condition = condition.and("phon", phon, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(highRisk)) { + condition = condition.and("highRisk", highRisk, MongoOper.IN); + } Criteria c = null; //月龄 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java index 943cda1..b56c9e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyKindergartenCheckFacade.java @@ -133,11 +133,18 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { model.setYsyj(request.getYsyj()); model.setCheckDoctor(request.getCheckDoctor()); model.setCheckDate(DateUtil.parseYMD(request.getCheckDate())); + //隆化-编号 model.setCode(request.getCode()); //隆化需求-贫血轻度中度，心脏杂音 model.setMildAnaemia(request.getMildAnaemia()); model.setModerateAnaemia(request.getModerateAnaemia()); model.setHeartMurmur(request.getHeartMurmur()); + //隆化-其他 + model.setOther(request.getOther()); + //隆化-电子签名 + model.setDoctorSign(request.getDoctorSign()); + //高危因素 + model.setHighRisk(request.getHighRisk()); return model; } @@ -477,6 +484,10 @@ public class BabyKindergartenCheckFacade extends BaseServiceImpl { if (babyQuery.getBirthEnd() != null) { babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); } + //高危筛选 + if (CollectionUtils.isNotEmpty(babyQuery.getHighRisk())) { + babyQuery.setHighRisk(babyQuery.getHighRisk()); + } babyKindergartenCheckModelList = babyKindergartenCheckService.queryAll(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java index a145707..94169f2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java @@ -157,11 +157,12 @@ public class BabyKindergartenCheckRequest { private String checkDoctor; //体检日期 private String checkDate; - //隆化-编号 - private String code; /** * 隆化儿保需求问题2022.1.4 */ + //隆化-编号 + private String code; + //轻度贫血 private Map mildAnaemia; //中度贫血 @@ -169,6 +170,39 @@ public class BabyKindergartenCheckRequest { //心脏杂音 private Map heartMurmur; + //其他 + private String other; + + //医生电子签名 + private String doctorSign; + + //高危因素 + private List highRisk; + + public List getHighRisk() { + return highRisk; + } + + public void setHighRisk(List highRisk) { + this.highRisk = highRisk; + } + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + public Map getMildAnaemia() { return mildAnaemia; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java index 51c9138..799bb39 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyKindergartenCheckResult.java @@ -155,12 +155,11 @@ public class BabyKindergartenCheckResult implements IBasicResultConvert mildAnaemia; //中度贫血 @@ -168,6 +167,39 @@ public class BabyKindergartenCheckResult implements IBasicResultConvert heartMurmur; + //其他 + private String other; + + //医生电子签名 + private String doctorSign; + + //高危因素 + private List highRisk; + + public List getHighRisk() { + return highRisk; + } + + public void setHighRisk(List highRisk) { + this.highRisk = highRisk; + } + + public String getDoctorSign() { + return doctorSign; + } + + public void setDoctorSign(String doctorSign) { + this.doctorSign = doctorSign; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + public Map getMildAnaemia() { return mildAnaemia; } -- 1.8.3.1