From 933cda0467f19f1090cb0254c8cea6b0c460c527 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 6 Jul 2016 09:15:05 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/biz/dal/IPersonDao.java | 18 ++ .../lyms/platform/biz/dal/IStopPregnancyDao.java | 18 ++ .../lyms/platform/biz/dal/impl/PersonDaoImpl.java | 27 ++ .../biz/dal/impl/StopPregnancyDaoImpl.java | 33 +++ .../lyms/platform/biz/service/PersonService.java | 25 ++ .../platform/biz/service/SmsConfigService.java | 4 + .../platform/biz/service/StopPregnancyService.java | 29 ++ .../platform/common/enums/AmsServiceTypeEnum.java | 11 + .../lyms/platform/common/enums/StopPregEnums.java | 63 +++++ .../com/lyms/platform/common/utils/DateUtil.java | 17 ++ .../lyms/platform/common/utils/HttpRequest.java | 305 +++++++++++++++++++++ .../lyms/platform/common/utils/StringUtils.java | 13 + .../java/com/lyms/platform/pojo/BabyModel.java | 11 + .../main/java/com/lyms/platform/pojo/Patients.java | 11 + .../java/com/lyms/platform/pojo/PersonModel.java | 115 ++++++++ .../java/com/lyms/platform/pojo/StopPregModel.java | 107 ++++++++ .../com/lyms/platform/query/SmsConfigQuery.java | 15 + .../com/lyms/platform/query/StopPregQuery.java | 109 ++++++++ .../platform/data/controller/SmsController.java | 45 +++ .../lyms/platform/data/pojo/MessageContent.java | 52 ++++ .../platform/data/pojo/MessageListRequest.java | 28 ++ .../lyms/platform/data/pojo/MessageRequest.java | 149 ++++++++++ .../platform/data/pojo/MessageResponseEntity.java | 43 +++ .../java/com/lyms/platform/data/pojo/PageInfo.java | 60 ++++ .../main/java/com/lyms/platform/data/pojo/Tag.java | 36 +++ .../com/lyms/platform/data/service/SmsService.java | 9 + .../platform/data/service/impl/SmsServiceImpl.java | 61 +++++ .../lyms/platform/data/util/AmsMessageService.java | 180 ++++++++++++ .../platform/data/util/SaveMessageService.java | 41 +++ .../web/controller/StopPregnancyController.java | 63 +++++ .../operate/web/facade/BabyBookbuildingFacade.java | 32 +++ .../operate/web/facade/BookbuildingFacade.java | 41 ++- .../operate/web/facade/StopPregnancyFacade.java | 242 ++++++++++++++++ .../web/request/BabyBookbuildingAddRequest.java | 11 + .../operate/web/request/StopPregRequest.java | 83 ++++++ .../web/request/YunBookbuildingAddRequest.java | 14 + .../operate/web/result/StopPregResult.java | 73 +++++ 37 files changed, 2193 insertions(+), 1 deletion(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPersonDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IStopPregnancyDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PersonDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/StopPregnancyDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/StopPregnancyService.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/AmsServiceTypeEnum.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageContent.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageListRequest.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageResponseEntity.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/pojo/PageInfo.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/pojo/Tag.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java create mode 100644 platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPersonDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPersonDao.java new file mode 100644 index 0000000..0a0d4e0 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPersonDao.java @@ -0,0 +1,18 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PersonModel; +import com.lyms.platform.pojo.StopPregModel; + +import java.util.List; + +/** + * Created by Administrator on 2016/7/5. + */ +public interface IPersonDao { + + + public PersonModel addPerson(PersonModel model); + + public void updatePerson(PersonModel obj, String id); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IStopPregnancyDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IStopPregnancyDao.java new file mode 100644 index 0000000..92a978f --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IStopPregnancyDao.java @@ -0,0 +1,18 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.StopPregModel; + +import java.util.List; + +/** + * Created by Administrator on 2016/7/5. + */ +public interface IStopPregnancyDao { + + public List queryStopPreg(MongoQuery mongoQuery); + + public StopPregModel addStopPreg(StopPregModel model); + + public void updateStopPreg(StopPregModel obj, String id); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PersonDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PersonDaoImpl.java new file mode 100644 index 0000000..990e6e5 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PersonDaoImpl.java @@ -0,0 +1,27 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IPersonDao; +import com.lyms.platform.biz.dal.ISmsTemplateDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PersonModel; +import com.lyms.platform.pojo.SmsTemplateModel; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository("personDao") +public class PersonDaoImpl extends BaseMongoDAOImpl implements IPersonDao { + + @Override + public PersonModel addPerson(PersonModel model) { + return save(model); + } + + @Override + public void updatePerson(PersonModel obj, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/StopPregnancyDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/StopPregnancyDaoImpl.java new file mode 100644 index 0000000..aa7bb13 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/StopPregnancyDaoImpl.java @@ -0,0 +1,33 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IStopPregnancyDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.StopPregModel; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository("stopPregnancyDao") +public class StopPregnancyDaoImpl extends BaseMongoDAOImpl implements IStopPregnancyDao { + + + @Override + public List queryStopPreg(MongoQuery mongoQuery) { + return find(mongoQuery.convertToMongoQuery()); + } + + @Override + public StopPregModel addStopPreg(StopPregModel model) { + return save(model); + } + + @Override + public void updateStopPreg(StopPregModel obj, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } + + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java new file mode 100644 index 0000000..1a81b73 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PersonService.java @@ -0,0 +1,25 @@ +package com.lyms.platform.biz.service; + + +import com.lyms.platform.biz.dal.IPersonDao; +import com.lyms.platform.pojo.PersonModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +@Service +public class PersonService { + + @Autowired + private IPersonDao personDao; + + public PersonModel addPerson(PersonModel obj){ + return personDao.addPerson(obj); + } + + public void updatePerson(PersonModel obj, String id){ + personDao.updatePerson(obj, id); + } + + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java index 2fd81f2..d767531 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsConfigService.java @@ -25,6 +25,10 @@ public class SmsConfigService { return smsConfigDao.querySmsConfigByHid(query.convertToQuery()); } + public List querySmsConfig(SmsConfigQuery query) { + return smsConfigDao.querySmsConfigByHid(query.convertToQuery()); + } + public SmsConfigModel addSmsConfig(SmsConfigModel model) { return smsConfigDao.addSmsConfig(model); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/StopPregnancyService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/StopPregnancyService.java new file mode 100644 index 0000000..296e3c6 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/StopPregnancyService.java @@ -0,0 +1,29 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IStopPregnancyDao; + +import com.lyms.platform.pojo.StopPregModel; +import com.lyms.platform.query.StopPregQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + + +@Service("stopPregnancyService") +public class StopPregnancyService { + + @Autowired + private IStopPregnancyDao stopPregnancyDao; + + public List queryStopPreg(StopPregQuery query) { + return stopPregnancyDao.queryStopPreg(query.convertToQuery()); + } + public StopPregModel addStopPreg(StopPregModel model) { + return stopPregnancyDao.addStopPreg(model); + } + + public void updateStopPreg(StopPregModel model, String id) { + stopPregnancyDao.updateStopPreg(model, id); + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/AmsServiceTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/AmsServiceTypeEnum.java new file mode 100644 index 0000000..9e68c1a --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/AmsServiceTypeEnum.java @@ -0,0 +1,11 @@ +package com.lyms.platform.common.enums; + +/** + * Created by lqy on 2016/7/5. + */ +public enum AmsServiceTypeEnum { + CHILD_GUIDE,//儿童指导 + YUN_GUIDE,//孕妇指导 + CHAN_GUIDE,//产后指导 + YUN_WARN//孕妇提醒 +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java new file mode 100644 index 0000000..286dbdb --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/StopPregEnums.java @@ -0,0 +1,63 @@ +package com.lyms.platform.common.enums; + + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 终止妊娠原因 + * Created by lqy on 2016/06/27 + */ +public enum StopPregEnums { + + + GFX(0,"高风险高危"),PTTZ(1,"胚胎停止发育"),FYYW(2,"妊娠早期服用药物"),CQZDYX(3,"产前诊断阳性"),OTHER(3,"其他"); + + StopPregEnums(int id, String name) { + this.id = id; + this.name = name; + } + + private int id; + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + + public static List getStopPregEnums() { + List list = new ArrayList<>(); + for (StopPregEnums e : StopPregEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); + } + return list; + } + + public static String getNameById(int id) { + for (StopPregEnums e : StopPregEnums.values()) { + if(e.getId() == id) + { + return e.getName(); + } + } + return ""; + } +} 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 2d27ab6..e870ed9 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 @@ -450,6 +450,23 @@ public class DateUtil { } + /** + * 获取当前日期是星期几
+ * + * @param dt + * @return 当前日期是星期几 + */ + public static String getWeekOfDate(Date dt) { + String[] weekDays = {"星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"}; + Calendar cal = Calendar.getInstance(); + cal.setTime(dt); + System.out.println(cal.get(Calendar.DAY_OF_WEEK)); + int w = cal.get(Calendar.DAY_OF_WEEK) - 1; + if (w < 0) + w = 0; + return weekDays[w]; + } + public static void main(String[] arg) { /* Date today = new Date(1448336360000L); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java new file mode 100644 index 0000000..82d7750 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java @@ -0,0 +1,305 @@ +package com.lyms.platform.common.utils; + +import java.io.*; +import java.net.ConnectException; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLConnection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +/** + * Created by lqy on 2016/7/5. + */ +public class HttpRequest { + /** + * 向指定URL发送GET方法的请求 + * @param url + * 发送请求的URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return URL 所代表远程资源的响应结果 + */ + public static String sendGet(String url, String param) { + String result = ""; + BufferedReader in = null; + try { + String urlNameString = url + "?" + param; + URL realUrl = new URL(urlNameString); + // 打开和URL之间的连接 + URLConnection connection = realUrl.openConnection(); + // 设置通用的请求属性 + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + connection.setRequestProperty("Authorization", "healthbaby2015"); + // 建立实际的连接 + connection.connect(); + // 获取所有响应头字段 + Map> map = connection.getHeaderFields(); + // 遍历所有的响应头字段 + for (String key : map.keySet()) { + System.out.println(key + "--->" + map.get(key)); + } + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader( + connection.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送GET请求出现异常！" + e); + e.printStackTrace(); + } + // 使用finally块来关闭输入流 + finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception e2) { + e2.printStackTrace(); + } + } + return result; + } + /** + * 向指定URL发送GET方法的请求 + * @param url + * 发送请求的URL + * @param params + * 请求参数 + * @return URL 所代表远程资源的响应结果 + */ + public static String sendGet(String url, Map params,Map headers) { + String result = ""; + BufferedReader in = null; + StringBuffer sb = new StringBuffer(); + if(params!=null && !params.isEmpty()) { + Iterator keys = params.keySet().iterator(); + while(keys.hasNext()){ + String key = keys.next(); + String value = params.get(key); + if(sb.length()==0)sb.append("?"); + else sb.append("&"); + sb.append(key+"="+value); + } + } + try { + + URL realUrl = new URL(url +sb); + // 打开和URL之间的连接 + URLConnection connection = realUrl.openConnection(); + // 设置通用的请求属性 + connection.setRequestProperty("accept", "*/*"); + connection.setRequestProperty("connection", "Keep-Alive"); + connection.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + connection.setRequestProperty("Accept-Charset", "utf-8"); + if(headers!=null && !headers.isEmpty()) { + Iterator keys = headers.keySet().iterator(); + while(keys.hasNext()){ + String key = keys.next(); + String value = headers.get(key); + System.out.println(key+"====="+value); + connection.setRequestProperty(key,value); + } + } +// connection.setRequestProperty("Authorization", "healthbaby2015"); + // 建立实际的连接 + connection.connect(); + // 获取所有响应头字段 + Map> map = connection.getHeaderFields(); + // 遍历所有的响应头字段 + for (String key : map.keySet()) { + System.out.println(key + "--->" + map.get(key)); + } + // 定义 BufferedReader输入流来读取URL的响应 + in = new BufferedReader(new InputStreamReader( + connection.getInputStream(),"utf-8")); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送GET请求出现异常！" + e); + e.printStackTrace(); + } + // 使用finally块来关闭输入流 + finally { + try { + if (in != null) { + in.close(); + } + } catch (Exception e2) { + e2.printStackTrace(); + } + } + return result; + } + + /** + * 向指定 URL 发送POST方法的请求 + * + * @param url + * 发送请求的 URL + * @param param + * 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。 + * @return 所代表远程资源的响应结果 + */ + public static String sendPost(String url, String param) { + PrintWriter out = null; + BufferedReader in = null; + String result = ""; + try { + URL realUrl = new URL(url); + // 打开和URL之间的连接 + URLConnection conn = realUrl.openConnection(); + // 设置通用的请求属性 + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 发送POST请求必须设置如下两行 + conn.setDoOutput(true); + conn.setDoInput(true); + conn.setRequestProperty("Method","POST"); + conn.setRequestProperty("Charset", "UTF-8"); + // 获取URLConnection对象对应的输出流 + out = new PrintWriter(conn.getOutputStream()); + // 发送请求参数 + out.print(param); + // flush输出流的缓冲 + out.flush(); + // 定义BufferedReader输入流来读取URL的响应 + in = new BufferedReader( + new InputStreamReader(conn.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送 POST 请求出现异常！"+e); + e.printStackTrace(); + } + //使用finally块来关闭输出流、输入流 + finally{ + try{ + if(out!=null){ + out.close(); + } + if(in!=null){ + in.close(); + } + } + catch(IOException ex){ + ex.printStackTrace(); + } + } + return result; + } + + public static String sendPost(String url, String param,String auth) { + PrintWriter out = null; + BufferedReader in = null; + String result = ""; + try { + URL realUrl = new URL(url); + // 打开和URL之间的连接 + URLConnection conn = realUrl.openConnection(); + // 设置通用的请求属性 + conn.setRequestProperty("accept", "*/*"); + conn.setRequestProperty("connection", "Keep-Alive"); + conn.setRequestProperty("Authorization",auth); + conn.setRequestProperty("Content-Type","application/json"); + conn.setRequestProperty("user-agent", + "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); + // 发送POST请求必须设置如下两行 + conn.setDoOutput(true); + conn.setDoInput(true); + conn.setRequestProperty("Method","POST"); + conn.setRequestProperty("Charset", "UTF-8"); + // 获取URLConnection对象对应的输出流 + out = new PrintWriter(conn.getOutputStream()); + // 发送请求参数 + out.print(param); + // flush输出流的缓冲 + out.flush(); + // 定义BufferedReader输入流来读取URL的响应 + in = new BufferedReader( + new InputStreamReader(conn.getInputStream())); + String line; + while ((line = in.readLine()) != null) { + result += line; + } + } catch (Exception e) { + System.out.println("发送 POST 请求出现异常！"+e); + e.printStackTrace(); + } + //使用finally块来关闭输出流、输入流 + finally{ + try{ + if(out!=null){ + out.close(); + } + if(in!=null){ + in.close(); + } + } + catch(IOException ex){ + ex.printStackTrace(); + } + } + return result; + } + + public static String Send(String sendUrl,String param){ + String retValue = null; + HttpURLConnection con = null; + URL url = null; + try { + url = new URL(sendUrl); + con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("POST"); + con.setDoInput(true); + con.setDoOutput(true); + PrintWriter out = new PrintWriter(con.getOutputStream()); + out.println(param); + out.flush(); + DataInputStream bin = new DataInputStream(con.getInputStream()); + StringBuffer buff = new StringBuffer(); + String line; + while ( (line = bin.readLine()) != null) { + buff.append(line+"\n"); + } + retValue = buff.toString(); + out.close(); + bin.close(); + con.disconnect(); + } + catch (ConnectException ce) {ce.printStackTrace();} + catch (IOException ie) {ie.printStackTrace();} + catch (Exception e) {e.printStackTrace();} + return retValue; + } + + public static void main(String[] args) { +// sendGet("http://localhost:8080/message_develop/sendMMS","id=222222"); +// String str = sendGet("http://data.api.healthbaby.com.cn/v1/messages","hospitalId=1&tagName=,高血压,&page=1&limit=9999"); + Map headers = new HashMap(); + headers.put("Authorization", "healthbaby2015"); + Map params = new HashMap(); + params.put("hospitalId", "e66aafcf-1be5-4cd0-89bc-cf65db7297cc"); + params.put("tagName", "1周"); + params.put("page", "1"); + params.put("limit", "999"); + + String str = sendGet("http://data.api.healthbaby.com.cn/v1/messages", + params,headers); + System.out.println(str); + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index c85cf98..9b96c95 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -31,4 +31,17 @@ public final class StringUtils { } return false; } + + /** + * //+表示1个或多个（如"3"或"225"），*表示0个或多个（[0-9]*）（如""或"1"或"22"）， + * ?表示0个或1个([0-9]?)(如""或"7") + * @param str + * @return + */ + public static boolean isNum(String str){ + if(!isEmpty(str)){ + return str.matches("[0-9]+"); + } + return false; + } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index e1900a1..e5d967e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -186,6 +186,17 @@ public class BabyModel extends BaseModel { //体验类型 private Integer expType; + //person表的主键 + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Integer getExpType() { return expType; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index e095e0e..01fca93 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -219,6 +219,17 @@ public class Patients extends BaseModel { //体验类型 private Integer expType; + //person表主键 + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Integer getExpType() { return expType; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java new file mode 100644 index 0000000..b6351fa --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PersonModel.java @@ -0,0 +1,115 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 基本信息 + * + * @author lqy + */ +@Document(collection = "lyms_person") +public class PersonModel extends BaseModel { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private String id; + + //姓名 + private String name; + + //身份证号 + private String cardNo; + + //手机 + private String phone; + + //生日 + private Date birth; + + //类型 1 孕妇 2 儿童 + private Integer type; + + private Date created; + + private Date modified; + + private Integer yn; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Date getBirth() { + return birth; + } + + public void setBirth(Date birth) { + this.birth = birth; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java new file mode 100644 index 0000000..816ebbf --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java @@ -0,0 +1,107 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 终止妊娠对象 + * Created by Administrator on 2016/7/5. + */ +@Document(collection = "lyms_stoppreg") +public class StopPregModel extends BaseModel { + private String id; + //孕妇建档id + private String pid; + + //终止原因 + private String stopReason; + + //备注 + private String remark; + + //终止妊娠日期 + private Date stopDate; + + //录入人 + private String inPerson; + + private Integer yn; + + private Date created; + + private Date modified; + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getStopReason() { + return stopReason; + } + + public void setStopReason(String stopReason) { + this.stopReason = stopReason; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getStopDate() { + return stopDate; + } + + public void setStopDate(Date stopDate) { + this.stopDate = stopDate; + } + + public String getInPerson() { + return inPerson; + } + + public void setInPerson(String inPerson) { + this.inPerson = inPerson; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SmsConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SmsConfigQuery.java index 97c995a..4b584f1 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SmsConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SmsConfigQuery.java @@ -34,6 +34,9 @@ public class SmsConfigQuery extends BaseQuery implements IConvertToNativeQuery { //医院ID private Integer hospitalId; + //指导发送时间 周几发送 + private String guideTime; + @Override public MongoQuery convertToQuery() { @@ -48,9 +51,21 @@ public class SmsConfigQuery extends BaseQuery implements IConvertToNativeQuery { if (-1 != yn) { condition = condition.and("yn", yn, MongoOper.IS); } + if (null != guideTime) { + condition = condition.and("guideTime", guideTime, MongoOper.LIKE); + } return condition.toMongoQuery(); } + + public String getGuideTime() { + return guideTime; + } + + public void setGuideTime(String guideTime) { + this.guideTime = guideTime; + } + public String getId() { return id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java new file mode 100644 index 0000000..fd3ff7f --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java @@ -0,0 +1,109 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.result.BaseModel; +import org.bson.types.ObjectId; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.List; + +/** + * 终止妊娠查询对象 + * Created by lqy on 2016/7/5. + */ +public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery { + private String id; + //孕妇建档id + private String pid; + + //终止原因 + private List stopReason; + + //备注 + private String remark; + + //终止妊娠日期 + private String stopDate; + + //录入人 + private String inPerson; + + private Integer yn; + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if (null != pid) { + condition = condition.and("pid", pid, MongoOper.IS); + } + if (null != id) { + condition = condition.and("id", new ObjectId(id), MongoOper.IS); + } + if (-1 != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + + return condition.toMongoQuery(); + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public List getStopReason() { + return stopReason; + } + + public void setStopReason(List stopReason) { + this.stopReason = stopReason; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStopDate() { + return stopDate; + } + + public void setStopDate(String stopDate) { + this.stopDate = stopDate; + } + + public String getInPerson() { + return inPerson; + } + + public void setInPerson(String inPerson) { + this.inPerson = inPerson; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java new file mode 100644 index 0000000..222dadc --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java @@ -0,0 +1,45 @@ +package com.lyms.platform.data.controller; + +import com.lyms.platform.data.pojo.MessageListRequest; +import com.lyms.platform.data.pojo.MessageRequest; +import com.lyms.platform.data.service.SmsService; +import com.lyms.platform.data.util.SaveMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by lqy on 2016/7/5. + */ +@Controller +@RequestMapping("/sms") +public class SmsController extends BaseController { + + @Autowired + private SmsService smsService; + /** + * 生成短信 + * @param response + */ + @RequestMapping(value = "/test") + public void productSms(HttpServletResponse response){ + MessageListRequest list = new MessageListRequest(); + List messages = new ArrayList<>(); + MessageRequest request = new MessageRequest(); + request.setTypeId(1); + request.setContent("aaaa"); + request.setObjType(1); + request.setPhone("123333"); + request.setPlanTime("2015-01-06 15:22:12"); + request.setServiceType(1); + messages.add(request); + list.setTypeId(1); + list.setMessages(messages); + SaveMessageService.saveSmsCenter(list); + writeString(response, "success"); + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageContent.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageContent.java new file mode 100644 index 0000000..f015caf --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageContent.java @@ -0,0 +1,52 @@ +package com.lyms.platform.data.pojo; + +import java.io.Serializable; +import java.util.List; + +/** + * Created by Administrator on 2016/7/5. + */ +public class MessageContent implements Serializable { + private static final long serialVersionUID = 1L; + private String id; + private String content; + private String title; + private List tags; + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + @Override + public String toString() { + return "MessageContent [content=" + content + ", id=" + id + ", Tags=" + + tags + ", title=" + title + "]"; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageListRequest.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageListRequest.java new file mode 100644 index 0000000..6c0b3ec --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageListRequest.java @@ -0,0 +1,28 @@ +package com.lyms.platform.data.pojo; + +import java.util.List; + +/** + * Created by Administrator on 2016/7/5. + */ +public class MessageListRequest { + private Integer typeId; + + private List messages; + + public Integer getTypeId() { + return typeId; + } + + public void setTypeId(Integer typeId) { + this.typeId = typeId; + } + + public List getMessages() { + return messages; + } + + public void setMessages(List messages) { + this.messages = messages; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java new file mode 100644 index 0000000..7108b5c --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageRequest.java @@ -0,0 +1,149 @@ +package com.lyms.platform.data.pojo; + +/** + * Created by Administrator on 2016/7/5. + */ +public class MessageRequest { + private String phone; + private String content; + private Integer typeId; + private Integer status; + private Integer subTypeId; + + private String tableName; + + //计划发送时间 + private String planTime; + + //实际发送时间 + private String actualTime; + + //对象类型 + private Integer objType; + + //短信商 + private Integer serviceType; + + //发送次数 + private Integer sendCount; + + private String ext1; + + private String ext2; + + private String ext3; + + + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public Integer getTypeId() { + return typeId; + } + + public void setTypeId(Integer typeId) { + this.typeId = typeId; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Integer getSubTypeId() { + return subTypeId; + } + + public void setSubTypeId(Integer subTypeId) { + this.subTypeId = subTypeId; + } + + public String getTableName() { + return tableName; + } + + public void setTableName(String tableName) { + this.tableName = tableName; + } + + public String getPlanTime() { + return planTime; + } + + public void setPlanTime(String planTime) { + this.planTime = planTime; + } + + public String getActualTime() { + return actualTime; + } + + public void setActualTime(String actualTime) { + this.actualTime = actualTime; + } + + public Integer getObjType() { + return objType; + } + + public void setObjType(Integer objType) { + this.objType = objType; + } + + public Integer getServiceType() { + return serviceType; + } + + public void setServiceType(Integer serviceType) { + this.serviceType = serviceType; + } + + public Integer getSendCount() { + return sendCount; + } + + public void setSendCount(Integer sendCount) { + this.sendCount = sendCount; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageResponseEntity.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageResponseEntity.java new file mode 100644 index 0000000..f2f5a62 --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/MessageResponseEntity.java @@ -0,0 +1,43 @@ +package com.lyms.platform.data.pojo; + +import java.util.List; + +/** + * Created by Administrator on 2016/7/5. + */ +public class MessageResponseEntity { + private String errormsg; + private PageInfo pageInfo; + private List list ; + private int errorcode; + public String getErrormsg() { + return errormsg; + } + public void setErrormsg(String errormsg) { + this.errormsg = errormsg; + } + + public PageInfo getPageInfo() { + return pageInfo; + } + public void setPageInfo(PageInfo pageInfo) { + this.pageInfo = pageInfo; + } + public List getList() { + return list; + } + public void setList(List list) { + this.list = list; + } + public int getErrorcode() { + return errorcode; + } + public void setErrorcode(int errorcode) { + this.errorcode = errorcode; + } + @Override + public String toString() { + return "MessageResponseEntity [errorcode=" + errorcode + ", errormsg=" + + errormsg + ", list=" + list + ", pageInfo=" + pageInfo + "]"; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/PageInfo.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/PageInfo.java new file mode 100644 index 0000000..7f5e075 --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/PageInfo.java @@ -0,0 +1,60 @@ +package com.lyms.platform.data.pojo; + +/** + *lqy + */ +public class PageInfo { + private int count; + private int lastPage; + private int limit; + private int page; + private int size; + + public int getCount() { + return count; + } + + public void setCount(int count) { + this.count = count; + } + + public int getLastPage() { + return lastPage; + } + + public void setLastPage(int lastPage) { + this.lastPage = lastPage; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getSize() { + return size; + } + + public void setSize(int size) { + this.size = size; + } + + @Override + public String toString() { + return "PageInfo [count=" + count + ", lastPage=" + lastPage + + ", limit=" + limit + ", page=" + page + ", size=" + size + + "]"; + } + +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/pojo/Tag.java b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/Tag.java new file mode 100644 index 0000000..439202c --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/pojo/Tag.java @@ -0,0 +1,36 @@ +package com.lyms.platform.data.pojo; + +import java.io.Serializable; + +/** + * Created by Administrator on 2016/7/5. + */ +public class Tag implements Serializable { + + private static final long serialVersionUID = 1L; + private String tagId; + private String tagName; + + + + public String getTagId() { + return tagId; + } + + public void setTagId(String tagId) { + this.tagId = tagId; + } + + public String getTagName() { + return tagName; + } + + public void setTagName(String tagName) { + this.tagName = tagName; + } + + @Override + public String toString() { + return "Tag [tagId=" + tagId + ", tagName=" + tagName + "]"; + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java new file mode 100644 index 0000000..cdc4ef2 --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/SmsService.java @@ -0,0 +1,9 @@ +package com.lyms.platform.data.service; + +/** + * Created by Administrator on 2016/7/5. + */ +public interface SmsService { + + void productYunAmsSms(); +} 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 new file mode 100644 index 0000000..5b7a758 --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -0,0 +1,61 @@ +package com.lyms.platform.data.service.impl; + +import com.lyms.platform.biz.service.SmsConfigService; +import com.lyms.platform.common.enums.AmsServiceTypeEnum; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.data.pojo.MessageContent; +import com.lyms.platform.data.service.SmsService; +import com.lyms.platform.data.util.AmsMessageService; +import com.lyms.platform.pojo.SmsConfigModel; +import com.lyms.platform.query.SmsConfigQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 短信生成 + * Created by Administrator on 2016/7/5. + */ +@Service("smsService") +public class SmsServiceImpl implements SmsService{ + + @Autowired + private SmsConfigService smsConfigService; + + /** + * 生成孕妇ams指导短信 + */ + @Override + public void productYunAmsSms() { + + SmsConfigQuery query = new SmsConfigQuery(); + query.setYn(YnEnums.YES.getId()); + String week = DateUtil.getWeekOfDate(new Date()); + query.setGuideTime(week); + //查询出对应周几要发送的的医院配置 + List configs = smsConfigService.querySmsConfig(query); + + if (CollectionUtils.isNotEmpty(configs)) + { + for(SmsConfigModel config : configs) + { + Integer hospitalId = config.getHospitalId(); + if (hospitalId == null || hospitalId == 0) + { + continue; + } + + // 查询短信模板 从ams平台配置的短信通过医院ID + Map> mt = AmsMessageService + .getMessageTemplateMap(String.valueOf(hospitalId), + AmsServiceTypeEnum.YUN_GUIDE); + } + } + + } +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java new file mode 100644 index 0000000..2b6db56 --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -0,0 +1,180 @@ +package com.lyms.platform.data.util; + +import com.lyms.platform.common.enums.AmsServiceTypeEnum; +import com.lyms.platform.common.utils.HttpRequest; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.data.pojo.MessageContent; +import com.lyms.platform.data.pojo.MessageResponseEntity; +import com.lyms.platform.data.pojo.Tag; +import org.apache.log4j.Logger; +import org.codehaus.jackson.JsonParseException; +import org.codehaus.jackson.map.JsonMappingException; +import org.codehaus.jackson.map.ObjectMapper; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +/** + * Created by lqy on 2016/7/5. + */ + +/** + * ams 接口服务 + * + */ +public class AmsMessageService { + private static final Logger logger = Logger.getLogger(AmsMessageService.class); + private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages"; + private static final String AUTHORIZATION = "healthbaby2015"; + + + public static List getMessageTemplate(String hospitalId) { + /** + * 1、根据医院id查询医院短信模板 2、String -> jsonObject 3、判断 返回 结果 + */ + Map headers = new HashMap(); + headers.put("Authorization", AUTHORIZATION); + Map params = new HashMap(); + params.put("hospitalId", hospitalId); + params.put("page", "1"); + params.put("limit", "9999"); + String str = HttpRequest.sendGet(AMS_URL, + params, headers); + System.out.println(str); + ObjectMapper om = new ObjectMapper(); + MessageResponseEntity mre = null; + try { + mre = om.readValue(str, MessageResponseEntity.class); + System.out.println(mre); + } catch (JsonParseException e) { + e.printStackTrace(); + } catch (JsonMappingException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + if(mre !=null){ + if(mre.getErrorcode()==0){//成功 + return mre.getList(); + }else{//失败 + logger.error("error info :errorcode="+mre.getErrorcode() + +" errormsg="+mre.getErrormsg()); + } + }else{ + logger.error("接口调用失败!!!"); + } + return null; + } + + + public static Map> getMessageTemplateMap(String hospitalId,AmsServiceTypeEnum serviceType) { + /** + * 1、根据医院id查询医院短信模板 2、String -> jsonObject 3、判断 返回 结果 + */ + Map headers = new HashMap(); + headers.put("Authorization", AUTHORIZATION); + Map params = new HashMap(); + params.put("hospitalId", hospitalId); + params.put("page", "1"); + params.put("limit", "9999"); + String str = HttpRequest.sendGet(AMS_URL, + params, headers); + System.out.println(str); + ObjectMapper om = new ObjectMapper(); + MessageResponseEntity mre = null; + Map> map = new HashMap>(); + try { + mre = om.readValue(str, MessageResponseEntity.class); + System.out.println(mre); + } catch (JsonParseException e) { + e.printStackTrace(); + } catch (JsonMappingException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + if(mre !=null){ + if(mre.getErrorcode()==0){//成功 + List mcs=mre.getList(); + for(int i = 0;i tags = mc.getTags(); + for (int j = 0; j < tags.size(); j++) { + Tag tag=tags.get(j); + String type = getTagType(tag, serviceType); + if(!StringUtils.isEmpty(type)){ + List list = map.get(type); + if(list==null){ + list = new ArrayList(); + } + list.add(mc); + map.put(type, list); + }else continue; + } + } + }else{//失败 + logger.error("error info :errorcode="+mre.getErrorcode() + +" errormsg="+mre.getErrormsg()); + } + }else{ + logger.error("接口调用失败!!!"); + } + return map; + } + + public static String getTagType(Tag tag,AmsServiceTypeEnum serviceType){ + String re = null; + if(tag==null) return re; + String tagName = tag.getTagName(); + switch (serviceType) { + case CHILD_GUIDE: + boolean boo = tagName.endsWith("周"); + if(boo) { + String str = tagName.substring(0,tagName.length()-1); + if(StringUtils.isNum(str)){ + re = str; + } + } + break; + case YUN_GUIDE: + boolean end = tagName.endsWith("周"); + boolean start = tagName.startsWith("孕"); + if(start&&end) { + String str = tagName.substring(1,tagName.length()-1); + if(StringUtils.isNum(str)){ + re = str; + } + } + break; + case CHAN_GUIDE: + end = tagName.endsWith("周"); + start = tagName.startsWith("产后"); + if(start&&end) { + String str = tagName.substring(2,tagName.length()-1); + if(StringUtils.isNum(str)){ + re = str; + } + } + break; + case YUN_WARN: + end = tagName.endsWith("周"); + start = tagName.startsWith("孕"); + if(!start && !end) { + re = tagName; + } + break; + default: + break; + } + return re; + } + + + public static void main(String[] args) { + getMessageTemplateMap("8be01f59-ad25-4ae6-968d-8450c9421e0b", + AmsServiceTypeEnum.CHILD_GUIDE); + } + +} diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java new file mode 100644 index 0000000..c8eed26 --- /dev/null +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java @@ -0,0 +1,41 @@ +package com.lyms.platform.data.util; + +import com.lyms.platform.common.utils.HttpRequest; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.data.pojo.MessageListRequest; +import com.lyms.platform.data.pojo.MessageRequest; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Administrator on 2016/7/5. + */ +public class SaveMessageService { + + public static final String URL = "http://localhost:8090/v1/saveCreatedSMS"; + + public static boolean saveSmsCenter(MessageListRequest list) + { + String json = JsonUtil.obj2JsonString(list); + String result = HttpRequest.sendPost(URL,json,"YMer2016"); + return false; + } + + public static void main(String[] areg) + { + MessageListRequest list = new MessageListRequest(); + List messages = new ArrayList<>(); + MessageRequest request = new MessageRequest(); + request.setTypeId(1); + request.setContent("aaaa"); + request.setObjType(1); + request.setPhone("123333"); + request.setPlanTime("2015-01-06 15:22:12"); + request.setServiceType(1); + messages.add(request); + list.setTypeId(1); + list.setMessages(messages); + saveSmsCenter(list); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java new file mode 100644 index 0000000..e9233a3 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java @@ -0,0 +1,63 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.StopPregnancyFacade; +import com.lyms.platform.operate.web.request.StopPregRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * 终止妊娠 + * Created by lqy on 2016/7/5. + */ +@Controller +public class StopPregnancyController extends BaseController { + + + @Autowired + private StopPregnancyFacade stopPregnancyFacade; + + /** + * 添加/更新 终止妊娠 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addOrUpStopPreg") + @ResponseBody + public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest request) { + if (!StringUtils.isEmpty(request.getId())) + { + return stopPregnancyFacade.updateStopPreg(request); + } + return stopPregnancyFacade.addStopPreg(request); + } + + /** + *查询终止妊娠记录 + * @param pid 孕妇建档Id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{pid}") + @ResponseBody + public BaseResponse queryStopPreg(@PathVariable("pid")String pid) { + return stopPregnancyFacade.queryStopPreg(pid); + } + + + /** + * 返回该医院可选择的录入人 + * @param hospitalId 医院Id + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryStopPreg/{hospitalId}") + @ResponseBody + public BaseResponse queryInPerson(@PathVariable("hospitalId")Integer hospitalId) { + return stopPregnancyFacade.queryInPerson(hospitalId); + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 3dfe2ae..2a52a06 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.dal.IPersonDao; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -55,6 +56,10 @@ public class BabyBookbuildingFacade { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + + @Autowired + private PersonService personService; + /** * 修改儿童建档 * @param request @@ -63,6 +68,20 @@ public class BabyBookbuildingFacade { public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request) { BabyModel model = getBabyModel(request); model.setModified(new Date()); + if (!StringUtils.isEmpty(request.getPid())) + { + PersonModel pmodel = new PersonModel(); + pmodel.setName(request.getBabyName()); + pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday())); + pmodel.setPhone(request.getMommyPhone()); + pmodel.setCardNo(request.getMommyCertificateNum()); + pmodel.setType(1); + pmodel.setYn(YnEnums.YES.getId()); + pmodel.setModified(new Date()); + personService.updatePerson(pmodel, request.getPid()); + } + + babyBookbuildingService.updateBabyBuild(model, request.getId()); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -115,7 +134,20 @@ public class BabyBookbuildingFacade { patients = yunBookbuildingService.addPregnantBookbuilding(patient); } + + PersonModel pmodel = new PersonModel(); + pmodel.setName(request.getBabyName()); + pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday())); + pmodel.setPhone(request.getMommyPhone()); + pmodel.setCardNo(request.getMommyCertificateNum()); + pmodel.setType(1); + pmodel.setYn(YnEnums.YES.getId()); + pmodel.setModified(new Date()); + pmodel.setCreated(new Date()); + PersonModel resultModel = personService.addPerson(pmodel); + BabyModel model = getBabyModel(request); + model.setPid(resultModel.getId()); model.setParentId(patients.getId()); model.setCreated(new Date()); 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 079adb9..e63e025 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 @@ -1,8 +1,11 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.dal.IPersonDao; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.PersonService; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; @@ -12,6 +15,7 @@ import com.lyms.platform.operate.web.result.PregnantInfoResult; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.PersonModel; import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; @@ -42,6 +46,10 @@ public class BookbuildingFacade { @Autowired private OrganizationService organizationService; + + @Autowired + private PersonService personService; + /** * 添加孕妇建档 * @param yunRequest @@ -65,7 +73,23 @@ public class BookbuildingFacade { return br; } + PersonModel pmodel = new PersonModel(); + pmodel.setName(yunRequest.getPregnantName()); + pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday())); + pmodel.setPhone(yunRequest.getPregnantPhone()); + pmodel.setCardNo(yunRequest.getPregnantCertificateNum()); + pmodel.setType(1); + pmodel.setYn(YnEnums.YES.getId()); + pmodel.setCreated(new Date()); + pmodel.setModified(new Date()); + PersonModel resperson = personService.addPerson(pmodel); + Patients patient = getPatientsData(yunRequest); + if (resperson != null) + { + patient.setPid(resperson.getId()); + } + patient.setCreated(new Date()); patient.setModified(new Date()); Patients p = yunBookbuildingService.addPregnantBookbuilding(patient); @@ -74,7 +98,8 @@ public class BookbuildingFacade { { br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); br.setErrormsg("失败"); - + return br; + } br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); @@ -92,6 +117,20 @@ public class BookbuildingFacade { Patients patient = getPatientsData(yunRequest); patient.setModified(new Date()); + + if (!StringUtils.isEmpty(yunRequest.getPid())) + { + PersonModel pmodel = new PersonModel(); + pmodel.setName(yunRequest.getPregnantName()); + pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday())); + pmodel.setPhone(yunRequest.getPregnantPhone()); + pmodel.setCardNo(yunRequest.getPregnantCertificateNum()); + pmodel.setType(1); + pmodel.setYn(YnEnums.YES.getId()); + pmodel.setModified(new Date()); + personService.updatePerson(pmodel,yunRequest.getPid()); + } + yunBookbuildingService.updatePregnant(patient, id); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java new file mode 100644 index 0000000..7d86b37 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -0,0 +1,242 @@ +package com.lyms.platform.operate.web.facade; + +import com.lyms.platform.biz.service.AntenatalExaminationService; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.StopPregnancyService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.StopPregEnums; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.StopPregRequest; +import com.lyms.platform.operate.web.result.AntexListResult; +import com.lyms.platform.operate.web.result.StopPregResult; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.model.UsersQuery; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.StopPregModel; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.StopPregQuery; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.*; + +/** + * Created by Administrator on 2016/7/5. + */ +@Component +public class StopPregnancyFacade { + + @Autowired + private StopPregnancyService stopPregnancyService; + + @Autowired + private UsersService usersService; + + @Autowired + private AntenatalExaminationService antenatalExaminationService; + @Autowired + private PatientsService patientsService; + + @Autowired + private BasicConfigService basicConfigService; + + /** + * 更新终止妊娠 + * @param request + * @return + */ + public BaseResponse updateStopPreg(StopPregRequest request) { + StopPregModel model = getStopPregModel(request); + model.setModified(new Date()); + + stopPregnancyService.updateStopPreg(model,request.getId()); + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + /** + * 添加终止妊娠 + * @param request + * @return + */ + public BaseResponse addStopPreg(StopPregRequest request) { + + StopPregModel model = getStopPregModel(request); + model.setCreated(new Date()); + model.setModified(new Date()); + + stopPregnancyService.addStopPreg(model); + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + private StopPregModel getStopPregModel(StopPregRequest request) { + StopPregModel model = new StopPregModel(); + + model.setPid(request.getPid()); + model.setYn(YnEnums.YES.getId()); + model.setInPerson(request.getInPerson()); + model.setRemark(request.getRemark()); + model.setStopDate(DateUtil.parseYMD(request.getStopDate())); + model.setStopReason(JsonUtil.obj2JsonString(request.getStopReason())); + + return model; + } + + + /** + * 查询终止妊娠 + * @param pid + * @return + */ + public BaseResponse queryStopPreg(String pid) { + + Map map = new HashMap(); + StopPregQuery query = new StopPregQuery(); + query.setYn(YnEnums.YES.getId()); + query.setPid(pid); + StopPregResult result = null; + List stopPregs = stopPregnancyService.queryStopPreg(query); + if (CollectionUtils.isNotEmpty(stopPregs)) + { + StopPregModel model = stopPregs.get(0); + result = new StopPregResult(); + result.setPid(model.getPid()); + result.setRemark(model.getRemark()); + result.setId(model.getId()); + result.setStopDate(DateUtil.getyyyy_MM_dd(model.getStopDate())); + result.setStopReason(JsonUtil.str2Obj(model.getStopReason(), Map.class)); + + String inperson = model.getInPerson(); + Map pmap = new HashMap(); + if (!StringUtils.isEmpty(inperson)) + { + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setId(Integer.parseInt(inperson)); + List users = usersService.queryUsers2(usersQuery); + if (CollectionUtils.isNotEmpty(users)) + { + pmap.put("inPerson",inperson); + pmap.put("personName", users.get(0) == null ? "" : users.get(0).getName()); + } + + } + result.setInPerson(pmap); + } + + //查询孕妇的基本信息 + AntexListResult antexListResult = null; + if(!StringUtils.isEmpty(pid)) + { + Patients patients = null; + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setId(pid); + patientsQuery.setYn(YnEnums.YES.getId()); + + List listPatiens = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(listPatiens)) { + patients = listPatiens.get(0); + } + + if (null != patients) { + antexListResult = new AntexListResult(); + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setParentId(patients.getId()); + antExChuQuery.setYn(YnEnums.YES.getId()); + //获取初诊记录 + List antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery); + AntExChuModel antExChuModel = null; + if (CollectionUtils.isNotEmpty(antExChulist)) { + antExChuModel = antExChulist.get(0); + } + //查询产前检查记录 + List list = antenatalExaminationService.findAllByParentId(patients.getId()); + List data = new ArrayList(); + if (null != antExChuModel && org.apache.commons.lang.StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { + List l = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); + data = queryRiskName(l); + } + + antexListResult.convertToResult(list, patients, antExChuModel); + + antexListResult.setRiskFactor(data); + } + + } + + + //原因枚举 + map.put("stopPregEnums", StopPregEnums.getStopPregEnums()); + + //终止妊娠信息 + map.put("stopPregInfo", result); + + //终止妊娠初始化时间 + map.put("stopPregDate", DateUtil.getyyyy_MM_dd(new Date())); + + //孕妇基本信息 + map.put("patientInfo",antexListResult); + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(map); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + private List queryRiskName(List l) { + List data = new ArrayList(); + for (int i = 0; i < l.size(); i++) { + String key = (String) l.get(i); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(key); + if (null != basicConfig) { + data.add(basicConfig.getName()); + } + } + return data; + } + + /** + * 返回该医院可选择的录入人 + * @param hospitalId + * @return + */ + public BaseResponse queryInPerson(Integer hospitalId) { + + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setOrgId(hospitalId); + List users = usersService.queryUsers2(usersQuery); + Map pmap = new HashMap(); + if (CollectionUtils.isNotEmpty(users)) + { + for(Users user : users) + { + pmap.put("id",user.getId()); + pmap.put("name",user.getName()); + } + } + + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(pmap); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index bdc7bd4..2bb34de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -152,6 +152,17 @@ public class BabyBookbuildingAddRequest { //是否高危 0 非高危 1高危 private Integer highRisk; + //person表 + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public void setDeliverOrg(String deliverOrg) { this.deliverOrg = deliverOrg; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java new file mode 100644 index 0000000..f2cb9b7 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java @@ -0,0 +1,83 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.FormParam; +import org.hibernate.validator.constraints.NotEmpty; + +import java.util.List; +import java.util.Map; + +/** + * 终止妊娠对象 + * Created by Administrator on 2016/7/5. + */ +public class StopPregRequest { + private String id; + //孕妇建档id + @FormParam + @NotEmpty(message = "孕妇建档id不能为空.") + private String pid; + + //终止原因 + private Map stopReason; + + //备注 + private String remark; + + //终止妊娠日期 + @FormParam + @NotEmpty(message = "终止妊娠日期不能为空.") + private String stopDate; + + //录入人 + @FormParam + @NotEmpty(message = "录入人不能为空.") + private String inPerson; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public Map getStopReason() { + return stopReason; + } + + public void setStopReason(Map stopReason) { + this.stopReason = stopReason; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStopDate() { + return stopDate; + } + + public void setStopDate(String stopDate) { + this.stopDate = stopDate; + } + + public String getInPerson() { + return inPerson; + } + + public void setInPerson(String inPerson) { + this.inPerson = inPerson; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 8e8362b..24abab9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -27,6 +27,8 @@ public class YunBookbuildingAddRequest { //民族 private String pregnantNationId; //生日 + @FormParam + @NotEmpty(message = "生日不能为空.") private String birthday; //户籍类型 private String pregnantCensusTypeId; @@ -153,6 +155,18 @@ public class YunBookbuildingAddRequest { //孕妇体验类型 private Integer expType; + //person表主键 + @FormParam + private String pid; + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Integer getExpType() { return expType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java new file mode 100644 index 0000000..6eb113d --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java @@ -0,0 +1,73 @@ +package com.lyms.platform.operate.web.result; + + +import java.util.Map; + +/** + * Created by Administrator on 2016/7/5. + */ +public class StopPregResult { + private String id; + //孕妇建档id + private String pid; + + //终止原因 + private Map stopReason; + + //备注 + private String remark; + + //终止妊娠日期 + private String stopDate; + + //录入人 + private Map inPerson; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public Map getStopReason() { + return stopReason; + } + + public void setStopReason(Map stopReason) { + this.stopReason = stopReason; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStopDate() { + return stopDate; + } + + public void setStopDate(String stopDate) { + this.stopDate = stopDate; + } + + public Map getInPerson() { + return inPerson; + } + + public void setInPerson(Map inPerson) { + this.inPerson = inPerson; + } +} -- 1.8.3.1