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 c4bb850..2070347 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 @@ -1225,7 +1225,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } - if (lastCheckEmployeeId != null) { + if (StringUtils.isNotEmpty(lastCheckEmployeeId)) { condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS); } else if (lastCheckEId) { condition = condition.and("lastCheckEmployeeId", "", MongoOper.NE); 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 f88b41d..810a82e 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 @@ -3324,6 +3324,7 @@ public class PatientFacade extends BaseServiceImpl { patientsQuery.setType(patientManagerRequest.getType()); patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode()); // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + patientsQuery.setLastCheckEmployeeId(patientManagerRequest.getLastCheckEmployeeId()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList <>(); if (CollectionUtils.isNotEmpty(patientsList)) { @@ -3439,6 +3440,15 @@ public class PatientFacade extends BaseServiceImpl { System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor()); } } + String lastCheckEmployeeId = ""; + if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) { + Users user = usersService.getUsers(Integer.valueOf(patients.getLastCheckEmployeeId())); + if (user != null) { + lastCheckEmployeeId = user.getName(); + } else { + System.out.println(patients.getId() + ";no user lastCheckEmployeeId" + patients.getLastCheckEmployeeId()); + } + } //初诊时间和初诊医生字段展示,作为模块化 if (StringUtils.isNotEmpty(patients.getFirstCheckId())) { Users users = usersService.getUsers(Integer.parseInt(patients.getFirstCheckId())); @@ -3466,6 +3476,7 @@ public class PatientFacade extends BaseServiceImpl { // patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); // } // } + patientManagerQueryModel.setLastCheckEmployeeId(lastCheckEmployeeId); patientManagerQueryModel.setBooksuifangDoctor(patients.getBooksuifangDoctor()); patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor); patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index 0ab6e6f..bc7e02f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -161,6 +161,16 @@ public class PatientManagerRequest extends BasePageQueryRequest { private String booksuifangDoctor; private String dept; + //产检医生 + private String lastCheckEmployeeId; + + public String getLastCheckEmployeeId() { + return lastCheckEmployeeId; + } + + public void setLastCheckEmployeeId(String lastCheckEmployeeId) { + this.lastCheckEmployeeId = lastCheckEmployeeId; + } public String getDept() { return dept; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 49eef2f..8156738 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -117,6 +117,8 @@ public class PatientManagerQueryModel { //随访医生 private String booksuifangDoctor; + //产检医生 + private String lastCheckEmployeeId; //高危因素 private String riskFactorId; @@ -394,4 +396,12 @@ public class PatientManagerQueryModel { public void setDueDate(Date dueDate) { this.dueDate = dueDate; } + + public String getLastCheckEmployeeId() { + return lastCheckEmployeeId; + } + + public void setLastCheckEmployeeId(String lastCheckEmployeeId) { + this.lastCheckEmployeeId = lastCheckEmployeeId; + } }