From 0f51e66aa7e768c2059a8e307c5072a8262694c5 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 25 Jul 2024 16:08:21 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E9=92=88=E5=AF=B9=E5=A4=A7=E5=90=8C?= =?UTF-8?q?=E5=B8=82=E7=AC=AC=E4=B8=80=E4=BA=BA=E6=B0=91=E5=8C=BB=E9=99=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E7=BA=A6=E5=BB=BA=E6=A1=A3=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/Patients.java | 11 +++++++++++ .../main/java/com/lyms/platform/query/PatientsQuery.java | 16 ++++++++++++++++ .../operate/web/controller/RemoteController.java | 1 + .../platform/operate/web/facade/BookbuildingFacade.java | 1 + .../lyms/platform/operate/web/facade/PatientFacade.java | 4 +++- .../operate/web/facade/PatientServiceFacade.java | 3 +++ .../operate/web/request/YunBookbuildingAddRequest.java | 10 ++++++++++ 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index ffa8b65..6cbec6d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -520,6 +520,17 @@ public class Patients extends BaseModel { private String lowerHairOgr;//母子健康手册 + //大同审核建档 0为待审核 1为正常 + private Integer isArchive; + + public Integer getIsArchive() { + return isArchive; + } + + public void setIsArchive(Integer isArchive) { + this.isArchive = isArchive; + } + public String getLowerHairOgr() { return lowerHairOgr; } 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 f8be365..c4bb850 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 @@ -443,6 +443,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer userType; //大同院内职工所属科室 private String dept; + //大同审核建档 0为待审核 1为正常 + private boolean isArchive=false; + + public boolean isArchive() { + return isArchive; + } + + public void setArchive(boolean archive) { + isArchive = archive; + } public String getDept() { return dept; @@ -872,6 +882,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } + if (isArchive){ + condition= condition.and("isArchive",0, MongoOper.NE); + } + + + if (extSource != null) { condition = condition.and("source", extSource, MongoOper.EXISTS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index 64200a0..dddfd4b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -580,6 +580,7 @@ public class RemoteController extends BaseController { list.add(m1); list.add(m2); request.setSerInfos(list); + request.setIsArchive(0); } BaseObjectResponse baseObjectResponse = bookbuildingFacade.addPregnantBookbuilding(request,StringUtils.isNotEmpty(archiveUsers.getAssistUserId())?Integer.valueOf(archiveUsers.getAssistUserId()):null , false); 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 3c93fbe..5ee6cae 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 @@ -2823,6 +2823,7 @@ public class BookbuildingFacade { patient.setUserType(yunRequest.getUserType()); patient.setDept(yunRequest.getDept()); patient.setLowerHairOgr(yunRequest.getLowerHairOgr()); + patient.setIsArchive(yunRequest.getIsArchive()); return patient; } 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 a58da70..f88b41d 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 @@ -3204,7 +3204,9 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setCurrentAreaId(organization.getAreaId()); patientsQuery.setWqxType(patientManagerRequest.getWqxType()); patientsQuery.setBooksuifangDoctor(patientManagerRequest.getBooksuifangDoctor()); - + if ("2100002419".equals(hospitalId)){ + patientsQuery.setArchive(true); + } //孕产建档管理-初诊医生 是否 条件查询 if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){ patientsQuery.setProdDoctor(patientManagerRequest.getProdDoctor()); 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 2c40e4a..ef0294c 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 @@ -1611,6 +1611,9 @@ public class PatientServiceFacade { patientsQuery.setNeed("1"); patientsQuery.setPage(statisticsQueryRequest.getPage()); patientsQuery.setLimit(statisticsQueryRequest.getLimit()); + if ("2100002419".equals(hospitalId)){ + patientsQuery.setArchive(true); + } if (StringUtils.isNotEmpty(statisticsQueryRequest.getDueDate())) { String time = statisticsQueryRequest.getDueDate(); String array[] = time.split(" - "); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index b3570c4..4a682e8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -654,6 +654,16 @@ public class YunBookbuildingAddRequest { private String closeCaseCode; //是否建册 private String buildingManualCode; + //大同审核建档 0为待审核 1为正常 + private Integer isArchive; + + public Integer getIsArchive() { + return isArchive; + } + + public void setIsArchive(Integer isArchive) { + this.isArchive = isArchive; + } public String getLastCheckEmployeeName() { return lastCheckEmployeeName; -- 1.8.3.1