From c19544b03c8d569a580b2103bfa54ddc08f0ea71 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Sat, 19 Mar 2022 12:38:53 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/BabyModel.java | 12 +++++++++ .../com/lyms/platform/query/BabyModelQuery.java | 29 ++++++++++------------ .../lyms/platform/query/BabyOralCheckQuery.java | 24 +++++++----------- .../operate/web/facade/BabyOralCheckFacade.java | 7 ++++++ 4 files changed, 41 insertions(+), 31 deletions(-) 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 5f2625d..2fabb3c 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 @@ -788,6 +788,18 @@ public class BabyModel extends BaseModel { * 检查月龄套餐 */ private String oralCheckMonthId; + /** + * 检查月龄 + */ + private String oralCheckMonthAge; + + public String getOralCheckMonthAge() { + return oralCheckMonthAge; + } + + public void setOralCheckMonthAge(String oralCheckMonthAge) { + this.oralCheckMonthAge = oralCheckMonthAge; + } public String getOralCheckId() { return oralCheckId; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index 5d96254..32a469e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -1949,12 +1949,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(hc)) { condition = condition.and("hc", hc, MongoOper.IS); } - if (StringUtils.isNotEmpty(oralCheckMonthId)) { + if (StringUtils.isNotEmpty(wgfb)) { condition = condition.and("wgfb", wgfb, MongoOper.IS); } if (StringUtils.isNotEmpty(oralCheckId)) { condition = condition.and("oralCheckId", oralCheckId, MongoOper.IS); } + if (StringUtils.isNotEmpty(oralCheckDoctor)) { + condition = condition.and("oralCheckDoctor", oralCheckDoctor, MongoOper.IS); + } Criteria c = null; if (null != birthStart) { @@ -2316,34 +2319,28 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { } } + Criteria cor6=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 //龋齿个数筛选 if(StringUtils.isNotEmpty(qcStart)){//大于等于 //字符串判断大小 String format = String.format("function() {\n" + " return this.qc >= %s \n" + " }",qcStart); - if(null != c){ - c = c.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 - }else{ - c = Criteria.where("$where").is(format).and("qc").ne(""); - } + cor6.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 } + Criteria cor7=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 if(StringUtils.isNotEmpty(qcEnd)){//小于等于 //字符串判断大小 String format = String.format("function() {\n" + " return this.qc <= %s \n" + " }",qcEnd); - if(null != c){ - c = c.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 - }else{ - c = Criteria.where("$where").is(format).and("qc").ne(""); - } + cor7.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 } - if (null != oralCheckTimeStart && oralCheckTimeStart != null) { + if (null != oralCheckTimeStart && oralCheckTimeEnd != null) { if (null != c) { - c = c.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeStart); + c = c.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd); } else { - c = Criteria.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeStart); + c = Criteria.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd); } } if (null != nextOralCheckTimeStrat && nextOralCheckTimeEnd != null) { @@ -2358,9 +2355,9 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { * 多个orCondition 需要添加Criteria来控制json同级两个and或者or来解决mongodb执行查询问题 */ if(c!=null){ - return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2,cor3,cor4,cor5)).toMongoQuery(); + return new MongoCondition(c.andOperator(condition.getCriteria(),cor,cor2,cor3,cor4,cor5,cor6,cor7)).toMongoQuery(); } - return new MongoCondition(cor.andOperator(condition.getCriteria(),cor2,cor3,cor4,cor5)).toMongoQuery(); + return new MongoCondition(cor.andOperator(condition.getCriteria(),cor2,cor3,cor4,cor5,cor6,cor7)).toMongoQuery(); } public Boolean getFmDataStatu() { diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java index cb615fa..c3fd175 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyOralCheckQuery.java @@ -262,11 +262,11 @@ public class BabyOralCheckQuery extends BaseQuery implements IConvertToNativeQue c = Criteria.where("birth").gte(birthEnd); } } - if (null != oralCheckTimeStart && oralCheckTimeStart != null) { + if (null != oralCheckTimeStart && oralCheckTimeEnd != null) { if (null != c) { - c = c.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeStart); + c = c.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd); } else { - c = Criteria.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeStart); + c = Criteria.where("oralCheckTime").gte(oralCheckTimeStart).lte(oralCheckTimeEnd); } } if (null != nextOralCheckTimeStrat && nextOralCheckTimeEnd != null) { @@ -277,27 +277,21 @@ public class BabyOralCheckQuery extends BaseQuery implements IConvertToNativeQue } } //龋齿个数筛选 + Criteria c3=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 if(StringUtils.isNotEmpty(qcStart)){//大于等于 //字符串判断大小 String format = String.format("function() {\n" + " return this.qc >= %s \n" + " }",qcStart); - if(null != c){ - c = c.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 - }else{ - c = Criteria.where("$where").is(format).and("qc").ne(""); - } + c3.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 } + Criteria c4=MongoCondition.newInstance().getCriteria();//这里不能给null return拼接不能为空 if(StringUtils.isNotEmpty(qcEnd)){//小于等于 //字符串判断大小 String format = String.format("function() {\n" + " return this.qc <= %s \n" + " }",qcEnd); - if(null != c){ - c = c.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 - }else{ - c = Criteria.where("$where").is(format).and("qc").ne(""); - } + c4.and("$where").is(format).and("qc").ne("");//加ne：该字段在mongo中是”“ ，如果表达式有>=0也可查出。可以避免空数据 } // 查询号 Criteria c2=MongoCondition.newInstance().getCriteria(); @@ -314,9 +308,9 @@ public class BabyOralCheckQuery extends BaseQuery implements IConvertToNativeQue } if (null != c) { - return new MongoCondition(c.andOperator(condition.getCriteria(),c2)).toMongoQuery(); + return new MongoCondition(c.andOperator(condition.getCriteria(),c2,c3,c4)).toMongoQuery(); } - return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery(); + return new MongoCondition(c2.andOperator(condition.getCriteria(),c3,c4)).toMongoQuery(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java index 42f957a..011d139 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.BabyOralCheckService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.CheckMonthEnums; +import com.lyms.platform.common.enums.CheckMonthQhdEnums; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -119,6 +120,7 @@ public class BabyOralCheckFacade { babyModel2.setQc(babyOralCheck.getQc()); babyModel2.setHc(babyOralCheck.getHc()); babyModel2.setWgfb(babyOralCheck.getWgfb()); + babyModel2.setOralCheckMonthAge(babyOralCheck.getCheckMonthAge()); Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel2)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyOralCheck.getBabyId())), update, BabyModel.class); } @@ -259,6 +261,7 @@ public class BabyOralCheckFacade { babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(babyModelQuery.getQueryMonthAgeStart())); } List babyModelList = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery, "oralCheckTime", Sort.Direction.DESC); + System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString()); List result=new ArrayList<>(); for (BabyModel babyModel : babyModelList) { Map map=new HashMap<>(); @@ -273,6 +276,10 @@ public class BabyOralCheckFacade { map.put("positive", StringUtils.isNotEmpty(babyModel.getPositiveType())?("2".equals(babyModel.getPositiveType())?"阳性":"正常"):"");//阳性项目 map.put("checkTime", DateUtil.getYyyyMmDd(babyModel.getOralCheckTime()));//检查日期 map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyModel.getNextOralCheckTime()));//预约日期 + map.put("oralCheckMonthAge", babyModel.getOralCheckMonthAge());//检查月龄 + map.put("hc", babyModel.getHc()); + map.put("qc", babyModel.getQc()); + map.put("wgfb", babyModel.getWgfb()); result.add(map); } BaseObjectResponse br = new BaseObjectResponse(); -- 1.8.3.1