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; }