diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 2005c48..c5a6f18 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -8,9 +8,11 @@ import java.util.*; import com.lyms.platform.biz.service.GuidelinesService; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.PingYinUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.pojo.*; import org.apache.commons.io.FileUtils; +import org.apache.struts.config.BaseConfig; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -24,7 +26,7 @@ public class BasicConfigServiceTest { public static void main(String[] args) throws Exception { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:/spring/applicationContext_biz_patient1.xml"); - PuerperaService basicConfigService = (PuerperaService) applicationContext.getBean(PuerperaService.class); + // PuerperaService basicConfigService = (PuerperaService) applicationContext.getBean(PuerperaService.class); /* PuerperaModel obj = new PuerperaModel(); obj.setAddress("成都市高新区天府2街"); obj.setAge(111); @@ -48,14 +50,14 @@ public class BasicConfigServiceTest { obj1.setCardNo("50022319951267164466"); basicConfigService.addPuerpera(obj1);*/ - PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); + // PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); ; // puerperaQuery.setKeyword("小王"); // puerperaQuery.setDueDateStart(sdf.parse("2016-1-12")); // puerperaQuery.setDueDateEnd(sdf.parse("2016-3-16")); - puerperaQuery.setId("5719caf624fd57791341b7cb"); - System.out.println(basicConfigService.queryPuerpera(puerperaQuery)); + // puerperaQuery.setId("5719caf624fd57791341b7cb"); + // System.out.println(basicConfigService.queryPuerpera(puerperaQuery)); /* * for(int i = 6;i<7;i++){ BasicConfig obj = new BasicConfig(); obj.setCode("xc123456"+i); obj.setName("哮喘123456"+i); obj.setYn(1); * obj.setParentId("56ea134c24fdaafbabbb0025"); basicConfigService.addBasicConfig(obj); } @@ -78,7 +80,9 @@ public class BasicConfigServiceTest { // addVisit(applicationContext); // addaw(applicationContext, "0-83月龄身长、高标准差数值表（男、女）.csv", 1); // addaw(applicationContext, "0-83月龄体重标准差数值表（男、女）.csv", 0); - addZhenduan(applicationContext); +// addZhenduan(applicationContext); + + addCountry(applicationContext); } public static void addZhenduan(ApplicationContext applicationContext) { @@ -322,6 +326,34 @@ public class BasicConfigServiceTest { mongoTemplate.save(DataPermissionsModel); } + + public static void addCountry(ApplicationContext applicationContext) { + MongoTemplate mongoTemplate + =(MongoTemplate)applicationContext.getBean("mongoTemplate"); + mongoTemplate.getDb().authenticate("platform", "platform123".toCharArray()); + + try { + List list = FileUtils.readLines(new File("F:\\temp\\country.txt"),"gbk"); + for (String line:list) { + if (line != null) { + BasicConfig config = new BasicConfig(); + config.setYn(YnEnums.YES.getId()); + config.setCode(PingYinUtil.getFirstSpell(line).toUpperCase()); + config.setName(line); + config.setEnable(1); + Thread.sleep(1000); + config.setCreateDate(new Date().getTime()); + config.setParentId("57dc45f7-b0ba-42f0-863b-de53966a6e65"); + mongoTemplate.save(config); + System.out.println(line); + } + } + + } catch (Exception e) { + e.printStackTrace(); + } + } + public static void addVisit(ApplicationContext applicationContext){ VisitModel visitModel = new VisitModel(); diff --git a/platform-common/pom.xml b/platform-common/pom.xml index 415da8b..ccb0d0e 100644 --- a/platform-common/pom.xml +++ b/platform-common/pom.xml @@ -14,7 +14,11 @@ commons-httpclient commons-httpclient - + + com.belerweb + pinyin4j + 2.5.0 + 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 ca64259..048102d 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 @@ -655,7 +655,7 @@ public class SmsServiceImpl implements SmsService{ if (!CollectionUtils.isNotEmpty(templates)) { - return; + continue; } //循环每一个模板，根据模板条件查询到用户 发送短信 @@ -696,6 +696,8 @@ public class SmsServiceImpl implements SmsService{ PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setHospitalId(hospitalId); + //1孕妇 patientsQuery.setType(1); // 0未终止妊娠 1终止妊娠 @@ -1006,7 +1008,7 @@ public class SmsServiceImpl implements SmsService{ { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); - + babyModelQuery.setHospitalId(hospitalId); babyModelQuery = getServiceBabyQuery( serviceType, serviceStatus, babyModelQuery); //发送短信集合 @@ -1332,8 +1334,10 @@ public class SmsServiceImpl implements SmsService{ //产妇 else if (serviceObj == ServiceObjEnums.CHANOBJ.getId()) { + PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setHospitalId(hospitalId); //1孕妇 3产妇 patientsQuery.setType(3); @@ -1351,7 +1355,7 @@ public class SmsServiceImpl implements SmsService{ Date actualSendDate = DateUtil.addDay(DateUtil.parseYMD(currentDate), sendTimeType); //查询出产妇预约 - List orderModels = postReviewService.queryPostOrder(actualSendDate,tempHid); + List orderModels = postReviewService.queryPostOrder(actualSendDate, tempHid); if(CollectionUtils.isNotEmpty(orderModels)) { for(PostReviewModel orderModel : orderModels) @@ -1364,6 +1368,7 @@ public class SmsServiceImpl implements SmsService{ } } } + //产后复查程序提醒 else if (smsType == SmsServiceEnums.CHFCCXTX.getId()) { //发送频次 @@ -1521,6 +1526,8 @@ public class SmsServiceImpl implements SmsService{ { PatientsQuery chanPatientsQuery = new PatientsQuery(); chanPatientsQuery.setYn(YnEnums.YES.getId()); + chanPatientsQuery.setHospitalId(hospitalId); + //3产妇 chanPatientsQuery.setType(3); getServicePatientQuery(serviceType, serviceStatus, chanPatientsQuery); @@ -1528,6 +1535,7 @@ public class SmsServiceImpl implements SmsService{ PatientsQuery yunPatientsQuery = new PatientsQuery(); yunPatientsQuery.setYn(YnEnums.YES.getId()); + yunPatientsQuery.setHospitalId(hospitalId); //1孕妇 yunPatientsQuery.setType(1); getServicePatientQuery(serviceType, serviceStatus, yunPatientsQuery); @@ -1535,6 +1543,7 @@ public class SmsServiceImpl implements SmsService{ BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setHospitalId(hospitalId); babyModelQuery = getServiceBabyQuery(serviceType, serviceStatus, babyModelQuery); //发送短信集合