shiyang / regional-platform

Download as
Browse Code »

Commit 5de8beffc62e39a7055cd6b35393aa3e3a3c0816

Authored by landong2015
1 parent 0b46f49cc3
Exists in master

update

Showing 4 changed files with 13 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ 5de8bef
... ... @@ -66,6 +66,7 @@
66 66 @RequestParam(value = "id",required = false)String id,
67 67 HttpServletRequest request) {
68 68 //获取当前登录用户ID
  69 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
69 70 PremaritalCheckupQueryRequest param = new PremaritalCheckupQueryRequest();
70 71 param.setHospitalId(hospitalId);
71 72 if (StringUtils.isNotEmpty(id)){
... ... @@ -74,7 +75,7 @@
74 75 param.setVcCardNo(vcCardNo);
75 76 param.setCardNo(certificateNum);
76 77 }
77   - return premaritalCheckupFacade.getPremaritalCheckup(param);
  78 + return premaritalCheckupFacade.getPremaritalCheckup(param,loginState.getId());
78 79 }
79 80  
80 81 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 5de8bef
... ... @@ -59,7 +59,11 @@
59 59 * @param requestParam
60 60 * @return
61 61 */
62   - public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam) {
  62 + public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer userId) {
  63 +
  64 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  65 +
  66 + requestParam.setHospitalId(hospitalId);
63 67  
64 68 PremaritalCheckup result = null;
65 69 ResidentsArchiveModel archiveModel = null;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 5de8bef
... ... @@ -9,10 +9,7 @@
9 9 import com.lyms.platform.common.result.BaseListResponse;
10 10 import com.lyms.platform.common.result.BaseObjectResponse;
11 11 import com.lyms.platform.common.result.BaseResponse;
12   -import com.lyms.platform.common.utils.DateUtil;
13   -import com.lyms.platform.common.utils.ExcelUtil;
14   -import com.lyms.platform.common.utils.JsonUtil;
15   -import com.lyms.platform.common.utils.SystemConfig;
  12 +import com.lyms.platform.common.utils.*;
16 13 import com.lyms.platform.operate.web.request.*;
17 14 import com.lyms.platform.operate.web.result.BasicConfigResult;
18 15 import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult;
... ... @@ -545,7 +542,7 @@
545 542 Map<String,Object> map = new HashMap<>();
546 543 map.put("id",model.getId());
547 544 map.put("username",model.getUsername());
548   - map.put("certificateNum",model.getCertificateNum());
  545 + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
549 546 map.put("age",DateUtil.getAge(model.getBirthday()));
550 547 map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
551 548 map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId()));
... ... @@ -623,7 +620,7 @@
623 620 map.put("nationId",FunvCommonUtil.getBaseicConfigByid(data.getNationId(), basicConfigService));
624 621 map.put("marriageId",FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(), basicConfigService));
625 622 map.put("certificateTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(), basicConfigService));
626   - map.put("certificateNum",data.getCertificateNum());
  623 + map.put("certificateNum",DefenceUtils.getId(data.getCertificateNum()));
627 624 map.put("censusTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(), basicConfigService));
628 625 map.put("liveTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(), basicConfigService));
629 626 map.put("levelTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java View file @ 5de8bef
... ... @@ -6,10 +6,7 @@
6 6 import com.lyms.platform.common.result.BaseListResponse;
7 7 import com.lyms.platform.common.result.BaseObjectResponse;
8 8 import com.lyms.platform.common.result.BaseResponse;
9   -import com.lyms.platform.common.utils.DateUtil;
10   -import com.lyms.platform.common.utils.ExcelUtil;
11   -import com.lyms.platform.common.utils.JsonUtil;
12   -import com.lyms.platform.common.utils.SystemConfig;
  9 +import com.lyms.platform.common.utils.*;
13 10 import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest;
14 11 import com.lyms.platform.operate.web.utils.CommonsHelper;
15 12 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
... ... @@ -177,7 +174,7 @@
177 174 for (ResidentsArchiveModel model : modelList){
178 175 Map<String,Object> map = new HashMap<>();
179 176 map.put("username",model.getUsername());
180   - map.put("certificateNum",model.getCertificateNum());
  177 + map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
181 178 map.put("age",DateUtil.getAge(model.getBirthday()));
182 179 map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityId(),
183 180 model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService));
... ... @@ -363,7 +360,7 @@
363 360 map.put("nationId",FunvCommonUtil.getBaseicConfigByid(data.getNationId(),basicConfigService));
364 361 map.put("marriageId",FunvCommonUtil.getBaseicConfigByid(data.getMarriageId(),basicConfigService));
365 362 map.put("certificateTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCertificateTypeId(),basicConfigService));
366   - map.put("certificateNum",data.getCertificateNum());
  363 + map.put("certificateNum",DefenceUtils.getId(data.getCertificateNum()));
367 364 map.put("censusTypeId",FunvCommonUtil.getBaseicConfigByid(data.getCensusTypeId(),basicConfigService));
368 365 map.put("liveTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLiveTypeId(),basicConfigService));
369 366 map.put("levelTypeId",FunvCommonUtil.getBaseicConfigByid(data.getLevelTypeId(),basicConfigService));