Commit f65046ee0d126a8622ab4fe420924be90c1f8d37
1 parent
272715c04b
Exists in
master
and in
6 other branches
区域妇幼管理隐藏姓名、居住地址、户籍地址
Showing 8 changed files with 67 additions and 4 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
f65046e
| ... | ... | @@ -9,6 +9,7 @@ |
| 9 | 9 | import com.lyms.platform.common.utils.BeanUtils; |
| 10 | 10 | import com.lyms.platform.common.utils.ExcelUtil; |
| 11 | 11 | import com.lyms.platform.common.utils.ExceptionUtils; |
| 12 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
| 12 | 13 | import com.lyms.platform.operate.web.facade.MatDeliverFacade; |
| 13 | 14 | import com.lyms.platform.operate.web.request.ChildbirthManagerRequest; |
| 14 | 15 | import com.lyms.platform.operate.web.request.MatDeliverAddRequest; |
| ... | ... | @@ -42,6 +43,8 @@ |
| 42 | 43 | |
| 43 | 44 | @Autowired |
| 44 | 45 | private CouponService couponService; |
| 46 | + @Autowired | |
| 47 | + private AutoMatchFacade autoMatchFacade; | |
| 45 | 48 | |
| 46 | 49 | /** |
| 47 | 50 | * 查询分娩记录 |
| 48 | 51 | |
| 49 | 52 | |
| ... | ... | @@ -126,10 +129,11 @@ |
| 126 | 129 | @ResponseBody |
| 127 | 130 | @RequestMapping(value = "childbirthManager", method = RequestMethod.POST) |
| 128 | 131 | public BaseListResponse childbirthManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) { |
| 132 | + | |
| 129 | 133 | BaseListResponse baseListResponse; |
| 134 | + childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); | |
| 135 | + String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); | |
| 130 | 136 | try { |
| 131 | - childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); | |
| 132 | - | |
| 133 | 137 | Map<String, String> query; |
| 134 | 138 | if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { |
| 135 | 139 | // 自定义查询 |
| ... | ... | @@ -166,6 +170,14 @@ |
| 166 | 170 | List<Object> objectList = new ArrayList<>(); |
| 167 | 171 | if (childbirthManagerResult.getData() != null) { |
| 168 | 172 | for (Object temp : childbirthManagerResult.getData()) { |
| 173 | + if("216".equals(hospitalId)&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址 | |
| 174 | + if(temp instanceof ChildbirthManagerQueryModel){ | |
| 175 | + ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp; | |
| 176 | + result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName())); | |
| 177 | + result.setAddress(com.lyms.platform.common.utils.StringUtils.encryAddr(result.getAddress())); | |
| 178 | + } | |
| 179 | + } | |
| 180 | + | |
| 169 | 181 | for (String key : query.keySet()) { |
| 170 | 182 | query.put(key, BeanUtils.objectToStringMap(temp).get(key)); |
| 171 | 183 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
f65046e
| ... | ... | @@ -321,6 +321,13 @@ |
| 321 | 321 | } |
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | + | |
| 325 | + if("216".equals(hospital)&&antExManagerQueryRequest.getShowDetail()==1){//需要隐藏姓名、地址 | |
| 326 | + for (AntExManagerResult result:data){ | |
| 327 | + result.setName(StringUtils.encryName(result.getName())); | |
| 328 | + result.setAddr(StringUtils.encryAddr(result.getAddr())); | |
| 329 | + } | |
| 330 | + } | |
| 324 | 331 | return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo()); |
| 325 | 332 | } |
| 326 | 333 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
f65046e
| ... | ... | @@ -2030,7 +2030,7 @@ |
| 2030 | 2030 | } |
| 2031 | 2031 | } |
| 2032 | 2032 | } |
| 2033 | - if("216".equals(hospitalId)){ | |
| 2033 | + if("216".equals(hospitalId)&&request.getShowDetail()==1){//隐藏姓名、地址 | |
| 2034 | 2034 | for(BabyManageListResult result:list){ |
| 2035 | 2035 | result.setBabyName(StringUtils.encryName(result.getBabyName())); |
| 2036 | 2036 | result.setCompleteAddress(StringUtils.encryAddr(result.getCompleteAddress())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
f65046e
| ... | ... | @@ -625,7 +625,7 @@ |
| 625 | 625 | data = convertToQuanCPatient(patientses, userId, hospital); |
| 626 | 626 | } |
| 627 | 627 | } |
| 628 | - if ("216".equals(hospital)) {//隐藏 | |
| 628 | + if ("216".equals(hospital)&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 | |
| 629 | 629 | for (Object result : data) { |
| 630 | 630 | if (result instanceof RiskPatientsResult) { |
| 631 | 631 | RiskPatientsResult riskResult = (RiskPatientsResult) result; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
View file @
f65046e
| ... | ... | @@ -75,7 +75,18 @@ |
| 75 | 75 | //查询号 |
| 76 | 76 | private String queryNo; |
| 77 | 77 | |
| 78 | + //1-需要隐藏姓名、电话、地址 | |
| 79 | + private int showDetail; | |
| 80 | + | |
| 78 | 81 | private Integer first; // 1否 2 是,是否当前医院第一次初诊 德州需求 |
| 82 | + | |
| 83 | + public int getShowDetail() { | |
| 84 | + return showDetail; | |
| 85 | + } | |
| 86 | + | |
| 87 | + public void setShowDetail(int showDetail) { | |
| 88 | + this.showDetail = showDetail; | |
| 89 | + } | |
| 79 | 90 | |
| 80 | 91 | public Integer getFirst() { |
| 81 | 92 | return first; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
View file @
f65046e
| ... | ... | @@ -86,6 +86,17 @@ |
| 86 | 86 | //查询号 |
| 87 | 87 | private String queryNo; |
| 88 | 88 | |
| 89 | + //1-需要隐藏姓名、电话、地址 | |
| 90 | + private int showDetail; | |
| 91 | + | |
| 92 | + public int getShowDetail() { | |
| 93 | + return showDetail; | |
| 94 | + } | |
| 95 | + | |
| 96 | + public void setShowDetail(int showDetail) { | |
| 97 | + this.showDetail = showDetail; | |
| 98 | + } | |
| 99 | + | |
| 89 | 100 | public String getBuildDoctor() { |
| 90 | 101 | return buildDoctor; |
| 91 | 102 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
View file @
f65046e
| ... | ... | @@ -162,6 +162,17 @@ |
| 162 | 162 | */ |
| 163 | 163 | private String initQuery; |
| 164 | 164 | |
| 165 | + //1-需要隐藏姓名、电话、地址 | |
| 166 | + private int showDetail; | |
| 167 | + | |
| 168 | + public int getShowDetail() { | |
| 169 | + return showDetail; | |
| 170 | + } | |
| 171 | + | |
| 172 | + public void setShowDetail(int showDetail) { | |
| 173 | + this.showDetail = showDetail; | |
| 174 | + } | |
| 175 | + | |
| 165 | 176 | public Integer getHloseBloodType() { |
| 166 | 177 | return hloseBloodType; |
| 167 | 178 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
View file @
f65046e
| ... | ... | @@ -153,6 +153,9 @@ |
| 153 | 153 | //排序的策略 升序/降序 |
| 154 | 154 | private String order; |
| 155 | 155 | |
| 156 | + //1-需要隐藏姓名、电话、地址 | |
| 157 | + private int showDetail; | |
| 158 | + | |
| 156 | 159 | /** |
| 157 | 160 | * 排序策略枚举 |
| 158 | 161 | */ |
| ... | ... | @@ -229,6 +232,14 @@ |
| 229 | 232 | } |
| 230 | 233 | } |
| 231 | 234 | return OrderEnum.valueOfOrder(order); |
| 235 | + } | |
| 236 | + | |
| 237 | + public int getShowDetail() { | |
| 238 | + return showDetail; | |
| 239 | + } | |
| 240 | + | |
| 241 | + public void setShowDetail(int showDetail) { | |
| 242 | + this.showDetail = showDetail; | |
| 232 | 243 | } |
| 233 | 244 | |
| 234 | 245 | public void setOrder(String order) { |