diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index ef2f38c..fb72569 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -154,22 +154,22 @@ public class CancerScreeningFacade { String rxcsLevel = ""; if (StringUtils.isNotEmpty(model.getRxcsLeftLevel())) { - rxcsLevel+="左乳:"+(Integer.parseInt(model.getRxcsLeftLevel())-1)+"级 "; + rxcsLevel+="左乳:"+model.getRxcsLeftLevel()+"级 "; } if (StringUtils.isNotEmpty(model.getRxcsRightLevel())) { - rxcsLevel+="右乳:"+(Integer.parseInt(model.getRxcsRightLevel())-1)+"级 "; + rxcsLevel+="右乳:"+model.getRxcsRightLevel()+"级 "; } map.put("rxcsLevel",rxcsLevel);//乳腺彩色超声检查等级 String rxxtLevel = ""; if (StringUtils.isNotEmpty(model.getRxxLeftLevel())) { - rxxtLevel+="左乳:"+(Integer.parseInt(model.getRxxLeftLevel())-1)+"级 "; + rxxtLevel+="左乳:"+model.getRxxLeftLevel()+"级 "; } if (StringUtils.isNotEmpty(model.getRxxRightLevel())) { - rxxtLevel+="右乳:"+(Integer.parseInt(model.getRxxRightLevel())-1)+"级 "; + rxxtLevel+="右乳:"+model.getRxxRightLevel()+"级 "; } map.put("rxxtLevel", rxxtLevel);//乳腺X检查等级 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java index 97e3e27..5f7719c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java @@ -75,7 +75,7 @@ public class CancerScreeningRequest extends BasePageQueryRequest { private String rxcsLevel; //乳腺X检查 private String rxxLevel; - //最后诊断 0 未见异常 1 异常 + //最后诊断 1 2 3 4 5 private String zhzd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 3a4f593..0d6c230 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -221,7 +221,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { query.addCriteria(Criteria.where("zhzdSelect."+param.getZhzdSelect()).is(true)); } if (StringUtils.isNotEmpty(param.getZzblxSelect())) { - query.addCriteria(Criteria.where("zzblxSelect").is(param.getZzblxSelect())); + query.addCriteria(Criteria.where("zzblxSelect."+param.getZzblxSelect()).is(true)); } query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); String provinceId = param.getProvinceId();