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 3060179..7981de9 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 @@ -632,6 +632,17 @@ public class BabyCheckModel extends BaseModel { //心脏杂音 private Map heartMurmur; + //出牙数状态 1：正常，2：异常 + private Integer cyNumType; + + public Integer getCyNumType() { + return cyNumType; + } + + public void setCyNumType(Integer cyNumType) { + this.cyNumType = cyNumType; + } + public Map getMildAnaemia() { return mildAnaemia; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 00da97b..05365a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -268,7 +268,12 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd, @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor, @RequestParam(value = "riskCode", required = false) String riskCode, - @RequestParam(value = "healthHigh", required = false) Integer healthHigh + @RequestParam(value = "healthHigh", required = false) Integer healthHigh, + @RequestParam(value = "mildAnaemia", required = false) String mildAnaemia, + @RequestParam(value = "moderateAnaemia", required = false) String moderateAnaemia, + @RequestParam(value = "heartMurmur", required = false) String heartMurmur, + @RequestParam(value = "cyNumType", required = false) Integer cyNumType, + @RequestParam(value = "qcNumType", required = false) Integer qcNumType ) { if (CollectionUtils.isNotEmpty(highRiskInfos)) { @@ -378,7 +383,14 @@ public class BabyBuildController extends BaseController { request.setLastCheckDoctor(lastCheckDoctor); request.setRiskCode(riskCode); request.setHealthHigh(healthHigh); - + //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选 + request.setMildAnaemia(mildAnaemia); + request.setModerateAnaemia(moderateAnaemia); + request.setHeartMurmur(heartMurmur); + //出牙数状态 + request.setCyNumType(cyNumType); + //龋齿状态 + request.setQcNumType(qcNumType); return babyBookbuildingFacade.queryBabyList(request, loginState.getId()); } 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 92ab750..b1fa0bd 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 @@ -3205,7 +3205,7 @@ public class BabyBookbuildingFacade { } - private List getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) { + private List getBabayListByCondition(final BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) { List buildType = new ArrayList(); @@ -3389,6 +3389,68 @@ public class BabyBookbuildingFacade { //滦平、隆化-儿保管理-全部 加健康/高危筛选 babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null); System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString()); + //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选 + if(StringUtils.isNotEmpty(request.getMildAnaemia())||StringUtils.isNotEmpty(request.getModerateAnaemia())|| + StringUtils.isNotEmpty(request.getHeartMurmur())||null!=request.getCyNumType()||null!=request.getQcNumType()){ + 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=babyBookBuildingDao.queryBabyWithQuery(babyQuery.convertToQuery()); + int batchSize = 20; + int end = 0; + List listFuture = new ArrayList <>(); + final Set idset=new HashSet<>(); + for (int i = 0; i < list.size(); i += batchSize) { + end = (end + batchSize); + if (end > list.size()) { + end = list.size(); + } + final List risks = list.subList(i, end); + listFuture.add(commonThreadPool.submit(new Callable() { + @Override + public Object call() throws Exception { + for (BabyModel risk : risks) { + Query query = new Query(); + query.addCriteria(Criteria.where("id").is(risk.getId())); + if(StringUtils.isNotEmpty(mildAnaemia)){ + query.addCriteria(Criteria.where("mildAnaemia").is(mildAnaemia)); + } + if(StringUtils.isNotEmpty(moderateAnaemia)){ + query.addCriteria(Criteria.where("moderateAnaemia").is(moderateAnaemia)); + } + if(StringUtils.isNotEmpty(heartMurmur)){ + query.addCriteria(Criteria.where("heartMurmur").is(heartMurmur)); + } + if(null!=cyNumType){ + query.addCriteria(Criteria.where("cyNumType").is(cyNumType)); + } + if(null!=qcNumType){ + if(qcNumType==1){//正常 + query.addCriteria(Criteria.where("qcNum").is(0)); + } + if(qcNumType==2){//异常 + query.addCriteria(Criteria.where("qcNum").gt(0)); + } + + } + + final BabyCheckModel checkModel = mongoTemplate.findOne(query, BabyCheckModel.class); + if(null!=checkModel){ + idset.add(checkModel.getBuildId()); + } + } + return null; + } + })); + } + BabyModelQuery babyQuery2=new BabyModelQuery(); + babyQuery2.setPage(request.getPage()); + babyQuery2.setLimit(request.getLimit()); + babyQuery2.setIds(new ArrayList(idset)); + babyQuery=babyQuery2; + } List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); return models; 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 2d9d346..8f9d78f 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 @@ -660,6 +660,10 @@ public class BabyCheckFacade extends BaseServiceImpl { if(MapUtils.isNotEmpty(request.getHeartMurmur())){ model.setHeartMurmur(request.getHeartMurmur()); } + //出牙数状态 + if(null!=request.getCyNumType()){ + model.setCyNumType(request.getCyNumType()); + } return model; } @@ -2577,6 +2581,10 @@ public class BabyCheckFacade extends BaseServiceImpl { if(MapUtils.isNotEmpty(checkModel.getHeartMurmur())){ model.setHeartMurmur(checkModel.getHeartMurmur()); } + //出牙数状态 + if(null!=checkModel.getCyNumType()){ + model.setCyNumType(checkModel.getCyNumType()); + } return model; 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 558f25e..55b020f 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 @@ -6415,6 +6415,10 @@ public class ViewFacade { if(MapUtils.isNotEmpty(checkModel.getHeartMurmur())){ model.setHeartMurmur(checkModel.getHeartMurmur()); } + //出牙数状态 + if(null!=checkModel.getCyNumType()){ + model.setCyNumType(checkModel.getCyNumType()); + } return model; } 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 aee6f1c..d4ad196 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 @@ -592,6 +592,17 @@ public class BabyCheckRequest { //心脏杂音 private Map heartMurmur; + //出牙数状态 1：正常，2：异常 + private Integer cyNumType; + + public Integer getCyNumType() { + return cyNumType; + } + + public void setCyNumType(Integer cyNumType) { + this.cyNumType = cyNumType; + } + public Map getMildAnaemia() { return mildAnaemia; } 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 e76233e..1c5db77 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.dao.BaseQuery; import java.util.List; +import java.util.Map; /** * Created by lqy on 2016/6/17. @@ -114,6 +115,59 @@ public class BabyManageRequest extends BaseQuery { //秦皇岛儿保管理全部 加健康/高危 筛查 0：健康，1：高危 private Integer healthHigh; + /** + * 隆化儿保需求问题2022.1.4 + */ + //轻度贫血 + private String mildAnaemia; + //中度贫血 + private String moderateAnaemia; + //心脏杂音 + private String heartMurmur; + //出牙数状态 1：正常，2：异常 + private Integer cyNumType; + //龋齿状态 1：正常，2：异常 + private Integer qcNumType; + + public Integer getQcNumType() { + return qcNumType; + } + + public void setQcNumType(Integer qcNumType) { + this.qcNumType = qcNumType; + } + + public Integer getCyNumType() { + return cyNumType; + } + + public void setCyNumType(Integer cyNumType) { + this.cyNumType = cyNumType; + } + + public String getMildAnaemia() { + return mildAnaemia; + } + + public void setMildAnaemia(String mildAnaemia) { + this.mildAnaemia = mildAnaemia; + } + + public String getModerateAnaemia() { + return moderateAnaemia; + } + + public void setModerateAnaemia(String moderateAnaemia) { + this.moderateAnaemia = moderateAnaemia; + } + + public String getHeartMurmur() { + return heartMurmur; + } + + public void setHeartMurmur(String heartMurmur) { + this.heartMurmur = heartMurmur; + } public Integer getHealthHigh() { return healthHigh; 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 a027c65..586c077 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 @@ -809,6 +809,17 @@ public class BabyCheckPageResult { //心脏杂音 private Map heartMurmur; + //出牙数状态 1：正常，2：异常 + private Integer cyNumType; + + public Integer getCyNumType() { + return cyNumType; + } + + public void setCyNumType(Integer cyNumType) { + this.cyNumType = cyNumType; + } + public Map getMildAnaemia() { return mildAnaemia; } 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 1672247..cf75b15 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 @@ -832,6 +832,16 @@ public class BabyCheckResult { //心脏杂音 private Map heartMurmur; + //出牙数状态 1：正常，2：异常 + private Integer cyNumType; + + public Integer getCyNumType() { + return cyNumType; + } + + public void setCyNumType(Integer cyNumType) { + this.cyNumType = cyNumType; + } public Map getMildAnaemia() { return mildAnaemia; }