From 43c8b8f4543c3e066bcfb8f79d8b68d7ad3e63aa Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Tue, 29 Mar 2022 16:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96-=E5=84=BF=E7=AB=A5=E7=AE=A1?= =?UTF-8?q?=E7=90=86---=E5=85=A8=E9=83=A8=E5=84=BF=E7=AB=A5----=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E5=8A=A0=E5=85=A5=E7=89=99=E9=BD=BF=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E3=80=81=E8=A7=86=E5=8A=9B=E5=BC=82=E5=B8=B8=E3=80=81?= =?UTF-8?q?=E8=BD=BB=E5=BA=A6=E8=B4=AB=E8=A1=80=E3=80=81=E4=B8=AD=E5=BA=A6?= =?UTF-8?q?=E8=B4=AB=E8=A1=80=E3=80=81=E5=BF=83=E8=84=8F=E6=9D=82=E9=9F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BabyBookbuildingFacade.java | 42 +++++++--------------- .../operate/web/request/BabyManageRequest.java | 26 ++++++++++++-- 2 files changed, 36 insertions(+), 32 deletions(-) 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 eab2dfe..cff4171 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 @@ -3415,19 +3415,23 @@ public class BabyBookbuildingFacade { babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null); System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString()); //用隆华新口腔模块中数据筛选 牙齿异常2项 - if(null!=request.getCyNumType()||null!=request.getQcNumType()){ + if(null!=request.getCyNumType()||null!=request.getQcNumType()||StringUtils.isNotEmpty(request.getPositiveType())){ babyQuery.setOralCheckYn(YnEnums.YES.getId()); + babyQuery.setPositiveType(request.getPositiveType()); babyQuery.setYcsz(null!=request.getCyNumType()?request.getCyNumType().toString():""); babyQuery.setQcStart(null!=request.getQcNumType()?2==request.getQcNumType()?"1":"":""); } - //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选(这里牙齿异常2项不用了，用隆华新做的口腔模块代替) + //隆化-新眼健康 -视力异常 + if(StringUtils.isNotEmpty(request.getLhEyePositiveType())){ + babyQuery.setLheyeCheckYn(YnEnums.YES.getId()); + babyQuery.setLhEyePositiveType(request.getLhEyePositiveType()); + } + //隆化-儿童检查-轻度贫血、中度贫血、心脏杂音 筛选 if(StringUtils.isNotEmpty(request.getMildAnaemia())||StringUtils.isNotEmpty(request.getModerateAnaemia())|| - StringUtils.isNotEmpty(request.getHeartMurmur())){//||null!=request.getCyNumType()||null!=request.getQcNumType() + StringUtils.isNotEmpty(request.getHeartMurmur())){ final String mildAnaemia=request.getMildAnaemia(); final String moderateAnaemia=request.getModerateAnaemia(); final String heartMurmur=request.getHeartMurmur(); -// final Integer cyNumType=request.getCyNumType(); -// final Integer qcNumType=request.getQcNumType(); List list=babyBookbuildingService.queryBabyBuildByCond(babyQuery); Set data = new HashSet<>(); int batchSize = 20; @@ -3448,36 +3452,14 @@ public class BabyBookbuildingFacade { Query query = new Query(); query.addCriteria(Criteria.where("buildId").is(risk.getId())); if (StringUtils.isNotEmpty(mildAnaemia)) { - query.addCriteria(Criteria.where("mildAnaemia").is(mildAnaemia)); + query.addCriteria(Criteria.where("mildAnaemia.yesOrNo").is(mildAnaemia)); } if (StringUtils.isNotEmpty(moderateAnaemia)) { - query.addCriteria(Criteria.where("moderateAnaemia").is(moderateAnaemia)); + query.addCriteria(Criteria.where("moderateAnaemia.yesOrNo").is(moderateAnaemia)); } if (StringUtils.isNotEmpty(heartMurmur)) { - query.addCriteria(Criteria.where("heartMurmur").is(heartMurmur)); + query.addCriteria(Criteria.where("heartMurmur.yesOrNo").is(heartMurmur)); } -// if (null != cyNumType) { -// if (cyNumType == 1) {//正常 -// Criteria criteria = new Criteria(); -// Criteria criteria1 = Criteria.where("cyNumType").is(cyNumType); -// Criteria criteria2 = Criteria.where("cyNumType").exists(false); -// criteria.orOperator(criteria2, criteria1); -// query.addCriteria(criteria1);//如需兼容历史数据用criteria。没有该字段的暂时默认正常 -// } -// if (cyNumType == 2) {//异常 -// query.addCriteria(Criteria.where("cyNumType").is(cyNumType)); -// } -// } -// if (null != qcNumType) { -// if (qcNumType == 2) {//异常 -// //字符串判断大小 -// String formatQcNum = String.format("function() {\n" + -// " return this.qcNum > %s \n" + -// " }", "0"); -// query.addCriteria(Criteria.where("$where").is(formatQcNum)); -// } -// } - BabyCheckModel checkModel = mongoTemplate.findOne(query, BabyCheckModel.class); if (null != checkModel) { ids.add(checkModel.getBuildId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 96bcd1a..51fdd96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -128,14 +128,20 @@ public class BabyManageRequest extends BaseQuery { private Integer cyNumType; //龋齿状态 1：正常，2：异常 private Integer qcNumType; - + /** + * 口腔阳性状态1:正常 2:阳性 + */ + private String positiveType; //高危结案状态 private Integer settleType; //高危结案时间 private String settleTime; //儿保检查时间 private String checkTime; - + /** + * 隆化-新眼健康-阳性状态 最后一次检查的状态。1:正常 2:阳性 + */ + private String lhEyePositiveType; /********************************************/ //隆化-儿童建档户籍地 /** @@ -159,6 +165,22 @@ public class BabyManageRequest extends BaseQuery { */ private String babyAddress; + public String getPositiveType() { + return positiveType; + } + + public void setPositiveType(String positiveType) { + this.positiveType = positiveType; + } + + public String getLhEyePositiveType() { + return lhEyePositiveType; + } + + public void setLhEyePositiveType(String lhEyePositiveType) { + this.lhEyePositiveType = lhEyePositiveType; + } + public String getBabyProvinceId() { return babyProvinceId; } -- 1.8.3.1