From 2e92298759430eec5cce0d3de62c7158f62fde31 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 13 Dec 2018 11:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E5=BB=BA=E6=A1=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=85=8D=E5=81=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/ResidentsArchiveModel.java | 48 +++++++++++++++++++ .../web/controller/ResidentsArchiveController.java | 18 ++++++- .../operate/web/facade/ResidentsArchiveFacade.java | 35 +++++++++++++- .../web/request/ResidentsArchiveAddRequest.java | 55 ++++++++++++++++++++++ .../operate/web/result/ResidentsArchiveResult.java | 47 ++++++++++++++++++ 5 files changed, 200 insertions(+), 3 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 2c3def0..2b9ed66 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -83,6 +83,22 @@ public class ResidentsArchiveModel extends BaseModel{ /************院内信息*************/ + + /************配偶信息*************/ + + //配偶姓名 + private String spouseName; + //配偶证件号 + private String spouseCardNo; + //配偶手机 + private String spousePhone; + + //配偶证件类型Id + private String spouseCertTypeId; + + + /************配偶信息*************/ + //就诊卡号 private String vcCardNo; //建档人 @@ -105,6 +121,38 @@ public class ResidentsArchiveModel extends BaseModel{ private String publishName; + public String getSpouseName() { + return spouseName; + } + + public void setSpouseName(String spouseName) { + this.spouseName = spouseName; + } + + public String getSpouseCardNo() { + return spouseCardNo; + } + + public void setSpouseCardNo(String spouseCardNo) { + this.spouseCardNo = spouseCardNo; + } + + public String getSpousePhone() { + return spousePhone; + } + + public void setSpousePhone(String spousePhone) { + this.spousePhone = spousePhone; + } + + public String getSpouseCertTypeId() { + return spouseCertTypeId; + } + + public void setSpouseCertTypeId(String spouseCertTypeId) { + this.spouseCertTypeId = spouseCertTypeId; + } + public Integer getAge() { return age; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index a6c9603..7046f89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -76,7 +76,7 @@ public class ResidentsArchiveController extends BaseController { queryRequest.setVcCardNo(vcCardNo); //获取当前登录用户ID LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return residentsArchiveFacade.findResidentsArchive(queryRequest,loginState.getId()); + return residentsArchiveFacade.findResidentsArchive(queryRequest, loginState.getId()); } @@ -100,6 +100,22 @@ public class ResidentsArchiveController extends BaseController { } /** + * 查询配偶信息 + * @param name + * @param request + * @return + */ + @RequestMapping(value = "/querySpouseInfoByName", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse querySpouseInfoByName(@RequestParam("name")String name,@RequestParam("sexId")String sexId,HttpServletRequest request){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseObjectResponse objectResponse = residentsArchiveFacade.querySpouseInfoByName(name,sexId, loginState.getId()); + return objectResponse; + } + + + /** * 通过ID查询居民健康档案详情 * @param id * @return 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 e555b75..e1681fd 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 @@ -504,8 +504,8 @@ public class ResidentsArchiveFacade{ } } Map map = new HashMap<>(); - map.put("ResidentsArchiveResult",result); - map.put("historyResult",historyResults); + map.put("ResidentsArchiveResult", result); + map.put("historyResult", historyResults); objectResponse.setData(map); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); objectResponse.setErrormsg("成功"); @@ -533,6 +533,12 @@ public class ResidentsArchiveFacade{ result.setProfessionTypeId(model.getProfessionTypeId()); result.setHospitalId(model.getHospitalId()); + + result.setSpouseName(model.getSpouseName()); + result.setSpouseCardNo(model.getSpouseCardNo()); + result.setSpousePhone(model.getSpousePhone()); + result.setSpouseCertTypeId(model.getSpouseCertTypeId()); + result.setPhone(model.getPhone()); result.setWorkUnit(model.getWorkUnit()); result.setProvinceId(model.getProvinceId()); @@ -901,4 +907,29 @@ public class ResidentsArchiveFacade{ } + public BaseObjectResponse querySpouseInfoByName(String name,String sexId, Integer userId) { + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setYn(YnEnums.YES.getId()); + String hospital = autoMatchFacade.getHospitalId(userId); + archiveQuery.setSex(sexId); + archiveQuery.setHospitalId(hospital); + archiveQuery.setQueryNo(name); + List archiveModelList = residentsArchiveService.queryResident(archiveQuery); + + List list = new ArrayList<>(); + + if (CollectionUtils.isNotEmpty(archiveModelList)) + { + for (ResidentsArchiveModel model : archiveModelList) + { + Map map = new HashMap(); + map.put("name",model.getUsername()); + map.put("phone",model.getPhone()); + map.put("certTypeId",model.getCensusTypeId()); + map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getCertificateNum())); + list.add(map); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index f5ed1bf..e44d91a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java @@ -56,6 +56,22 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert