From 81455160263133c7875a212a6c6531fea5ba6b5f Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Wed, 19 Jun 2019 11:38:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BF=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/master/MasterOrganizationMapper.java | 2 ++ .../permission/service/OrganizationService.java | 2 ++ .../service/impl/OrganizationServiceImpl.java | 5 +++++ .../mainOrm/master/MasterOrganization.xml | 15 +++++++++++++ .../operate/web/facade/BookbuildingFacade.java | 9 +++----- .../operate/web/facade/MatDeliverFacade.java | 3 ++- .../operate/web/facade/PatientServiceFacade.java | 25 ++++++++++++++-------- 7 files changed, 45 insertions(+), 16 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java index 1159a9e..4be1385 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterOrganizationMapper.java @@ -40,4 +40,6 @@ public interface MasterOrganizationMapper { * @return */ List> findIdByTownOrgId(@Param("townOrgId") String townOrgId); + + List getOrganizationByHosps(@Param("hospPermissions") List hospPermissions); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java index f45f25f..03c651b 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java @@ -45,4 +45,6 @@ public interface OrganizationService { public String getOrganizationName(String id); List> findIdByTownOrgId(String townOrgId); + + List getOrganizationByHosps(List hospPermissions); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index 1b26a8e..4895016 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -308,4 +308,9 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O return masterOrganizationMapper.findIdByTownOrgId(townOrgId); } + @Override + public List getOrganizationByHosps(List hospPermissions) { + return masterOrganizationMapper.getOrganizationByHosps(hospPermissions); + } + } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml index e87f592..7c865ca 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterOrganization.xml @@ -275,5 +275,20 @@ select id,name,type,level,area_manage,province_id,city_id,area_id,address,descri select o.id as "id" from organization o where o.townOrgId = #{townOrgId} + + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 8684981..d803c86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -65,10 +65,7 @@ import java.sql.*; import java.text.SimpleDateFormat; import java.util.*; import java.util.Date; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicLong; import java.util.regex.Pattern; @@ -2448,8 +2445,8 @@ public class BookbuildingFacade { */ public BaseResponse batchUpdateLymsPatient(HttpServletRequest request) { - List patients = mongoTemplate.find(Query.query(Criteria.where("fmDate").exists(false).and("yn").is(1)), Patients.class); - ExecutorService service = Executors.newFixedThreadPool(5); + List patients = mongoTemplate.find(Query.query(Criteria.where("townOrgId").exists(true).and("yn").is(1)), Patients.class); + ExecutorService service = new ThreadPoolExecutor(5, 5, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue()); for (Patients patient : patients) { /* if ("18328353220".equals(patient.getCardNo())) { System.out.println(patient); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 4704820..00a28cf3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1863,7 +1863,8 @@ public class MatDeliverFacade { // } // } - matDeliverQuery.setFmHospitalList(hospitalList); + // 访视列表无需加上分娩医院，因此注释 + //matDeliverQuery.setFmHospitalList(hospitalList); matDeliverQuery.setFsHospital(hospitalId); if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 17888d2..c197666 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -79,6 +79,9 @@ public class PatientServiceFacade { @Autowired private AssistBuildService assistBuildService; + @Autowired + private AreaCountFacade areaCountFacade; + public BaseResponse babyServiceInit(Integer userId) { Map map = new HashMap(); //服务类型 @@ -197,18 +200,22 @@ public class PatientServiceFacade { List towns = new ArrayList<>(); //所有数据 由原来的baseConfing ==> Organization - OrganizationQuery organizationQuery = new OrganizationQuery(); - List organizations = organizationService.queryOrganization(organizationQuery); - - if (CollectionUtils.isNotEmpty(organizations)) { - for (Organization model : organizations) { - Map data = new HashMap(); - data.put("id", model.getId()); - data.put("name", model.getName()); - towns.add(data); + List hospPermissions = areaCountFacade.getCurrentUserHospPermissions(id, null, null, null); + if (CollectionUtils.isNotEmpty(hospPermissions)) { + List organizations = organizationService.getOrganizationByHosps(hospPermissions); + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization model : organizations) { + Map data = new HashMap(); + data.put("id", model.getId()); + data.put("name", model.getName()); + towns.add(data); + } } } + + + map.put("towns", towns); // 居住类别 -- 1.8.3.1