From 97f8797127aaf906b948f836f81c1fbb53ff58c7 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 22 Aug 2024 15:16:11 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E9=AB=98=E5=8D=B1?= =?UTF-8?q?=E5=9B=A0=E7=B4=A0=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 12 +++++++++++- .../operate/web/controller/PuerperaManageController.java | 1 + .../com/lyms/platform/operate/web/facade/PatientFacade.java | 1 + .../operate/web/request/RiskPatientsQueryRequest.java | 9 +++++++++ .../platform/operate/web/service/SyncDataTaskService.java | 2 +- 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 9602dea..ea428ef 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -452,6 +452,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //大同his同步分娩建档数据 不给护士及门诊展示 住院用 private boolean dtFm=false; + private String allPats; + + public String getAllPats() { + return allPats; + } + + public void setAllPats(String allPats) { + this.allPats = allPats; + } + public boolean isDtFm() { return dtFm; } @@ -1118,7 +1128,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (StringUtils.isNotEmpty(rLevel)) { //大同特殊处理 按颜色等于查询 - if("2100002419".equals(hospitalId)){ + if("2100002419".equals(hospitalId)&&StringUtils.isEmpty(allPats)){ List levelList= StringUtils.covertToList(rLevel, String.class); if (CollectionUtils.isNotEmpty(levelList)){ if (levelList.size()>1){ 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 a7dcf8a..291bea6 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 @@ -113,6 +113,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + patientsQueryRequest.setAllPats("allPats"); return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), null, Boolean.FALSE); } 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 66816c1..a638ef5 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 @@ -258,6 +258,7 @@ public class PatientFacade extends BaseServiceImpl { private PatientsQuery complayRequest(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion,String hospitalId) { PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setAllPats(riskPatientsQueryRequest.getAllPats()); patientsQuery.setPhone(riskPatientsQueryRequest.getPhone()); patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo()); patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 38a67de..b746b03 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -196,6 +196,15 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { //大同 高危专号 private String highRiskFileCode; + private String allPats;//用于区分是那个来的 + + public String getAllPats() { + return allPats; + } + + public void setAllPats(String allPats) { + this.allPats = allPats; + } public String getHighRiskFileCode() { return highRiskFileCode; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index fa5ad13..996cbd8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -60,7 +60,7 @@ public class SyncDataTaskService { //urls.put("area-zhucheng-api.healthbaby.com.cn:12356","诸城市妇幼保健院"); //urls.put("area-weihai-api.healthbaby.com.cn:12356","威海市妇幼"); //urls.put("area-chengde-api.healthbaby.com.cn:12356","承德"); - urls.put("area-nanhe-api.healthbaby.com.cn:1236","南和"); + urls.put("area-nanhe-api.healthbaby.com.cn:12356","南和"); urls.put("area-dt-api.healthbaby.com.cn:12356","大同"); //urls.put("area-lingcheng-api.healthbaby.com.cn:12356","陵城"); } -- 1.8.3.1