jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9719c7dfa8de36306f8d574799176547f7d224fe

Authored by yangfei
1 parent 68c849a7fa
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

秦皇岛市隐藏区域部分信息

Showing 5 changed files with 17 additions and 6 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 9719c7d
... ... @@ -19,7 +19,9 @@
19 19 import com.lyms.platform.operate.web.result.ChildbirthManagerResult;
20 20 import com.lyms.platform.operate.web.result.NewBabyManagerQueryModel;
21 21 import com.lyms.platform.operate.web.result.NewBabyManagerResult;
  22 +import com.lyms.platform.permission.model.Organization;
22 23 import com.lyms.platform.permission.service.CouponService;
  24 +import com.lyms.platform.permission.service.OrganizationService;
23 25 import org.apache.commons.lang.StringUtils;
24 26 import org.springframework.beans.factory.annotation.Autowired;
25 27 import org.springframework.stereotype.Controller;
... ... @@ -45,6 +47,8 @@
45 47 private CouponService couponService;
46 48 @Autowired
47 49 private AutoMatchFacade autoMatchFacade;
  50 + @Autowired
  51 + private OrganizationService organizationService;
48 52  
49 53 /**
50 54 * 查询分娩记录
... ... @@ -170,7 +174,9 @@
170 174 List<Object> objectList = new ArrayList<>();
171 175 if (childbirthManagerResult.getData() != null) {
172 176 for (Object temp : childbirthManagerResult.getData()) {
173   - if("216".equals(hospitalId)&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址
  177 + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId));
  178 +
  179 + if(og!=null&&"2".equals(og.getCityId())&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址
174 180 if(temp instanceof ChildbirthManagerQueryModel){
175 181 ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp;
176 182 result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 9719c7d
... ... @@ -54,8 +54,6 @@
54 54 @Autowired
55 55 private OperateLogFacade operateLogFacade;
56 56  
57   -
58   -
59 57 /**
60 58 * 删除机构
61 59 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 9719c7d
... ... @@ -321,8 +321,9 @@
321 321 }
322 322 }
323 323 }
  324 + Organization og = organizationService.getOrganization(Integer.valueOf(hospital));
324 325  
325   - if("216".equals(hospital)&&antExManagerQueryRequest.getShowDetail()==1){//需要隐藏姓名、地址
  326 + if(og!=null&&"2".equals(og.getCityId())&&antExManagerQueryRequest.getShowDetail()==1){//需要隐藏姓名、地址
326 327 for (AntExManagerResult result:data){
327 328 result.setName(StringUtils.encryName(result.getName()));
328 329 result.setAddr(StringUtils.encryAddr(result.getAddr()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 9719c7d
... ... @@ -2030,7 +2030,10 @@
2030 2030 }
2031 2031 }
2032 2032 }
2033   - if("216".equals(hospitalId)&&request.getShowDetail()==1){//隐藏姓名、地址
  2033 +
  2034 + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId));
  2035 +
  2036 + if(og!=null&&"2".equals(og.getCityId())&&request.getShowDetail()==1){//隐藏姓名、地址
2034 2037 for(BabyManageListResult result:list){
2035 2038 result.setBabyName(StringUtils.encryName(result.getBabyName()));
2036 2039 result.setCompleteAddress(StringUtils.encryAddr(result.getCompleteAddress()));
... ... @@ -2043,6 +2046,7 @@
2043 2046 objectResponse.setErrormsg("成功");
2044 2047 return objectResponse;
2045 2048 }
  2049 +
2046 2050  
2047 2051  
2048 2052 private List<BabyModel> getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 9719c7d
... ... @@ -625,7 +625,9 @@
625 625 data = convertToQuanCPatient(patientses, userId, hospital);
626 626 }
627 627 }
628   - if ("216".equals(hospital)&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址
  628 + Organization og = organizationService.getOrganization(Integer.valueOf(hospital));
  629 +
  630 + if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址
629 631 for (Object result : data) {
630 632 if (result instanceof RiskPatientsResult) {
631 633 RiskPatientsResult riskResult = (RiskPatientsResult) result;