From f65046ee0d126a8622ab4fe420924be90c1f8d37 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 12 Apr 2018 18:00:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=A6=87=E5=B9=BC=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=9A=90=E8=97=8F=E5=A7=93=E5=90=8D=E3=80=81=E5=B1=85?= =?UTF-8?q?=E4=BD=8F=E5=9C=B0=E5=9D=80=E3=80=81=E6=88=B7=E7=B1=8D=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/MatDeliverController.java | 16 ++++++++++++++-- .../platform/operate/web/facade/AntExRecordFacade.java | 7 +++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 2 +- .../lyms/platform/operate/web/facade/PatientFacade.java | 2 +- .../operate/web/request/AntExManagerQueryRequest.java | 11 +++++++++++ .../platform/operate/web/request/BabyManageRequest.java | 11 +++++++++++ .../operate/web/request/ChildbirthManagerRequest.java | 11 +++++++++++ .../operate/web/request/RiskPatientsQueryRequest.java | 11 +++++++++++ 8 files changed, 67 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index 2b79dbe..21a91a9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.ExcelUtil; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.MatDeliverFacade; import com.lyms.platform.operate.web.request.ChildbirthManagerRequest; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; @@ -42,6 +43,8 @@ public class MatDeliverController extends BaseController{ @Autowired private CouponService couponService; + @Autowired + private AutoMatchFacade autoMatchFacade; /** * 查询分娩记录 @@ -126,10 +129,11 @@ public class MatDeliverController extends BaseController{ @ResponseBody @RequestMapping(value = "childbirthManager", method = RequestMethod.POST) public BaseListResponse childbirthManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) { + BaseListResponse baseListResponse; + childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); + String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); try { - childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); - Map query; if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { // 自定义查询 @@ -166,6 +170,14 @@ public class MatDeliverController extends BaseController{ List objectList = new ArrayList<>(); if (childbirthManagerResult.getData() != null) { for (Object temp : childbirthManagerResult.getData()) { + if("216".equals(hospitalId)&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址 + if(temp instanceof ChildbirthManagerQueryModel){ + ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp; + result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName())); + result.setAddress(com.lyms.platform.common.utils.StringUtils.encryAddr(result.getAddress())); + } + } + for (String key : query.keySet()) { query.put(key, BeanUtils.objectToStringMap(temp).get(key)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index cae75e5..e4c71c9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -321,6 +321,13 @@ public class AntExRecordFacade { } } } + + if("216".equals(hospital)&&antExManagerQueryRequest.getShowDetail()==1){//需要隐藏姓名、地址 + for (AntExManagerResult result:data){ + result.setName(StringUtils.encryName(result.getName())); + result.setAddr(StringUtils.encryAddr(result.getAddr())); + } + } return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index eca3c86..064b7d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2030,7 +2030,7 @@ public class BabyBookbuildingFacade { } } } - if("216".equals(hospitalId)){ + if("216".equals(hospitalId)&&request.getShowDetail()==1){//隐藏姓名、地址 for(BabyManageListResult result:list){ result.setBabyName(StringUtils.encryName(result.getBabyName())); result.setCompleteAddress(StringUtils.encryAddr(result.getCompleteAddress())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 2858ede..59b9b0c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -625,7 +625,7 @@ public class PatientFacade { data = convertToQuanCPatient(patientses, userId, hospital); } } - if ("216".equals(hospital)) {//隐藏 + if ("216".equals(hospital)&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 for (Object result : data) { if (result instanceof RiskPatientsResult) { RiskPatientsResult riskResult = (RiskPatientsResult) result; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index e028ad4..19b5e3b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -75,8 +75,19 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { //查询号 private String queryNo; + //1-需要隐藏姓名、电话、地址 + private int showDetail; + private Integer first; // 1否 2 是，是否当前医院第一次初诊 德州需求 + public int getShowDetail() { + return showDetail; + } + + public void setShowDetail(int showDetail) { + this.showDetail = showDetail; + } + public Integer getFirst() { return first; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 4aef786..41d904b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -86,6 +86,17 @@ public class BabyManageRequest extends BaseQuery { //查询号 private String queryNo; + //1-需要隐藏姓名、电话、地址 + private int showDetail; + + public int getShowDetail() { + return showDetail; + } + + public void setShowDetail(int showDetail) { + this.showDetail = showDetail; + } + public String getBuildDoctor() { return buildDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 83c3aac..7d9b963 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -162,6 +162,17 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { */ private String initQuery; + //1-需要隐藏姓名、电话、地址 + private int showDetail; + + public int getShowDetail() { + return showDetail; + } + + public void setShowDetail(int showDetail) { + this.showDetail = showDetail; + } + public Integer getHloseBloodType() { return hloseBloodType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index a4481aa..c2be7ee 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -153,6 +153,9 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //排序的策略 升序/降序 private String order; + //1-需要隐藏姓名、电话、地址 + private int showDetail; + /** * 排序策略枚举 */ @@ -231,6 +234,14 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { return OrderEnum.valueOfOrder(order); } + public int getShowDetail() { + return showDetail; + } + + public void setShowDetail(int showDetail) { + this.showDetail = showDetail; + } + public void setOrder(String order) { this.order = order; } -- 1.8.3.1