jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 43c8b8f4543c3e066bcfb8f79d8b68d7ad3e63aa

Authored by shiyang
1 parent ab43cf1c90
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

隆化-儿童管理---全部儿童----检索框加入牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音

Showing 2 changed files with 36 additions and 32 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 43c8b8f
... ... @@ -3415,19 +3415,23 @@
3415 3415 babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
3416 3416 System.out.println("========"+babyQuery.convertToQuery().convertToMongoQuery().toString());
3417 3417 //用隆华新口腔模块中数据筛选 牙齿异常2项
3418   - if(null!=request.getCyNumType()||null!=request.getQcNumType()){
  3418 + if(null!=request.getCyNumType()||null!=request.getQcNumType()||StringUtils.isNotEmpty(request.getPositiveType())){
3419 3419 babyQuery.setOralCheckYn(YnEnums.YES.getId());
  3420 + babyQuery.setPositiveType(request.getPositiveType());
3420 3421 babyQuery.setYcsz(null!=request.getCyNumType()?request.getCyNumType().toString():"");
3421 3422 babyQuery.setQcStart(null!=request.getQcNumType()?2==request.getQcNumType()?"1":"":"");
3422 3423 }
3423   - //隆化-牙齿异常、视力异常、轻度贫血、中度贫血、心脏杂音 筛选(这里牙齿异常2项不用了，用隆华新做的口腔模块代替)
  3424 + //隆化-新眼健康 -视力异常
  3425 + if(StringUtils.isNotEmpty(request.getLhEyePositiveType())){
  3426 + babyQuery.setLheyeCheckYn(YnEnums.YES.getId());
  3427 + babyQuery.setLhEyePositiveType(request.getLhEyePositiveType());
  3428 + }
  3429 + //隆化-儿童检查-轻度贫血、中度贫血、心脏杂音 筛选
3424 3430 if(StringUtils.isNotEmpty(request.getMildAnaemia())||StringUtils.isNotEmpty(request.getModerateAnaemia())||
3425   - StringUtils.isNotEmpty(request.getHeartMurmur())){//||null!=request.getCyNumType()||null!=request.getQcNumType()
  3431 + StringUtils.isNotEmpty(request.getHeartMurmur())){
3426 3432 final String mildAnaemia=request.getMildAnaemia();
3427 3433 final String moderateAnaemia=request.getModerateAnaemia();
3428 3434 final String heartMurmur=request.getHeartMurmur();
3429   -// final Integer cyNumType=request.getCyNumType();
3430   -// final Integer qcNumType=request.getQcNumType();
3431 3435 List<BabyModel> list=babyBookbuildingService.queryBabyBuildByCond(babyQuery);
3432 3436 Set<String> data = new HashSet<>();
3433 3437 int batchSize = 20;
3434 3438  
3435 3439  
3436 3440  
... ... @@ -3448,36 +3452,14 @@
3448 3452 Query query = new Query();
3449 3453 query.addCriteria(Criteria.where("buildId").is(risk.getId()));
3450 3454 if (StringUtils.isNotEmpty(mildAnaemia)) {
3451   - query.addCriteria(Criteria.where("mildAnaemia").is(mildAnaemia));
  3455 + query.addCriteria(Criteria.where("mildAnaemia.yesOrNo").is(mildAnaemia));
3452 3456 }
3453 3457 if (StringUtils.isNotEmpty(moderateAnaemia)) {
3454   - query.addCriteria(Criteria.where("moderateAnaemia").is(moderateAnaemia));
  3458 + query.addCriteria(Criteria.where("moderateAnaemia.yesOrNo").is(moderateAnaemia));
3455 3459 }
3456 3460 if (StringUtils.isNotEmpty(heartMurmur)) {
3457   - query.addCriteria(Criteria.where("heartMurmur").is(heartMurmur));
  3461 + query.addCriteria(Criteria.where("heartMurmur.yesOrNo").is(heartMurmur));
3458 3462 }
3459   -// if (null != cyNumType) {
3460   -// if (cyNumType == 1) {//正常
3461   -// Criteria criteria = new Criteria();
3462   -// Criteria criteria1 = Criteria.where("cyNumType").is(cyNumType);
3463   -// Criteria criteria2 = Criteria.where("cyNumType").exists(false);
3464   -// criteria.orOperator(criteria2, criteria1);
3465   -// query.addCriteria(criteria1);//如需兼容历史数据用criteria。没有该字段的暂时默认正常
3466   -// }
3467   -// if (cyNumType == 2) {//异常
3468   -// query.addCriteria(Criteria.where("cyNumType").is(cyNumType));
3469   -// }
3470   -// }
3471   -// if (null != qcNumType) {
3472   -// if (qcNumType == 2) {//异常
3473   -// //字符串判断大小
3474   -// String formatQcNum = String.format("function() {\n" +
3475   -// " return this.qcNum > %s \n" +
3476   -// " }", "0");
3477   -// query.addCriteria(Criteria.where("$where").is(formatQcNum));
3478   -// }
3479   -// }
3480   -
3481 3463 BabyCheckModel checkModel = mongoTemplate.findOne(query, BabyCheckModel.class);
3482 3464 if (null != checkModel) {
3483 3465 ids.add(checkModel.getBuildId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ 43c8b8f
... ... @@ -128,14 +128,20 @@
128 128 private Integer cyNumType;
129 129 //龋齿状态 1：正常，2：异常
130 130 private Integer qcNumType;
131   -
  131 + /**
  132 + * 口腔阳性状态1:正常 2:阳性
  133 + */
  134 + private String positiveType;
132 135 //高危结案状态
133 136 private Integer settleType;
134 137 //高危结案时间
135 138 private String settleTime;
136 139 //儿保检查时间
137 140 private String checkTime;
138   -
  141 + /**
  142 + * 隆化-新眼健康-阳性状态 最后一次检查的状态。1:正常 2:阳性
  143 + */
  144 + private String lhEyePositiveType;
139 145 /********************************************/
140 146 //隆化-儿童建档户籍地
141 147 /**
... ... @@ -158,6 +164,22 @@
158 164 *详细地址
159 165 */
160 166 private String babyAddress;
  167 +
  168 + public String getPositiveType() {
  169 + return positiveType;
  170 + }
  171 +
  172 + public void setPositiveType(String positiveType) {
  173 + this.positiveType = positiveType;
  174 + }
  175 +
  176 + public String getLhEyePositiveType() {
  177 + return lhEyePositiveType;
  178 + }
  179 +
  180 + public void setLhEyePositiveType(String lhEyePositiveType) {
  181 + this.lhEyePositiveType = lhEyePositiveType;
  182 + }
161 183  
162 184 public String getBabyProvinceId() {
163 185 return babyProvinceId;