diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index 7f35c4b..b480e94 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -116,6 +116,47 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //隆化乳腺X钼靶检查内容 private String rxXJc; + //1 左边 2 右边 + private String leftRight; + + //乳腺彩色超声检查 + private String rxcsLevel; + //乳腺X检查 + private String rxxLevel; + //最后诊断 0 未见异常 1 异常 + private String zhzd; + + public String getZhzd() { + return zhzd; + } + + public void setZhzd(String zhzd) { + this.zhzd = zhzd; + } + + public String getLeftRight() { + return leftRight; + } + + public void setLeftRight(String leftRight) { + this.leftRight = leftRight; + } + + public String getRxcsLevel() { + return rxcsLevel; + } + + public void setRxcsLevel(String rxcsLevel) { + this.rxcsLevel = rxcsLevel; + } + + public String getRxxLevel() { + return rxxLevel; + } + + public void setRxxLevel(String rxxLevel) { + this.rxxLevel = rxxLevel; + } public String getRxXJc() { return rxXJc; @@ -165,6 +206,9 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ if(null != yn){ condition=condition.and("yn", yn, MongoOper.IS); } + if(null != zhzd){ + condition=condition.and("sfZhzd.yn", zhzd, MongoOper.IS); + } if(null != isSync){ condition=condition.and("isSync", isSync, MongoOper.IS); } @@ -184,7 +228,30 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ if(StringUtils.isNotEmpty(rxlPgy ) ){ condition=condition.and("rxlPgy.select", rxlPgy, MongoOper.IS); } - + if(StringUtils.isNotEmpty(leftRight) ){ + if (StringUtils.isNotEmpty(rxcsLevel)) + { + if ("1".equals(leftRight)) + { + condition=condition.and("rxcsLeftLevel", rxcsLevel, MongoOper.IS); + } + else + { + condition=condition.and("rxcsRightLevel", rxcsLevel, MongoOper.IS); + } + } + if (StringUtils.isNotEmpty(rxxLevel)) + { + if ("1".equals(leftRight)) + { + condition=condition.and("rxxLeftLevel", rxxLevel, MongoOper.IS); + } + else + { + condition=condition.and("rxxRightLevel", rxxLevel, MongoOper.IS); + } + } + } if(StringUtils.isNotEmpty(provinceId)){ condition=condition.and("provinceId", provinceId, MongoOper.IS); 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 8258ba4..968350a 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 @@ -97,6 +97,9 @@ public class CancerScreeningFacade { query.setCreatedEnd(new Date(DateUtil.parseYMD(arrs[1]).getTime() + 24 * 60 * 60 * 1000 - 1)); } + query.setLeftRight(queryRequest.getLeftRight()); + query.setRxcsLevel(queryRequest.getRxcsLevel()); + query.setRxxLevel(queryRequest.getRxxLevel()); query.setYcRxajc(queryRequest.getYcRxajc());//是否有过乳腺检查 sz ,cs ,xx query.setRxPgz(queryRequest.getRxPgz());//乳腺彩超分级左 "0" "1" .... query.setRxlPgy(queryRequest.getRxlPgy());//乳腺彩超分级右 @@ -121,6 +124,7 @@ public class CancerScreeningFacade { query.setRxXJc(queryRequest.getRxXJc()); //最后诊断 内容字段 yn(0未见异常,1异常);yc(异常项1-9) query.setZhJd(queryRequest.getZhJd()); + query.setZhzd(queryRequest.getZhzd()); List list = new ArrayList(); //System.out.println(query.convertToQuery().convertToMongoQuery()); List modelList = cancerScreenService.queryCancerScreList(query); @@ -140,25 +144,61 @@ public class CancerScreeningFacade { map.put("sfZzjg", model.getSfZzjg());//检査机构 + String rxcsLevel = ""; + if (StringUtils.isNotEmpty(model.getRxcsLeftLevel())) + { + rxcsLevel+="左乳:"+(Integer.parseInt(model.getRxcsLeftLevel())-1)+"级 "; + } + if (StringUtils.isNotEmpty(model.getRxcsRightLevel())) + { + rxcsLevel+="右乳:"+(Integer.parseInt(model.getRxcsRightLevel())-1)+"级 "; + } + map.put("rxcsLevel",rxcsLevel);//乳腺彩色超声检查等级 + + String rxxtLevel = ""; + if (StringUtils.isNotEmpty(model.getRxxLeftLevel())) + { + rxxtLevel+="左乳:"+(Integer.parseInt(model.getRxxLeftLevel())-1)+"级 "; + } + if (StringUtils.isNotEmpty(model.getRxxRightLevel())) + { + rxxtLevel+="右乳:"+(Integer.parseInt(model.getRxxRightLevel())-1)+"级 "; + } + map.put("rxxtLevel", rxxtLevel);//乳腺X检查等级 + map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期 map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null)); map.put("newRxCssj",LhUltrasoundContent.getName(StringUtils.isNotEmpty(model.getNewRxCssj())?model.getNewRxCssj():null));//超声所见 map.put("rxXJc",LhBreastXRayContent.getName(StringUtils.isNotEmpty(model.getRxXJc())?model.getRxXJc():null));//隆化乳腺X钼靶检查 //最后诊断 展示用到enum(LhEndDiagnosisContent) StringBuilder zhJd=new StringBuilder(); - if(model.getZhJd()!=null&&model.getZhJd().size()>0){ - if(model.getZhJd().get("yn").toString().equals("0")){ - zhJd.append("未见异常"); - }else { - for (String yc : (List) model.getZhJd().get("yc")) { - if(yc.equals("9")){//qt(其他注明); - zhJd.append(LhEndDiagnosisContent.getName(yc)+":"+model.getZhJd().get("qt")); - continue; + if ("2100001605".equals(hospitalId)) + { + if(model.getZhJd()!=null&&model.getZhJd().size()>0){ + if(model.getZhJd().get("yn").toString().equals("0")){ + zhJd.append("未见异常"); + }else { + for (String yc : (List) model.getZhJd().get("yc")) { + if(yc.equals("9")){//qt(其他注明); + zhJd.append(LhEndDiagnosisContent.getName(yc)+":"+model.getZhJd().get("qt")); + continue; + } + zhJd.append(LhEndDiagnosisContent.getName(yc)+","); } - zhJd.append(LhEndDiagnosisContent.getName(yc)+","); } } } + else + { + if(model.getSfZhzd()!=null&&model.getSfZhzd().size()>0) { + if (model.getSfZhzd().get("yn").toString().equals("0")) { + zhJd.append("未见异常"); + } else { + zhJd.append("异常"); + } + } + } + map.put("zhJd",zhJd); list.add(map); 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 c9118b8..8b8d888 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 @@ -52,6 +52,7 @@ public class CancerScreeningRequest extends BasePageQueryRequest { //最终诊断结果 1未见异常 2良性疾病 3不典型增生 4原位癌 5导管内乳头状癌 6微小浸润癌 7浸润癌 8其他恶性肿瘤 private String sfZhzd; + /** * 隆化-乳腺癌检查异常 */ @@ -67,6 +68,48 @@ public class CancerScreeningRequest extends BasePageQueryRequest { //隆化乳腺X钼靶检查内容,展示用到enum(LhBreastXRayContent) private String rxXJc; + //1 左边 2 右边 + private String leftRight; + + //乳腺彩色超声检查 + private String rxcsLevel; + //乳腺X检查 + private String rxxLevel; + //最后诊断 0 未见异常 1 异常 + private String zhzd; + + public String getZhzd() { + return zhzd; + } + + public void setZhzd(String zhzd) { + this.zhzd = zhzd; + } + + public String getLeftRight() { + return leftRight; + } + + public void setLeftRight(String leftRight) { + this.leftRight = leftRight; + } + + public String getRxcsLevel() { + return rxcsLevel; + } + + public void setRxcsLevel(String rxcsLevel) { + this.rxcsLevel = rxcsLevel; + } + + public String getRxxLevel() { + return rxxLevel; + } + + public void setRxxLevel(String rxxLevel) { + this.rxxLevel = rxxLevel; + } + public String getRxXJc() { return rxXJc; }