From c143a20b9dc79b0609881cb73b63874ecc13a319 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 8 Sep 2016 14:36:32 +0800 Subject: [PATCH] code update --- .../com/lyms/platform/common/utils/DateUtil.java | 4 +-- .../platform/data/service/impl/SmsServiceImpl.java | 8 ++++- .../operate/web/facade/BookbuildingFacade.java | 17 +++-------- .../operate/web/facade/SmsConfigFacade.java | 35 +++++++++++----------- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index cd48ec9..37a4423 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -661,8 +661,8 @@ public class DateUtil { // Date lastLmess = parseYMD("2016-07-02"); // Date startDate = DateUtil.getRangeDate(lastLmess, 1, "周", -2); -// Date startDate = DateUtil.addDay(new Date(), 2); -// System.out.println(getyyyy_MM_dd(startDate)); + Date startDate = DateUtil.addDay(new Date(), -100); + System.out.println(getyyyy_MM_dd(startDate)); try { // Date startDate = DateUtil.addMonth(new Date(), -1); 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 048102d..c058c4a 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 @@ -1247,6 +1247,7 @@ public class SmsServiceImpl implements SmsService{ if (specialDateType == SpecialDateEnums.ETMY.getId()) { Date birthday = DateUtil.getNewDate(-1, "月", -sendTimeType); + birthday = DateUtil.formatDate(birthday); babyModelQuery.setBirthStart(birthday); babyModelQuery.setBirthEnd(birthday); messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template)); @@ -1255,6 +1256,7 @@ public class SmsServiceImpl implements SmsService{ else if(specialDateType == SpecialDateEnums.ETBS.getId()) { Date birthday = DateUtil.getNewDate(-100, "天", -sendTimeType); + birthday = DateUtil.formatDate(birthday); babyModelQuery.setBirthStart(birthday); babyModelQuery.setBirthEnd(birthday); messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template)); @@ -1340,6 +1342,8 @@ public class SmsServiceImpl implements SmsService{ patientsQuery.setHospitalId(hospitalId); //1孕妇 3产妇 patientsQuery.setType(3); + //0未终止妊娠的产妇 + patientsQuery.setDueStatus(0); getServicePatientQuery(serviceType, serviceStatus, patientsQuery); @@ -1530,7 +1534,8 @@ public class SmsServiceImpl implements SmsService{ //3产妇 chanPatientsQuery.setType(3); - getServicePatientQuery(serviceType, serviceStatus, chanPatientsQuery); + chanPatientsQuery.setDueStatus(0); + getServicePatientQuery(serviceType, serviceStatus, chanPatientsQuery); PatientsQuery yunPatientsQuery = new PatientsQuery(); @@ -1538,6 +1543,7 @@ public class SmsServiceImpl implements SmsService{ yunPatientsQuery.setHospitalId(hospitalId); //1孕妇 yunPatientsQuery.setType(1); + chanPatientsQuery.setDueStatus(0); getServicePatientQuery(serviceType, serviceStatus, yunPatientsQuery); 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 3ca0d9c..09f1565 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 @@ -152,7 +152,7 @@ public class BookbuildingFacade { } PersonModel resperson = null; - if (yunRequest.getPregnantPhone() != null || yunRequest.getPregnantCertificateNum() != null) + if (StringUtils.isNotEmpty(yunRequest.getPregnantCertificateNum())) { PersonModelQuery personModelQuery = new PersonModelQuery(); @@ -161,14 +161,6 @@ public class BookbuildingFacade { personModelQuery.setTypes(new Integer[]{1,3}); //孕妇或者产妇基本信息 List personModels = personService.queryPersons(personModelQuery); -// if (personModels == null || personModels.size() == 0) -// { -// personModelQuery.setPhone(yunRequest.getPregnantPhone()); -// personModelQuery.setCardNo(null); -// personModels = personService.queryPersons(personModelQuery); -// } - - PersonModel pmodel = new PersonModel(); pmodel.setName(yunRequest.getPregnantName()); pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday())); @@ -191,12 +183,11 @@ public class BookbuildingFacade { } Patients patient = getPatientsData(yunRequest); - patient.setDueStatus(0); //1孕妇 3 产妇 patient.setType(type); patient.setBuildType(buildType); - if (type == 3 && date != null) + if (type == ServiceObjEnums.CHANOBJ.getId() && date != null) { patient.setFmDate(date); } @@ -220,7 +211,7 @@ public class BookbuildingFacade { if (p == null || p.getId() == null) { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - br.setErrormsg("失败"); + br.setErrormsg("建档失败，保存异常"); return br; } @@ -228,7 +219,7 @@ public class BookbuildingFacade { //加入产筛 patientsService.validata(p); - if (type == 1) + if (type == ServiceObjEnums.YUNOBJ.getId()) { //生成建档短信 createBuildSms(p); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java index c114c9c..1c4354f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java @@ -633,32 +633,33 @@ public class SmsConfigFacade { public BaseListResponse querySmsList(String hospitalName, String phone,Integer smsType,Integer smsStatus,String content,String planTime,String actualTime,Integer objType, Integer page, Integer limit) { + String hospitalIds = ""; - OrganizationQuery organizationQuery = new OrganizationQuery(); - - organizationQuery.setYn(YnEnums.YES.getId()); - organizationQuery.setKeyword(hospitalName); + if (StringUtils.isNotEmpty(hospitalName)) + { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setKeyword(hospitalName); - String hospitalIds = ""; - List orgs = organizationService.queryHospitals(organizationQuery); - if (CollectionUtils.isNotEmpty(orgs)) - { - for(int i = 0 ; i< orgs.size() ; i++) + List orgs = organizationService.queryHospitals(organizationQuery); + if (CollectionUtils.isNotEmpty(orgs)) { - String orgId = orgs.get(i).getId()+""; - if (i == orgs.size() -1) + for(int i = 0 ; i< orgs.size() ; i++) { - hospitalIds+=orgId; - } - else - { - hospitalIds+=orgId+","; + String orgId = orgs.get(i).getId()+""; + if (i == orgs.size() -1) + { + hospitalIds+=orgId; + } + else + { + hospitalIds+=orgId+","; + } } } } - String planTimeStart = ""; String planTimeEnd = ""; if (StringUtils.isNotEmpty(planTime)) -- 1.8.3.1