diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java new file mode 100644 index 0000000..83552ee --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/constant/OrganizationConstant.java @@ -0,0 +1,6 @@ +package com.lyms.platform.operate.web.constant; + +public class OrganizationConstant { + + public static final String XT_WX = "2100002421"; +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java index cd62f41..4de83b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.CommonResult; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.pojo.LisCrisisItem; import com.lyms.platform.pojo.LisCrisisNotify; @@ -250,6 +251,8 @@ public class LisCrisisItemController extends BaseController { patientses = patientsService.queryPatient1(patientsQuery, "modified"); } + Integer userId = getUserId(request); + String hospitalId = autoMatchFacade.getHospitalId(userId); LisCrisisItemQuery query = new LisCrisisItemQuery(); @@ -266,15 +269,15 @@ public class LisCrisisItemController extends BaseController { query.setStatus(status); query.setItemName(refer); query.setApplyDoctorName(doctor); + query.setHospitalId(hospitalId); - Integer userId = getUserId(request); - if (userId != null) - { - String hospitalId = autoMatchFacade.getHospitalId(userId); - query.setHospitalId(hospitalId); + //威县数据流转 + if(OrganizationConstant.XT_WX.equals(hospitalId)){ + query.setApplyDoctorCode(String.valueOf(userId)); } + if (CollectionUtils.isNotEmpty(patientses)) { List parentIds = new LinkedList<>(); for (Patients pa : patientses) { 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 e87c256..df7c784 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 @@ -14,6 +14,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.MatDeliverFacade; @@ -192,6 +193,12 @@ public class MatDeliverController extends BaseController { BaseListResponse baseListResponse; childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()); + + //威县数据流转 根据接诊医生查询 + if(OrganizationConstant.XT_WX.equals(hospitalId)){ + childbirthManagerRequest.setDeliverDoctor(String.valueOf(childbirthManagerRequest.getOperatorId())); + } + try { Map query; if (StringUtils.isNotEmpty(childbirthManagerRequest.getInitQuery())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 53ae8de..0e8a2bb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; @@ -667,6 +668,11 @@ public class PuerperaManageController extends BaseController { } patientManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); + + //威县数据流转 + if(OrganizationConstant.XT_WX.equals(String.valueOf(organization.getId()))){ + patientManagerRequest.setBookbuildingDoctor(String.valueOf(patientManagerRequest.getOperatorId())); + } // PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest); PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest); if (patientManagerResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { 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 fc24742..abcaac3 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.request.AntExAddRequest; import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; @@ -387,6 +388,7 @@ public class AntExRecordFacade { * @return */ public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage, boolean isCurrent) { + String hospitalId = autoMatchFacade.getHospitalId(userId); PatientsQuery patientsQuery = new PatientsQuery(); List patientses = null; if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) { @@ -394,7 +396,7 @@ public class AntExRecordFacade { patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified"); if (CollectionUtils.isEmpty(patientses)) { - String hospitalId = autoMatchFacade.getHospitalId(userId); + if ("1000000114".equals(hospitalId)) { List list = dzfyHisService.getDzVcCardNos(antExManagerQueryRequest.getQueryNo()); if (CollectionUtils.isNotEmpty(list)) { @@ -406,6 +408,11 @@ public class AntExRecordFacade { } } + //威县数据流转 + if(OrganizationConstant.XT_WX.equals(hospitalId)){ + antExManagerQueryRequest.setCheckDoctor(String.valueOf(userId)); + } + AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage); if (CollectionUtils.isNotEmpty(patientses)) { List parentIds = new LinkedList<>(); @@ -1211,6 +1218,11 @@ public class AntExRecordFacade { } } + //威县数据流转 + if(OrganizationConstant.XT_WX.equals(hospitalId)){ + antExRecordQuery.setcId(String.valueOf(userId)); + } + antExRecordQuery.setHospitalId(hospitalId); PatientsQuery patientsQuery = new PatientsQuery(); 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 49a9d61..4a7f8cd 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 @@ -2712,7 +2712,8 @@ public class MatDeliverFacade { patientsQuery.setDesc("fmDate"); patientsQuery.setSort("fmDate"); //隆化需求按接诊医生查询 - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())&&"2100001605".equals(hid)) { + //&&"2100001605".equals(hid) 去掉,前台入参有这个参数 + if (StringUtils.isNotEmpty(childbirthManagerRequest.getDeliverDoctor())) { patientsQuery.setDeliverDoctor(childbirthManagerRequest.getDeliverDoctor()); } 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 7f1795c..15f56e9 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 @@ -13,6 +13,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.IPreEugenicsService; @@ -1282,10 +1283,13 @@ public class PatientFacade extends BaseServiceImpl { * @return */ public BaseResponse queryTwinsAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { + + String hospital = autoMatchFacade.getHospitalId(userId); + //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); - String hospital = autoMatchFacade.getHospitalId(userId); + //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start(); @@ -1345,10 +1349,14 @@ public class PatientFacade extends BaseServiceImpl { * @return */ public BaseResponse queryBloodPressureAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { + String hospital = autoMatchFacade.getHospitalId(userId); + //威县数据流转 + /*if(OrganizationConstant.XT_WX.equals(hospital)){ + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId)); + }*/ //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); - String hospital = autoMatchFacade.getHospitalId(userId); //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start(); @@ -1420,10 +1428,16 @@ public class PatientFacade extends BaseServiceImpl { * @return */ public BaseResponse queryBloodSugarAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { + String hospital = autoMatchFacade.getHospitalId(userId); + //威县数据流转 + /*if(OrganizationConstant.XT_WX.equals(hospital)){ + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId)); + }*/ + //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); - String hospital = autoMatchFacade.getHospitalId(userId); + //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start(); @@ -1492,10 +1506,15 @@ public class PatientFacade extends BaseServiceImpl { } public BaseResponse queryScarUterusAllPuerpera(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { + String hospital = autoMatchFacade.getHospitalId(userId); + //威县数据流转 + /*if(OrganizationConstant.XT_WX.equals(hospital)){ + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId)); + }*/ + //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); - - String hospital = autoMatchFacade.getHospitalId(userId); + //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start(); @@ -1589,10 +1608,15 @@ public class PatientFacade extends BaseServiceImpl { * @return */ public BaseResponse queryRareList(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { + String hospital = autoMatchFacade.getHospitalId(userId); + /*//威县数据流转 + if(OrganizationConstant.XT_WX.equals(hospital)){ + riskPatientsQueryRequest.setLastCheckDoctorId(String.valueOf(userId)); + }*/ //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); patientsQuery.setRareType("1"); - String hospital = autoMatchFacade.getHospitalId(userId); + //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 2a257f6..21c3724 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -15,6 +15,7 @@ import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.service.IBloodPressureService; import com.lyms.platform.operate.web.service.PatientWeightService; @@ -216,10 +217,11 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP weekEnd, Integer age, Integer page, Integer limit,Integer isPrint, Integer userId,String isAll) { boolean flag = false; List hospitalIds = groupsFacade.findGroupHospital(userId, false); + String hospitalId = autoMatchFacade.getHospitalId(userId); List hids = new ArrayList<>(); if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) { - String hospitalId = autoMatchFacade.getHospitalId(userId); + hids.add(hospitalId); } else @@ -262,6 +264,13 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP criteria.and("pid").in(ids); } + //威县数据流转 + if ((!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) && OrganizationConstant.XT_WX.equals(hospitalId)) + { + + criteria.and("operaterId").is(userId); + } + if(null!=isPrint){ criteria.and("isPrint").is(isPrint); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 47dc5d6..80267eb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.EnumUtil; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.result.DiabetesRecordResult; import com.lyms.platform.operate.web.service.IBloodSugarService; @@ -138,10 +139,10 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga flag = true; } List hospitalIds = groupsFacade.findGroupHospital(userId, false); + String hospitalId = autoMatchFacade.getHospitalId(userId); List hids = new ArrayList<>(); if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) { - String hospitalId = autoMatchFacade.getHospitalId(userId); hids.add(hospitalId); } else @@ -158,6 +159,12 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga if(null!=isPrint){ criteria.and("isPrint").is(isPrint); } + + //威县数据流转 + if((!StringUtils.isNotEmpty(isAll) || "1".equals(isAll)) && OrganizationConstant.XT_WX.equals(hospitalId)){ + criteria.and("createUser").is(userId); + } + // List rids = new ArrayList<>(); // rids.add("5aab6d3d422b03d4ad2bf83e"); // rids.add("5aab6d3e422b03d4ad2bf83f"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java index 9bacbb5..49db518 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.constant.OrganizationConstant; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.IPostReviewService; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -83,6 +84,12 @@ public class PostReviewServiceImpl extends BaseServiceImpl implements IPostRevie String hospitalId = autoMatchFacade.getHospitalId(userId); + + //威县数据流转 + if(OrganizationConstant.XT_WX.equals(hospitalId)){ + doctorId = String.valueOf(userId); + } + List hids = new LinkedList<>(); hids.add(hospitalId); if (StringUtils.isNotEmpty(area))