From 9719c7dfa8de36306f8d574799176547f7d224fe Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 16 Apr 2018 22:13:13 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=B8=82=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E5=8C=BA=E5=9F=9F=E9=83=A8=E5=88=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/controller/MatDeliverController.java | 8 +++++++- .../platform/operate/web/controller/OrganizationController.java | 2 -- .../com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 3 ++- .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 6 +++++- .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 4 +++- 5 files changed, 17 insertions(+), 6 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 21a91a9..428568c 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 @@ -19,7 +19,9 @@ import com.lyms.platform.operate.web.result.ChildbirthManagerQueryModel; import com.lyms.platform.operate.web.result.ChildbirthManagerResult; import com.lyms.platform.operate.web.result.NewBabyManagerQueryModel; import com.lyms.platform.operate.web.result.NewBabyManagerResult; +import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.permission.service.OrganizationService; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -45,6 +47,8 @@ public class MatDeliverController extends BaseController{ private CouponService couponService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private OrganizationService organizationService; /** * 查询分娩记录 @@ -170,7 +174,9 @@ 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){//需要隐藏姓名、地址 + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + + if(og!=null&&"2".equals(og.getCityId())&&childbirthManagerRequest.getShowDetail()==1){//需要隐藏姓名、地址 if(temp instanceof ChildbirthManagerQueryModel){ ChildbirthManagerQueryModel result = (ChildbirthManagerQueryModel) temp; result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index f888f2b..e86b5d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -54,8 +54,6 @@ public class OrganizationController extends BaseController { @Autowired private OperateLogFacade operateLogFacade; - - /** * 删除机构 */ 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 e4c71c9..834b7ff 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,8 +321,9 @@ public class AntExRecordFacade { } } } + Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); - if("216".equals(hospital)&&antExManagerQueryRequest.getShowDetail()==1){//需要隐藏姓名、地址 + if(og!=null&&"2".equals(og.getCityId())&&antExManagerQueryRequest.getShowDetail()==1){//需要隐藏姓名、地址 for (AntExManagerResult result:data){ result.setName(StringUtils.encryName(result.getName())); result.setAddr(StringUtils.encryAddr(result.getAddr())); 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 064b7d4..bd65631 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,10 @@ public class BabyBookbuildingFacade { } } } - if("216".equals(hospitalId)&&request.getShowDetail()==1){//隐藏姓名、地址 + + Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId)); + + if(og!=null&&"2".equals(og.getCityId())&&request.getShowDetail()==1){//隐藏姓名、地址 for(BabyManageListResult result:list){ result.setBabyName(StringUtils.encryName(result.getBabyName())); result.setCompleteAddress(StringUtils.encryAddr(result.getCompleteAddress())); @@ -2045,6 +2048,7 @@ public class BabyBookbuildingFacade { } + private List getBabayListByCondition(BabyManageRequest request, boolean isPage, BabyModelQuery babyQuery) { 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 59b9b0c..255e59b 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,9 @@ public class PatientFacade { data = convertToQuanCPatient(patientses, userId, hospital); } } - if ("216".equals(hospital)&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 + Organization og = organizationService.getOrganization(Integer.valueOf(hospital)); + + if(og!=null&&"2".equals(og.getCityId())&&riskPatientsQueryRequest.getShowDetail()==1) {//隐藏姓名、地址 for (Object result : data) { if (result instanceof RiskPatientsResult) { RiskPatientsResult riskResult = (RiskPatientsResult) result; -- 1.8.3.1