From 7e5d4b4f61fd510706c463622d411ab7ef199842 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 22 Dec 2016 13:57:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=8E=E9=99=A9=E5=9B=A0?= =?UTF-8?q?=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/query/PatientsQuery.java | 12 ++++++++++++ .../operate/web/facade/MatDeliverFacade.java | 15 ++++++++++++--- .../platform/operate/web/facade/PatientFacade.java | 20 +++++++++++++++++--- 3 files changed, 41 insertions(+), 6 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 61ce10a..b109dbb 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 @@ -368,6 +368,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { //建档医生 private String bookbuildingDoctor; + private List bookbuildingDoctorList; //档案编号 private String fileCode; @@ -868,6 +869,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { if (bookbuildingDoctor != null) { condition = condition.and("bookbuildingDoctor", bookbuildingDoctor, MongoOper.IS); } + if (CollectionUtils.isNotEmpty(bookbuildingDoctorList)) { + condition = condition.and("bookbuildingDoctor", bookbuildingDoctorList, MongoOper.IN); + } if (visitstatus != -1) { condition = condition.and("isVisit", visitstatus, MongoOper.IS); } @@ -1292,4 +1296,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { public void setHusbandPhone(String husbandPhone) { this.husbandPhone = husbandPhone; } + + public List getBookbuildingDoctorList() { + return bookbuildingDoctorList; + } + + public void setBookbuildingDoctorList(List bookbuildingDoctorList) { + this.bookbuildingDoctorList = bookbuildingDoctorList; + } } \ No newline at end of file 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 0384525..4734032 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 @@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.request.MatDeliverQueryRequest; import com.lyms.platform.operate.web.request.NewBabyManagerRequest; import com.lyms.platform.operate.web.result.*; +import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -75,6 +76,9 @@ public class MatDeliverFacade { @Autowired private DataPermissionService dataPermissionService; + @Autowired + private BasicConfigService basicConfigService; + @Value(("#{configProperties['run.region']}")) private String runType; @@ -962,6 +966,9 @@ public class MatDeliverFacade { } } } + patientsQuery.setLimit(childbirthManagerRequest.getLimit()); + patientsQuery.setPage(childbirthManagerRequest.getPage()); + patientsQuery.setNeed("need"); patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId())?null:childbirthManagerRequest.getRegisterProvinceId()); patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId())?null:childbirthManagerRequest.getRegisterCityId()); patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId())?null:childbirthManagerRequest.getRegisterAreaId()); @@ -969,7 +976,7 @@ public class MatDeliverFacade { patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId())?null:childbirthManagerRequest.getLivingCityId()); patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId())?null:childbirthManagerRequest.getLivingAreaId()); patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone()); - patientsQuery.setQueryNo1(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())?null:childbirthManagerRequest.getQueryNo()); + patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())?null:childbirthManagerRequest.getQueryNo()); patientsQuery.setFmHospitalList(hospitalList); String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode(); patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson); @@ -1014,6 +1021,8 @@ public class MatDeliverFacade { childbirthManagerQueryModel.setpId(maternalDeliverModel.getPid()); childbirthManagerQueryModel.setPatientId(patients.getId()); childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); + // 居住地 + childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); // 电话转换 childbirthManagerQueryModel.setPhone(StringUtils.isEmpty(patients.getPhone()) ? "" : patients.getPhone().substring(0, 3) + "****" + patients.getPhone().substring(7)); childbirthManagerQueryModel.setHusbandPhone(StringUtils.isEmpty(patients.getHusbandPhone()) ? "" : patients.getHusbandPhone().substring(0, 3) + "****" + patients.getHusbandPhone().substring(7)); @@ -1226,7 +1235,7 @@ public class MatDeliverFacade { } childbirthManagerResult.setData(childbirthManagerQueryModelList); - childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); + childbirthManagerResult.setPageInfo(patientsQuery.getPageInfo()); childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); return childbirthManagerResult; @@ -1302,7 +1311,7 @@ public class MatDeliverFacade { newBabyManagerQueryModel.setDueType("顺产"); } if ("2".equals(dueType)) { - newBabyManagerQueryModel.setDueType("刨宫产"); + newBabyManagerQueryModel.setDueType("剖宫产"); } newBabyManagerQueryModelList.add(newBabyManagerQueryModel); } 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 2da6da5..a7f9663 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 @@ -16,6 +16,8 @@ import com.lyms.platform.operate.web.worker.QuanPatientWorker; import com.lyms.platform.operate.web.worker.WorkHR; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.UsersQuery; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; @@ -758,6 +760,20 @@ public class PatientFacade { patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId()); patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId()); patientsQuery.setAreaRegisterId(StringUtils.isEmpty(patientManagerRequest.getAreaRegisterId()) ? null : patientManagerRequest.getAreaRegisterId()); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setName(patientManagerRequest.getBookbuildingDoctor()); + usersQuery.setYn(YnEnums.YES.getId()); + List usersList = usersService.queryUsers(usersQuery); + if(CollectionUtils.isNotEmpty(usersList)){ + List bookbuildingDoctorList = new ArrayList<>(); + for (Users users : usersList) { + bookbuildingDoctorList.add(users.getId().toString()); + } + patientsQuery.setBookbuildingDoctorList(bookbuildingDoctorList); + } + patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId()); + patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId()); + patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId()); patientsQuery.setNeed("need"); if (StringUtils.isNotEmpty(patientManagerRequest.getBookBuildingDate())) { try { @@ -767,9 +783,7 @@ public class PatientFacade { // 什么都不做，这里是数据传入错误了 } } - patientsQuery.setName(StringUtils.isEmpty(patientManagerRequest.getUserName()) ? null : patientManagerRequest.getUserName()); - patientsQuery.setCardNo(StringUtils.isEmpty(patientManagerRequest.getCardNo()) ? null : patientManagerRequest.getCardNo()); - patientsQuery.setPhone(StringUtils.isEmpty(patientManagerRequest.getPhone()) ? null : patientManagerRequest.getPhone()); + patientsQuery.setName(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo()); List patientsList = patientsService.queryPatient(patientsQuery); List patientManagerQueryModelList = new ArrayList<>(); -- 1.8.3.1