From 10387b3fd5328291d1b471e809fb4386ed60e308 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 23 Aug 2016 09:29:22 +0800 Subject: [PATCH] code update --- .../permission/service/OrganizationService.java | 2 + .../service/impl/OrganizationServiceImpl.java | 27 +++++ .../com/lyms/platform/query/PatientsQuery.java | 26 +++++ .../platform/data/service/impl/SmsServiceImpl.java | 115 ++++++++++++++------- .../web/controller/BookbuildingController.java | 13 +++ .../operate/web/facade/BookbuildingFacade.java | 31 ++++++ 6 files changed, 177 insertions(+), 37 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java index 8190f0a..cc30996 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/OrganizationService.java @@ -20,4 +20,6 @@ public interface OrganizationService { List queryProvinceIdByOrgId(List orgId); List queryHospital(); + + List queryHospitals(OrganizationQuery organizationQuery); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index dad22bb..a162432 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -9,6 +9,7 @@ import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -90,4 +91,30 @@ public class OrganizationServiceImpl implements OrganizationService { public List queryHospital(){ return organizationMapper.queryHospital(); } + + @Override + public List queryHospitals(OrganizationQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(organizationMapper.queryOrganizationCount(query)); + } + + List results = new ArrayList<>(); + List organizations = organizationMapper.queryOrganization(query); + if(CollectionUtils.isNotEmpty(organizations)) { + for(Organization organization : organizations) { + if(null != organization) { + //设置机构类型 1 医院 0 公司 + if( null != organization.getType() ) { + if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) || + organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) { + organization.setOrgType(1); + results.add(organization); + } + } + + } + } + } + return results; + } } \ No newline at end of file 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 5e1e1ab..a6fe92f 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 @@ -177,6 +177,25 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer buildTypeEq; + private Date fmDateStart; + private Date fmDateEnd; + + public Date getFmDateEnd() { + return fmDateEnd; + } + + public void setFmDateEnd(Date fmDateEnd) { + this.fmDateEnd = fmDateEnd; + } + + public Date getFmDateStart() { + return fmDateStart; + } + + public void setFmDateStart(Date fmDateStart) { + this.fmDateStart = fmDateStart; + } + public Integer getBuildType() { return buildType; } @@ -501,6 +520,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("pid", pid, MongoOper.IS); } + if (fmDateStart != null && fmDateEnd != null) + { + Criteria cr = Criteria.where("fmDate").gte(fmDateStart).lte(fmDateEnd); + condition.andCondition(new MongoCondition(cr)); + } + + /* *//** * 服务类型 *//* diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index 0baa9d5..e02121b 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -627,6 +627,8 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setYn(YnEnums.YES.getId()); //1孕妇 patientsQuery.setType(1); + // 0未终止妊娠 1终止妊娠 + patientsQuery.setDueStatus(0); patientsQuery = getServicePatientQuery(serviceType, serviceStatus, patientsQuery); @@ -844,40 +846,72 @@ public class SmsServiceImpl implements SmsService{ //服务结束 if (specialDateType == SpecialDateEnums.FWJS.getId()) { - /** - * 孕妇超过42周的 就自动分娩 - */ - Date endDate = DateUtil.getNewDate(-42, "周", 0); - //把时间格式化成 yyyy_MM_dd 的日期 - endDate = DateUtil.formatDate(endDate); - patientsQuery.setYn(YnEnums.YES.getId()); - //1孕妇 - patientsQuery.setType(1); - patientsQuery.setLastMensesEnd(endDate); - patientsQuery.setLastMensesStart(endDate); - - List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); - if (CollectionUtils.isNotEmpty(patients)) - { - for (Patients pat : patients) - { - //短信前缀 - String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); - String messageContent = "【"+messagePrefix+"】"+template.getContent(); - messageContent = replaceName(pat.getUsername(), messageContent); - MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), - pat.getHospitalId(),template.getId(),pat.getId()); - messages.add(request); - - //更新成产妇状态 分娩时间设置成当前时间 - pat.setType(3); - pat.setFmDate(new Date()); - pat.setModified(new Date()); - yunBookbuildingService.updatePregnant(pat, pat.getId()); - } - - } +// Date endDate = DateUtil.formatDate(new Date()); +// +// patientsQuery.setYn(YnEnums.YES.getId()); +//// //1孕妇 3产妇 +// patientsQuery.setType(3); +// patientsQuery.setBuildTypeEq(2); +// patientsQuery.setFmDateStart(endDate); +// patientsQuery.setFmDateEnd(endDate); +// +// List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); +// if (CollectionUtils.isNotEmpty(patients)) +// { +// for (Patients pat : patients) +// { +// +// //短信前缀 +// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); +// String messageContent = "【"+messagePrefix+"】"+template.getContent(); +// messageContent = replaceName(pat.getUsername(), messageContent); +// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), +// pat.getHospitalId(),template.getId(),pat.getId()); +// messages.add(request); +// +// //更新成产妇状态 分娩时间设置成当前时间 +// pat.setType(3); +// pat.setFmDate(new Date()); +// pat.setModified(new Date()); +// yunBookbuildingService.updatePregnant(pat, pat.getId()); +// } +// +// } + + + +// Date endDate = DateUtil.getNewDate(-42, "周", 0); +// //把时间格式化成 yyyy_MM_dd 的日期 +// endDate = DateUtil.formatDate(endDate); +// patientsQuery.setYn(YnEnums.YES.getId()); +// //1孕妇 +// patientsQuery.setType(1); +// patientsQuery.setLastMensesEnd(endDate); +// patientsQuery.setLastMensesStart(endDate); +// +// List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); +// if (CollectionUtils.isNotEmpty(patients)) +// { +// for (Patients pat : patients) +// { +// +// //短信前缀 +// String messagePrefix = getSmsPrefix(config,pat.getBookbuildingDoctor()); +// String messageContent = "【"+messagePrefix+"】"+template.getContent(); +// messageContent = replaceName(pat.getUsername(), messageContent); +// MessageRequest request = getMessageRequest( messageContent,pat.getPhone(),ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), +// pat.getHospitalId(),template.getId(),pat.getId()); +// messages.add(request); +// +// //更新成产妇状态 分娩时间设置成当前时间 +// pat.setType(3); +// pat.setFmDate(new Date()); +// pat.setModified(new Date()); +// yunBookbuildingService.updatePregnant(pat, pat.getId()); +// } +// +// } } //孕妇建档在 孕妇建档生成 @@ -1552,6 +1586,11 @@ public class SmsServiceImpl implements SmsService{ sendSms(list); } } + + for (MessageRequest msg :allMsgs) + { + System.out.println("=======" + msg.getContent()); + } } @@ -2021,6 +2060,7 @@ public class SmsServiceImpl implements SmsService{ return request; } + private List allMsgs = new ArrayList<>(); /** * 发送短信到短信中心 @@ -2034,10 +2074,11 @@ public class SmsServiceImpl implements SmsService{ if (list != null && list.getMessages() != null) { List msgs = list.getMessages(); - for (MessageRequest msg :msgs) - { - System.out.println("=======" + msg.getContent()); - } + allMsgs.addAll(msgs); +// for (MessageRequest msg :msgs) +// { +// System.out.println("=======" + msg.getContent()); +// } } //SaveMessageService.saveSmsCenter(list); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java index 67ed2ec..06312bf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java @@ -141,4 +141,17 @@ public class BookbuildingController extends BaseController{ return objectResponse; } + + + @RequestMapping(value = "/queryHospitals", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryHospitals(HttpServletRequest request, + @RequestParam(required = false) String keyWord, + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + BaseObjectResponse objectResponse = bookbuildingFacade.queryHospitals(keyWord, page,limit ,loginState.getId()); + return objectResponse; + } } \ No newline at end of file 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 d681e75..03187f1 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 @@ -857,4 +857,35 @@ public class BookbuildingFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseObjectResponse queryHospitals(String keyWord, Integer page, Integer limit, Integer userId) { + OrganizationQuery organizationQuery = new OrganizationQuery(); + if(null != page && limit != page) { + organizationQuery.setNeed("true"); + organizationQuery.setPage(page); + organizationQuery.setLimit(limit); + organizationQuery.setSort("modified desc"); + } + + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setKeyword(keyWord); + + Map map = new HashMap<>(); + List orgs = organizationService.queryHospitals(organizationQuery); + if (CollectionUtils.isNotEmpty(orgs)) + { + for(Organization org : orgs) + { + map.put("id",org.getId()+""); + map.put("name",org.getName()); + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(map); + + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } \ No newline at end of file -- 1.8.3.1