shiyang / regional-platform

Download as
Browse Code »

Commit bf57890a2045336d8c78f7cddcc7bfcc64f14f02

Authored by jiangjiazhi
2 parents ae0d051141 feb0d4c41f
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 18 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ProjectTypeEnums.java View file @ bf57890
... ... @@ -9,7 +9,7 @@
9 9 public enum ProjectTypeEnums {
10 10  
11 11  
12   - YNXT(4,"院内系统web版"),QYPT(5,"区域平台");
  12 + YNXT(5,"院内系统web版"),QYPT(4,"区域平台");
13 13  
14 14 ProjectTypeEnums(int id, String name) {
15 15 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ bf57890
... ... @@ -742,8 +742,12 @@
742 742 // System.out.println(s);
743 743 // Date s = addDay(parseYMD("2016-02-26"), 168);
744 744  
745   - Date startDate = DateUtil.getNewDate(-0,"天",0);
746   - Date endDate = DateUtil.getNewDate(-5,"天",0);
  745 + int start = 0;
  746 + int end = 1;
  747 +
  748 +
  749 + Date startDate = DateUtil.getNewDate(-end-1,"周",0);
  750 + Date endDate = DateUtil.getNewDate(-start,"周",0);
747 751  
748 752 System.out.println(startDate + "==="+ endDate);
749 753 } catch (Exception e)
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ bf57890
... ... @@ -163,7 +163,17 @@
163 163 {
164 164 if (StringUtils.isNotEmpty(repalceStr))
165 165 {
166   - return repalceStr.replace("{{姓名}}",name);
  166 + return repalceStr.replace("{{姓名}}", name);
  167 + }
  168 + return repalceStr;
  169 + }
  170 +
  171 + public static String replaceBaby(String name,Date birth,String repalceStr)
  172 + {
  173 + if (StringUtils.isNotEmpty(repalceStr))
  174 + {
  175 + String date = DateUtil.getyyyy_MM_dd(birth);
  176 + return repalceStr.replace("{{姓名}}",name).replace("{{出生日期}}",date);
167 177 }
168 178 return repalceStr;
169 179 }
platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ bf57890
... ... @@ -23,9 +23,10 @@
23 23 @RequestMapping(value = "/template")
24 24 public void productSms(HttpServletResponse response){
25 25 smsService.productTemplateSms();
26   - smsService.productChanAmsSms();
27   - smsService.productYunAmsSms();
28   - smsService.productChildAmsSms();
  26 +
  27 +// smsService.productChanAmsSms();
  28 +// smsService.productYunAmsSms();
  29 +// smsService.productChildAmsSms();
29 30  
30 31 // MessageListRequest list = new MessageListRequest();
31 32 // List<MessageRequest> messages = new ArrayList<>();
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ bf57890
... ... @@ -623,7 +623,7 @@
623 623 SmsConfigQuery configQuery = new SmsConfigQuery();
624 624 configQuery.setYn(YnEnums.YES.getId());
625 625 configQuery.setPrefixTypes(new Integer[]{0, 1});
626   - configQuery.setHospitalId(221+"");
  626 +// configQuery.setHospitalId(221+"");
627 627  
628 628 //查询出对应医院配置
629 629 List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery);
... ... @@ -1116,7 +1116,7 @@
1116 1116  
1117 1117 if (start != null && end != null)
1118 1118 {
1119   - Date startDate = DateUtil.getNewDate(-end, "月", sendTimeType);
  1119 + Date startDate = DateUtil.getNewDate(-end-1, "月", sendTimeType);
1120 1120 Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType);
1121 1121 babyModelQuery.setBirthStart(startDate);
1122 1122 babyModelQuery.setBirthEnd(endDate);
... ... @@ -1250,7 +1250,7 @@
1250 1250 Integer end = template.getEnd();
1251 1251 if (start != null && end != null)
1252 1252 {
1253   - Date startDate = DateUtil.getNewDate(-end,"月",sendTimeType);
  1253 + Date startDate = DateUtil.getNewDate(-end-1,"月",sendTimeType);
1254 1254 Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType);
1255 1255 babyModelQuery.setBirthStart(startDate);
1256 1256 babyModelQuery.setBirthEnd(endDate);
... ... @@ -1577,23 +1577,24 @@
1577 1577 }
1578 1578 }
1579 1579 //产妇为分娩日期
1580   - else if (sendDateType == SendDateEnums.TSRQ.getId())
1581   - {
1582   - Integer specialDateType = template.getSpecialDateType();
1583   - if (specialDateType == SpecialDateEnums.FM.getId())
1584   - {
1585   - //分娩都为分娩后第二天发送短信
1586   - Date dueDate = DateUtil.addDay(new Date(),-1);
1587   - //把时间格式化成 yyyy_MM_dd 的日期
1588   - dueDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(dueDate));
1589   -
1590   - patientsQuery.setDueDateStart(dueDate);
1591   - patientsQuery.setDueDateEnd(dueDate);
1592   -
1593   - messages.addAll(getChanMessageRequestList(patientsQuery, config, template));
1594   - }
1595   -
1596   - }
  1580 + //在填写分娩记录处生成
  1581 +// else if (sendDateType == SendDateEnums.TSRQ.getId())
  1582 +// {
  1583 +// Integer specialDateType = template.getSpecialDateType();
  1584 +// if (specialDateType == SpecialDateEnums.FM.getId())
  1585 +// {
  1586 +// //分娩都为分娩后第二天发送短信
  1587 +// Date dueDate = DateUtil.addDay(new Date(),-1);
  1588 +// //把时间格式化成 yyyy_MM_dd 的日期
  1589 +// dueDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(dueDate));
  1590 +//
  1591 +// patientsQuery.setDueDateStart(dueDate);
  1592 +// patientsQuery.setDueDateEnd(dueDate);
  1593 +//
  1594 +// messages.addAll(getChanMessageRequestList(patientsQuery, config, template));
  1595 +// }
  1596 +//
  1597 +// }
1597 1598  
1598 1599 }
1599 1600 }
platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java View file @ bf57890
... ... @@ -27,6 +27,7 @@
27 27 public class AmsMessageService {
28 28 private static final Logger logger = Logger.getLogger(AmsMessageService.class);
29 29 private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages";
  30 +//private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages";
30 31 private static final String AUTHORIZATION = "healthbaby2015";
31 32  
32 33  
... ... @@ -181,7 +182,7 @@
181 182  
182 183  
183 184 public static void main(String[] args) {
184   - getMessageTemplateMap("241",
  185 + getMessageTemplateMap("221",
185 186 AmsServiceTypeEnum.CHILD_GUIDE);
186 187 }
187 188  
platform-data-api/src/main/resources/config.properties View file @ bf57890
... ... @@ -2,5 +2,5 @@
2 2 center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
3 3  
4 4 #区域平台访问短信中心的token
5   -center_token=YMer2016
  5 +center_token=e0c56363-00d6-42ee-bbe0-23c553583062
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java View file @ bf57890
... ... @@ -27,6 +27,15 @@
27 27 private String P_IDNUM;
28 28 private Date P_BIRTHDAY;
29 29 private Date CREATED;
  30 + private String SICKTYPE;
  31 +
  32 + public String getSICKTYPE() {
  33 + return SICKTYPE;
  34 + }
  35 +
  36 + public void setSICKTYPE(String SICKTYPE) {
  37 + this.SICKTYPE = SICKTYPE;
  38 + }
30 39  
31 40 public String getP_ID() {
32 41 return P_ID;
platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/HisService.java View file @ bf57890
1 1 package com.lyms.hospitalapi.v2;
2 2  
  3 +import com.lyms.hospitalapi.pojo.PregPatientinfo;
3 4 import com.lyms.platform.common.utils.DateUtil;
4 5 import org.apache.commons.dbutils.DbUtils;
5 6 import org.apache.commons.dbutils.QueryRunner;
6 7  
7 8  
... ... @@ -26,16 +27,16 @@
26 27 Connection conn = ConnTools.makeHisConnection();
27 28 QueryRunner queryRunner = new QueryRunner();
28 29 try {
29   - List<XinlePregPatientinfo> list = queryRunner.query(conn, "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
  30 + List<PregPatientinfo> list = queryRunner.query(conn, "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
30 31 if (list.size() > 0) {
31   - XinlePregPatientinfo info = list.get(0);
  32 + PregPatientinfo info = list.get(0);
32 33 map.put("sickType", info.getSICKTYPE());
33   - map.put("sickId", info.getSICK_ID());
34   - map.put("sex", info.getSEX());
35   - map.put("name", info.getNAME());
36   - map.put("cardNo", info.getIC_CARD_ID());
37   - map.put("phone", info.getASSOCIATION_PHONE());
38   - map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
  34 + map.put("bhnum", info.getP_BHNUM());
  35 + map.put("sex", info.getP_SEX());
  36 + map.put("name", info.getP_NAME());
  37 + map.put("cardNo", info.getP_CARDNO());
  38 + map.put("phone", info.getP_MOBILEPHONE());
  39 + map.put("birth", DateUtil.getyyyy_MM_dd(info.getP_BIRTHDAY()));
39 40 }
40 41 DbUtils.closeQuietly(conn);
41 42 } catch (SQLException e) {
42 43  
43 44  
... ... @@ -52,17 +53,17 @@
52 53 Connection conn = ConnTools.makeHisConnection();
53 54 QueryRunner queryRunner = new QueryRunner();
54 55 try {
55   - List<XinlePregPatientinfo> list = queryRunner.query(conn, "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
  56 + List<PregPatientinfo> list = queryRunner.query(conn, "select * from v_preg_patientinfo where P_CARDNO = '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
56 57 if (list.size() > 0) {
57   - for (XinlePregPatientinfo info:list) {
  58 + for (PregPatientinfo info:list) {
58 59 Map<String,Object> map = new HashMap<>();
59 60 map.put("sickType", info.getSICKTYPE());
60   - map.put("sickId", info.getSICK_ID());
61   - map.put("sex", info.getSEX());
62   - map.put("name", info.getNAME());
63   - map.put("cardNo", info.getIC_CARD_ID());
64   - map.put("phone", info.getASSOCIATION_PHONE());
65   - map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
  61 + map.put("bhnum", info.getP_BHNUM());
  62 + map.put("sex", info.getP_SEX());
  63 + map.put("name", info.getP_NAME());
  64 + map.put("cardNo", info.getP_CARDNO());
  65 + map.put("phone", info.getP_MOBILEPHONE());
  66 + map.put("birth", DateUtil.getyyyy_MM_dd(info.getP_BIRTHDAY()));
66 67 result.add(map);
67 68 }
68 69 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ bf57890
... ... @@ -18,6 +18,7 @@
18 18 import org.springframework.web.bind.annotation.*;
19 19  
20 20 import javax.servlet.http.HttpServletRequest;
  21 +import javax.servlet.http.HttpServletResponse;
21 22 import javax.validation.Valid;
22 23 import java.util.ArrayList;
23 24 import java.util.HashMap;
... ... @@ -91,7 +92,7 @@
91 92 @TokenRequired
92 93 public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
93 94 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
94   - return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1,loginState.getId());
  95 + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, loginState.getId(),"true");
95 96 }
96 97 /**
97 98 *全部孕妇管理
98 99  
99 100  
... ... @@ -104,10 +105,25 @@
104 105 @TokenRequired
105 106 public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
106 107 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
107   - return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId());
  108 + return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId(),"true");
108 109 }
109 110  
  111 +
110 112 /**
  113 + * 导出孕产妇数据
  114 + * @param patientsQueryRequest
  115 + * @param request
  116 + * @return
  117 + */
  118 + @RequestMapping(value = "/exportData", method = RequestMethod.GET)
  119 + @TokenRequired
  120 + public void exportAllPuer(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) {
  121 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  122 + patientFacade.exportAllPuer(patientsQueryRequest,loginState.getId(),response);
  123 + }
  124 +
  125 +
  126 + /**
111 127 * 全部产妇
112 128 *
113 129 * @return
... ... @@ -117,7 +133,7 @@
117 133 @TokenRequired
118 134 public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
119 135 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
120   - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId());
  136 + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId(),"true");
121 137 }
122 138  
123 139 @RequestMapping(value = "/apatients/enums", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ bf57890
... ... @@ -486,12 +486,12 @@
486 486 /**
487 487 * 创建建档短信
488 488 */
489   - private void createBuildSms(BabyModel babyModel)
  489 + public void createBuildSms(BabyModel babyModel)
490 490 {
491 491  
492 492 //判断医院是否启动和对应的服务项是否启用
493 493 SmsConfigModel configModel = new SmsConfigModel();
494   - BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(),configModel);
  494 + BaseResponse response = smsConfigFacade.hospitalIsStart(babyModel.getHospitalId(),configModel,SmsServiceEnums.FWKT.getId());
495 495 if (response != null)
496 496 {
497 497 return;
... ... @@ -609,7 +609,7 @@
609 609 List<MessageRequest> messages = new ArrayList<>();
610 610 MessageRequest mr = new MessageRequest();
611 611 String content = "【" + messagePrefix + "】" + templateModel.getContent();
612   - mr.setContent(StringUtils.replaceName(babyModel.getName(),content));
  612 + mr.setContent(StringUtils.replaceBaby(babyModel.getName(),babyModel.getBirth(),content));
613 613 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
614 614 mr.setPhone(babyModel.getMphone());
615 615 //短信商
616 616  
617 617  
... ... @@ -640,8 +640,92 @@
640 640 }
641 641  
642 642  
  643 + public static void main(String[] args)
  644 + {
643 645  
  646 + Integer serviceType = 1;
  647 + Integer serviceStatus = 3;
  648 + List<SmsTemplateModel> sendList = new ArrayList<>();
  649 + List<SmsTemplateModel> temps = new ArrayList<>();
644 650  
  651 + SmsTemplateModel model = new SmsTemplateModel();
  652 + model.setServiceType(100);
  653 + model.setServiceStatus(7);
  654 + temps.add(model);
  655 +
  656 + if (CollectionUtils.isNotEmpty(temps)) {
  657 +
  658 + for (SmsTemplateModel temp : temps) {
  659 + if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus) {
  660 + sendList.add(temp);
  661 + break;
  662 + }
  663 + }
  664 +
  665 + for (SmsTemplateModel temp : temps) {
  666 + if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId()) {
  667 + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId()) {
  668 + sendList.add(temp);
  669 + break;
  670 + }
  671 + }
  672 + }
  673 +
  674 + for (SmsTemplateModel temp : temps) {
  675 + if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId()) {
  676 + if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
  677 + || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.SUSPEND.getId()) {
  678 + sendList.add(temp);
  679 + break;
  680 + }
  681 + }
  682 + }
  683 +
  684 +
  685 + for (SmsTemplateModel temp : temps) {
  686 + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId()) {
  687 + if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId()) {
  688 + sendList.add(temp);
  689 + break;
  690 + }
  691 + }
  692 + }
  693 +
  694 +
  695 + for (SmsTemplateModel temp : temps) {
  696 + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId()) {
  697 + if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()) {
  698 + sendList.add(temp);
  699 + break;
  700 + }
  701 + }
  702 + }
  703 +
  704 +
  705 + for (SmsTemplateModel temp : temps) {
  706 + if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId()) {
  707 + if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()) {
  708 + sendList.add(temp);
  709 + break;
  710 + }
  711 + }
  712 + }
  713 +
  714 +
  715 + for (SmsTemplateModel temp : temps) {
  716 + if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId()) {
  717 + sendList.add(temp);
  718 + break;
  719 + }
  720 + }
  721 +
  722 + System.out.print(sendList.size());
  723 + }
  724 + }
  725 +
  726 +
  727 +
  728 +
645 729 /**
646 730 * 准备修改和添加的孕妇建档数据
647 731 *
... ... @@ -1556,7 +1640,7 @@
1556 1640  
1557 1641 //判断医院是否启动和对应的服务项是否启用
1558 1642 SmsConfigModel configModel = new SmsConfigModel();
1559   - BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId,configModel);
  1643 + BaseResponse response = smsConfigFacade.hospitalIsStart(hospitalId,configModel,SmsServiceEnums.YSGXHZD.getId());
1560 1644 if (response != null)
1561 1645 {
1562 1646 return response;
... ... @@ -1788,6 +1872,7 @@
1788 1872 cnames.put("monthAge","月龄");
1789 1873 cnames.put("diagnose","高危诊断");
1790 1874 httpServletResponse.setContentType("application/octet-stream");
  1875 + httpServletResponse.setCharacterEncoding("UTF-8");
1791 1876 httpServletResponse.setHeader("Content-Disposition", "attachment;fileName="+"childDatas.xls");
1792 1877 ExcelUtil.toExcel(out,datas,cnames);
1793 1878 } catch (IOException e) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ bf57890
... ... @@ -242,48 +242,14 @@
242 242 private void createBuildSms(Patients patient)
243 243 {
244 244  
245   - OrganizationQuery orgQuery = new OrganizationQuery();
246   - orgQuery.setYn(YnEnums.YES.getId());
247   - orgQuery.setId(Integer.parseInt(patient.getHospitalId()));
248   - List<Organization> list = organizationService.queryOrganization(orgQuery);
249   - boolean isRunning = false;
250   - if (CollectionUtils.isNotEmpty(list))
  245 + //判断医院是否启动和对应的服务项是否启用
  246 + SmsConfigModel configModel = new SmsConfigModel();
  247 + BaseResponse response = smsConfigFacade.hospitalIsStart(patient.getHospitalId(),configModel,SmsServiceEnums.FWKT.getId());
  248 + if (response != null)
251 249 {
252   - Organization org = list.get(0);
253   - if (org != null)
254   - {
255   - Integer status = org.getStatus();
256   - if (status != null && (status == HospitalStatusEnums.SYX.getId() || status == HospitalStatusEnums.ZSYX.getId()))
257   - {
258   - isRunning = true;
259   - }
260   - }
261   - }
262   - if (!isRunning)
263   - {
264 250 return;
265 251 }
266 252  
267   - SmsConfigQuery configQuery = new SmsConfigQuery();
268   - configQuery.setYn(YnEnums.YES.getId());
269   - configQuery.setHospitalId(patient.getHospitalId());
270   - //查询出对应医院配置
271   - List<SmsConfigModel> configs = smsConfigService.querySmsConfig(configQuery);
272   - boolean isStart = false;
273   - if (CollectionUtils.isNotEmpty(configs))
274   - {
275   - String serviceStr = configs.get(0).getSmsService();
276   - if (StringUtils.isNotEmpty(serviceStr))
277   - {
278   - isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr);
279   - }
280   -
281   - }
282   - if (!isStart)
283   - {
284   - return;
285   - }
286   -
287 253 SmsTemplateQuery query = new SmsTemplateQuery();
288 254 query.setYn(YnEnums.YES.getId());
289 255 query.setStatus(1);
290 256  
... ... @@ -338,98 +304,11 @@
338 304 }
339 305 }
340 306  
341   -
342   -// for (SmsTemplateModel temp : temps)
343   -// {
344   -// if (temp.getServiceType() == serviceType && temp.getServiceStatus() == serviceStatus)
345   -// {
346   -// sendList.add(temp);
347   -// break;
348   -// }
349   -// }
350   -//
351   -// for (SmsTemplateModel temp : temps)
352   -// {
353   -// if (temp.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId())
354   -// {
355   -// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() )
356   -// {
357   -// sendList.add(temp);
358   -// break;
359   -// }
360   -// }
361   -// }
362   -//
363   -// for (SmsTemplateModel temp : temps)
364   -// {
365   -// if (temp.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())
366   -// {
367   -// if (serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId()
368   -// || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId()|| serviceStatus == ServiceStatusEnums.SUSPEND.getId())
369   -// {
370   -// sendList.add(temp);
371   -// break;
372   -// }
373   -// }
374   -// }
375   -//
376   -//
377   -// for (SmsTemplateModel temp : temps)
378   -// {
379   -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OPEN.getId())
380   -// {
381   -// if (serviceStatus == ServiceStatusEnums.STANDARD_OPEN.getId() || serviceStatus == ServiceStatusEnums.ADD_OPEN.getId() )
382   -// {
383   -// sendList.add(temp);
384   -// break;
385   -// }
386   -// }
387   -// }
388   -//
389   -//
390   -//
391   -// for (SmsTemplateModel temp : temps)
392   -// {
393   -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_NO_OPEN.getId())
394   -// {
395   -// if (serviceStatus == ServiceStatusEnums.NO_OPEN.getId() || serviceStatus == ServiceStatusEnums.UNSUBSCRIBE.getId() )
396   -// {
397   -// sendList.add(temp);
398   -// break;
399   -// }
400   -// }
401   -// }
402   -//
403   -//
404   -//
405   -// for (SmsTemplateModel temp : temps)
406   -// {
407   -// if (temp.getServiceStatus() == ServiceStatusEnums.ALL_OVERDUE.getId())
408   -// {
409   -// if (serviceStatus == ServiceStatusEnums.STANDARD_OVERDUE.getId() || serviceStatus == ServiceStatusEnums.ADD_OVERDUE.getId() )
410   -// {
411   -// sendList.add(temp);
412   -// break;
413   -// }
414   -// }
415   -// }
416   -//
417   -//
418   -//
419   -// for (SmsTemplateModel temp : temps)
420   -// {
421   -// if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
422   -// {
423   -// sendList.add(temp);
424   -// break;
425   -// }
426   -// }
427   -
428 307 if (CollectionUtils.isNotEmpty(sendList))
429 308 {
430 309  
431 310 //短信前缀
432   - String messagePrefix = smsConfigFacade.getSmsPrefix(configs.get(0), patient.getBookbuildingDoctor());
  311 + String messagePrefix = smsConfigFacade.getSmsPrefix(configModel, patient.getBookbuildingDoctor());
433 312 for (SmsTemplateModel templateModel : sendList)
434 313 {
435 314 if (templateModel != null && templateModel.getStatus() == 1)
... ... @@ -437,7 +316,8 @@
437 316 MessageListRequest smsList = new MessageListRequest();
438 317 List<MessageRequest> messages = new ArrayList<>();
439 318 MessageRequest mr = new MessageRequest();
440   - Date dueDate = DateUtil.addWeek(patient.getLastMenses(),42);
  319 + Date dueDate = DateUtil.addDay(patient.getLastMenses(), 7);
  320 + dueDate = DateUtil.addMonth(dueDate, 9);
441 321 String content = StringUtils.replaceEL(patient.getUsername(),dueDate,templateModel.getContent());
442 322  
443 323 mr.setContent("【"+messagePrefix+"】"+content);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ bf57890
... ... @@ -55,6 +55,9 @@
55 55 @Autowired
56 56 private StopPregnancyService stopPregnancyService;
57 57  
  58 + @Autowired
  59 + private BabyBookbuildingFacade babyBookbuildingFacade;
  60 +
58 61 private static Map<Integer, String> ONE_ENUMS = new HashMap<>();
59 62  
60 63 private static Map<String, List> babyMap = new HashMap<>();
... ... @@ -468,6 +471,7 @@
468 471 babyModel.setPid(personService.addPerson(personModel).getId());
469 472 }
470 473 babyIds.add(babyService.addOneBaby(babyModel).getId());
  474 + babyBookbuildingFacade.createBuildSms(babyModel);
471 475 i++;
472 476 }
473 477 maternalDeliverModel.setBaby(babyList);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ bf57890
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.result.BaseResponse;
9 9 import com.lyms.platform.common.utils.Assert;
10 10 import com.lyms.platform.common.utils.DateUtil;
  11 +import com.lyms.platform.common.utils.ExcelUtil;
11 12 import com.lyms.platform.common.utils.JsonUtil;
12 13 import com.lyms.platform.operate.web.request.*;
13 14 import com.lyms.platform.operate.web.result.*;
... ... @@ -24,9 +25,10 @@
24 25 import org.springframework.data.domain.Sort;
25 26 import org.springframework.stereotype.Component;
26 27  
27   -import java.util.ArrayList;
28   -import java.util.Date;
29   -import java.util.List;
  28 +import javax.servlet.http.HttpServletResponse;
  29 +import java.io.IOException;
  30 +import java.io.OutputStream;
  31 +import java.util.*;
30 32  
31 33 /**
32 34 * Created by Administrator on 2016/4/22 0022.
... ... @@ -196,7 +198,7 @@
196 198 * @param type 控制类型 1孕妇 3产妇
197 199 * @return
198 200 */
199   - public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId) {
  201 + public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type, Integer userId,String needPage) {
200 202 PatientsQuery patientsQuery = new PatientsQuery();
201 203 patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
202 204 patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
... ... @@ -246,7 +248,7 @@
246 248 buildType.add(2);
247 249 patientsQuery.setBuildTypeList(buildType);
248 250 patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
249   - patientsQuery.setNeed("1");
  251 + patientsQuery.setNeed(needPage);
250 252 //查询符合条件的孕妇
251 253 List<Patients> patientses = patientsService.queryPatient1(patientsQuery,"modified");
252 254 List data = new ArrayList<>();
... ... @@ -543,7 +545,7 @@
543 545  
544 546 //判断医院是否启动和对应的服务项是否启用
545 547 SmsConfigModel configModel = new SmsConfigModel();
546   - BaseResponse response = smsConfigFacade.hospitalIsStart(hospital,configModel);
  548 + BaseResponse response = smsConfigFacade.hospitalIsStart(hospital,configModel,SmsServiceEnums.YSGXHZD.getId());
547 549 if (response != null)
548 550 {
549 551 return response;
... ... @@ -592,6 +594,127 @@
592 594 }
593 595 }
594 596 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  597 + }
  598 +
  599 + public void exportAllPuer(RiskPatientsQueryRequest patientsQueryRequest,Integer userId,
  600 + HttpServletResponse response) {
  601 + response.setContentType("application/octet-stream");
  602 + response.setHeader("Content-Disposition", "attachment;fileName=" + "datas.xls");
  603 + try {
  604 + BaseListResponse listResponse = null;
  605 + List<Map<String,Object>> datas = new ArrayList<>();
  606 + Map<String,String> cnames = new HashMap<>();
  607 + if (patientsQueryRequest.getQueryType() != null)
  608 + {
  609 + // 0 高危孕妇 1 全部孕妇 2全部产妇
  610 + if (patientsQueryRequest.getQueryType() == 0)
  611 + {
  612 + listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,null);
  613 + List list = listResponse.getData();
  614 + for (Object obj : list)
  615 + {
  616 + Map<String,Object> data = new HashMap<>();
  617 + RiskPatientsResult rp = (RiskPatientsResult)obj;
  618 + data.put("name", rp.getName());
  619 + data.put("age",rp.getAge());
  620 + data.put("dueWeek",rp.getDueWeek());
  621 + data.put("rLevel", rp.getrLevel());
  622 + data.put("rFactor", rp.getrFactor());
  623 + data.put("hScore", rp.gethScore());
  624 + data.put("cTimes", rp.getcTime());
  625 + data.put("cHTimes",rp.getcHTimes());
  626 + data.put("cTime",rp.getcTime());
  627 + data.put("dueDate",rp.getDueDate());
  628 + data.put("checkDoctor",rp.getCheckDoctor());
  629 + data.put("lName",rp.getlName());
  630 + data.put("phone",rp.getPhone());
  631 + }
  632 + cnames.put("name", "姓名");
  633 + cnames.put("age","当前年龄");
  634 + cnames.put("dueWeek","当前孕周");
  635 + cnames.put("rLevel", "高危等级");
  636 + cnames.put("rFactor", "高危风险因素");
  637 + cnames.put("hScore", "高危评分");
  638 + cnames.put("cTimes", "总产检次数");
  639 + cnames.put("cHTimes","本院产检次数");
  640 + cnames.put("cTime","预约产检日期");
  641 + cnames.put("dueDate","预产期");
  642 + cnames.put("checkDoctor","产检医生");
  643 + cnames.put("lName","登记人");
  644 + cnames.put("phone", "联系方式");
  645 +
  646 + }
  647 + else if (patientsQueryRequest.getQueryType() == 1)
  648 + {
  649 + listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,null);
  650 + List list = listResponse.getData();
  651 + for (Object obj : list)
  652 + {
  653 + Map<String,Object> data = new HashMap<>();
  654 + QuanPatientsResult rp = (QuanPatientsResult)obj;
  655 + data.put("name", rp.getName());
  656 + data.put("age",rp.getAge());
  657 + data.put("dueWeek",rp.getDueWeek());
  658 + data.put("rLevel", rp.getrLevel());
  659 + data.put("cTimes", rp.getcTime());
  660 + data.put("cHTimes",rp.getcHTimes());
  661 + data.put("cTime",rp.getcTime());
  662 + data.put("dueDate",rp.getDueDate());
  663 + data.put("checkDoctor",rp.getCheckDoctor());
  664 + data.put("lName",rp.getlName());
  665 + data.put("phone",rp.getPhone());
  666 + }
  667 + cnames.put("name", "姓名");
  668 + cnames.put("age","当前年龄");
  669 + cnames.put("dueWeek","当前孕周");
  670 + cnames.put("rLevel", "高危等级");
  671 + cnames.put("cTimes", "总产检次数");
  672 + cnames.put("cHTimes","本院产检次数");
  673 + cnames.put("cTime","预约产检日期");
  674 + cnames.put("dueDate","预产期");
  675 + cnames.put("checkDoctor","产检医生");
  676 + cnames.put("lName","登记人");
  677 + cnames.put("phone", "联系方式");
  678 + cnames.put("serviceType", "服务类型");
  679 + }
  680 + else if (patientsQueryRequest.getQueryType() == 2)
  681 + {
  682 + listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,null);
  683 + List list = listResponse.getData();
  684 + for (Object obj : list)
  685 + {
  686 + Map<String,Object> data = new HashMap<>();
  687 + QuanChanResult rp = (QuanChanResult)obj;
  688 + data.put("name", rp.getName());
  689 + data.put("age",rp.getAge());
  690 + data.put("dueWeek",rp.getDueWeek());
  691 + data.put("cTime",rp.getcTime());
  692 + data.put("nextCheckTime", rp.getNextCheckTime());
  693 + data.put("cTimes", rp.getcTime());
  694 + data.put("cHTimes",rp.getcHTimes());
  695 + data.put("checkDoctor",rp.getCheckDoctor());
  696 + data.put("lName",rp.getlName());
  697 + data.put("phone",rp.getPhone());
  698 + }
  699 + cnames.put("name", "姓名");
  700 + cnames.put("age","分娩年龄");
  701 + cnames.put("dueWeek","分娩日期");
  702 + cnames.put("cTime", "产后时间");
  703 + cnames.put("nextCheckTime", "预约下次复查");
  704 + cnames.put("cTimes", "总复查次数");
  705 + cnames.put("cHTimes", "本院复查次数");
  706 + cnames.put("checkDoctor","检查医生");
  707 + cnames.put("phone","联系方式");
  708 + cnames.put("lName","登记人");
  709 + }
  710 + }
  711 +
  712 +
  713 + OutputStream out = response.getOutputStream();
  714 + ExcelUtil.toExcel(out, datas, cnames);
  715 + }catch (IOException e) {
  716 + e.printStackTrace();
  717 + }
595 718 }
596 719 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ bf57890
... ... @@ -716,7 +716,7 @@
716 716 }
717 717  
718 718  
719   - public BaseResponse hospitalIsStart(String hospitalId,SmsConfigModel configModel)
  719 + public BaseResponse hospitalIsStart(String hospitalId,SmsConfigModel configModel,int service)
720 720 {
721 721 OrganizationQuery orgQuery = new OrganizationQuery();
722 722 orgQuery.setYn(YnEnums.YES.getId());
... ... @@ -755,7 +755,7 @@
755 755 String serviceStr = configs.get(0).getSmsService();
756 756 if (StringUtils.isNotEmpty(serviceStr))
757 757 {
758   - isStart = isStartService(SmsServiceEnums.FWKT.getId(), serviceStr);
  758 + isStart = isStartService(service, serviceStr);
759 759 }
760 760 }
761 761 if (!isStart)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ bf57890
... ... @@ -62,6 +62,18 @@
62 62 @FormParam
63 63 private Integer expVip;
64 64  
  65 +
  66 + // 0 高危孕妇 1 全部孕妇 2全部产妇
  67 + private Integer queryType;
  68 +
  69 + public Integer getQueryType() {
  70 + return queryType;
  71 + }
  72 +
  73 + public void setQueryType(Integer queryType) {
  74 + this.queryType = queryType;
  75 + }
  76 +
65 77 public Integer getEndHScore() {
66 78 return endHScore;
67 79 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java View file @ bf57890
1 1 package com.lyms.platform.operate.web.utils;
2 2  
3 3  
  4 +import com.lyms.platform.common.enums.ProjectTypeEnums;
4 5 import com.lyms.platform.common.utils.HttpRequest;
5 6 import com.lyms.platform.common.utils.JsonUtil;
6 7 import com.lyms.platform.common.utils.PropertiesUtils;
... ... @@ -69,7 +70,7 @@
69 70  
70 71 public static SmsResult querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTimeStart,String planTimeEnd,String actualTimeStart,String actualTimeEnd,Integer objType ,Integer page, Integer limit)
71 72 {
72   - String param = "typeId=4&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+
  73 + String param = "typeId="+ ProjectTypeEnums.YNXT.getId()+"&ext1="+StringUtils.emptyStr(hospitalId)+"&phone="+StringUtils.emptyStr(phone)+"&subTypeId="+StringUtils.emptyInt(smsType)+"&content="+StringUtils.emptyStr(content)+
73 74 "&planTimeStart="+planTimeStart+"&planTimeEnd="+planTimeEnd+"&actualTimeStart="+actualTimeStart+
74 75 "&actualTimeEnd="+actualTimeEnd+"&status="+StringUtils.emptyInt(smsStatus)+"&objType="+StringUtils.emptyInt(objType)+"&page="+page+"&limit="+limit;
75 76 String result = HttpRequest.sendGet(CENTER_BASE_URL+"messages", param, CENTER_TOKEN);
platform-operate-api/src/main/resources/config.properties View file @ bf57890
... ... @@ -2,7 +2,7 @@
2 2 center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
3 3  
4 4 #区域平台访问短信中心的token
5   -center_token=YMer2016
  5 +center_token=e0c56363-00d6-42ee-bbe0-23c553583062
6 6  
7 7 #His系统版本 0：未使用，1：桓台，2：新乐
8 8 his_version=0