From 5de8beffc62e39a7055cd6b35393aa3e3a3c0816 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Wed, 28 Dec 2016 10:14:19 +0800 Subject: [PATCH] update --- .../operate/web/controller/PremaritalCheckupController.java | 3 ++- .../platform/operate/web/facade/PremaritalCheckupFacade.java | 6 +++++- .../lyms/platform/operate/web/facade/ResidentsArchiveFacade.java | 9 +++------ .../com/lyms/platform/operate/web/facade/ResidentsFacade.java | 9 +++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java index 2450254..ad5525c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java @@ -66,6 +66,7 @@ public class PremaritalCheckupController extends BaseController{ @RequestParam(value = "id",required = false)String id, HttpServletRequest request) { //获取当前登录用户ID + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); PremaritalCheckupQueryRequest param = new PremaritalCheckupQueryRequest(); param.setHospitalId(hospitalId); if (StringUtils.isNotEmpty(id)){ @@ -74,7 +75,7 @@ public class PremaritalCheckupController extends BaseController{ param.setVcCardNo(vcCardNo); param.setCardNo(certificateNum); } - return premaritalCheckupFacade.getPremaritalCheckup(param); + return premaritalCheckupFacade.getPremaritalCheckup(param,loginState.getId()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index e97a9f7..a95e546 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -59,7 +59,11 @@ public class PremaritalCheckupFacade { * @param requestParam * @return */ - public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam) { + public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer userId) { + + String hospitalId = autoMatchFacade.getHospitalId(userId); + + requestParam.setHospitalId(hospitalId); PremaritalCheckup result = null; ResidentsArchiveModel archiveModel = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 00ac584..6928c98 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -9,10 +9,7 @@ import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExcelUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult; @@ -545,7 +542,7 @@ public class ResidentsArchiveFacade{ Map map = new HashMap<>(); map.put("id",model.getId()); map.put("username",model.getUsername()); - map.put("certificateNum",model.getCertificateNum()); + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum())); map.put("age",DateUtil.getAge(model.getBirthday())); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); @@ -623,7 +620,7 @@ public class ResidentsArchiveFacade{ map.put("nationId",FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService)); map.put("marriageId",FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(), basicConfigService)); map.put("certificateTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(), basicConfigService)); - map.put("certificateNum",data.getCertificateNum()); + map.put("certificateNum",DefenceUtils.getId(data.getCertificateNum())); map.put("censusTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(), basicConfigService)); map.put("liveTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(), basicConfigService)); map.put("levelTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(), basicConfigService)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index 475a1f9..ebc4587 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -6,10 +6,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExcelUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; @@ -177,7 +174,7 @@ public class ResidentsFacade { for (ResidentsArchiveModel model : modelList){ Map map = new HashMap<>(); map.put("username",model.getUsername()); - map.put("certificateNum",model.getCertificateNum()); + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum())); map.put("age",DateUtil.getAge(model.getBirthday())); map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityId(), model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService)); @@ -363,7 +360,7 @@ public class ResidentsFacade { map.put("nationId",FunvCommonUtil.getBaseicConfigByid(data.getNationId(),basicConfigService)); map.put("marriageId",FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(),basicConfigService)); map.put("certificateTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(),basicConfigService)); - map.put("certificateNum",data.getCertificateNum()); + map.put("certificateNum",DefenceUtils.getId(data.getCertificateNum())); map.put("censusTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(),basicConfigService)); map.put("liveTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(),basicConfigService)); map.put("levelTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(),basicConfigService)); -- 1.8.3.1