From b31dea6b91b481da184693f5ae2b72a1ad27c754 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 31 May 2018 16:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=8A=E5=8D=95=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/pojo/Patients.java | 2 +- .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 10 ++++++++-- .../operate/web/facade/AntenatalExaminationFacade.java | 7 +++---- 3 files changed, 12 insertions(+), 7 deletions(-) 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 1e6010e..7901887 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 @@ -328,7 +328,7 @@ public class Patients extends BaseModel { private Integer expType; //person表主键 private String pid; - //是否隐藏 0 隐藏 1 显示 更改为：0，转诊建档，待接收 1，转诊建档，已接收 + //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检 private String enable; //最后一次高危时间 private Date lastRhTime; 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 f9c625e..c8ad71f 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 @@ -127,7 +127,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //医院id private List hospitalList; - //0 隐藏 1 显示 + // 0，转诊建档，待接收 + // 1，转诊建档，已接收 + // 2，隐藏建档，在A院建档去B医院做产检-----建档管理里面不展示 private String enable = "1"; private String notEnable; @@ -497,7 +499,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private String hospitalId; private String hcertificateNum; - //3-转诊建档 + // 0：孕妇直接建档 + // 1：儿童建档产生的产妇（不展示在列表中） + // 2：自动分娩产生的产妇（直接建档的产妇） =》当自动分娩的孕妇补录分娩信息后更新patient表中buildtype为0 + // 3：转诊建档 private Integer buildType = -1; private Integer buildTypeNot = -1; @@ -1116,6 +1121,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (buildType != -1) { MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS); + MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS); MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 9d6ccf4..9e19866 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -142,7 +142,7 @@ public class AntenatalExaminationFacade { */ public String handHideBuild(String pid, String parentId, Integer userId, int type) { String hospitalId = autoMatchFacade.getHospitalId(userId); - Patients patients = null; + Patients patients; Patients patients1 = patientsService.findOnePatientById(parentId); if (StringUtils.isEmpty(pid)) { pid = patients1.getPid(); @@ -160,22 +160,20 @@ public class AntenatalExaminationFacade { //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId)) && StringUtils.isNotEmpty(pid)) { + System.out.println("复诊时开始隐藏建档："+patients.getId()); patients = findOnePatient(null, null, null, null, type, false, pid, false); patients.setSource(patients.getId()); patients.setId(null); patients.setHospitalId(hospitalId); -// patients.setType(1); patients.setCreated(new Date()); patients.setBookbuildingDoctor(patients.getBookbuildingDoctor()); patients.setEnable("2"); patients.setBookbuildingDate(patients.getBookbuildingDate()); -// patients.setFileCode(null); // 产后复查，设置自动分娩，这个字段其实是为了确定是否有对应的分娩记录，但是这种是没有分娩记录的 if (type == 3) { patients.setIsAutoFm(YnEnums.YES.getId()); } - // hujiaqi添加结束 patientsService.addPatient(patients); return patients.getId(); } @@ -2071,6 +2069,7 @@ public class AntenatalExaminationFacade { patientsQuery.setEnable("2"); } Patients patients = null; + System.out.println("复诊时查询当前医院是否有隐藏建档条件："+patientsQuery.convertToQuery().convertToMongoQuery()); List list = patientsService.queryPatient1(patientsQuery, "modified"); if (CollectionUtils.isNotEmpty(list)) { return list.get(0); -- 1.8.3.1