From a82fd87ce73f1f163b7f817ac72521750d6f3673 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 12 Sep 2018 15:03:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C=E7=AD=9B=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/query/CancerScreeningQuery.java | 3 --- .../lyms/platform/operate/web/facade/CancerScreeningFacade.java | 8 +++++++- 2 files changed, 7 insertions(+), 4 deletions(-) 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 009195f..0ccad84 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 @@ -92,9 +92,6 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ if(null != streetId){ condition=condition.and("streetId", streetId, MongoOper.IS); } - if(null != queryNo){ - condition=condition.and("queryNo", queryNo, MongoOper.IS); - } if(null != hospitalId){ condition=condition.and("hospitalId", hospitalId, 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 ef42260..fad809d 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 @@ -94,7 +94,11 @@ public class CancerScreeningFacade { map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("sfZhzd",model.getSfZhzd()); map.put("sfJcry",model.getSfJcry() == null ? "" : model.getSfJcry()); - map.put("yxyj",""); + + map.put("sfZzjg",model.getSfZzjg());//检査机构 + + map.put("sfJcsj",DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期 + list.add(map); } } @@ -234,6 +238,8 @@ public class CancerScreeningFacade { result.put("userName",model.getUsername()); + result.put("cardNo",model.getCertificateNum()); + if (model.getBirthday() != null) { result.put("age", com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model.getBirthday(), new Date()).toString(), UnitConstants.SUI)); } -- 1.8.3.1