jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bf5a115894b26bf7ed063d250b36cf9b7b8db6c0

Authored by jiangjiazhi
2 parents 40c6e4f86d f0d4d17579
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 12 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/SmsProviderEnums.java View file @ bf5a115
... ... @@ -9,7 +9,7 @@
9 9 public enum SmsProviderEnums {
10 10  
11 11  
12   - ALDY(1,"阿里大鱼"),YM(2,"易美");
  12 + YM(1,"易美"),ALDY(2,"阿里大鱼");
13 13  
14 14 SmsProviderEnums(int id, String name) {
15 15 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ bf5a115
... ... @@ -143,6 +143,22 @@
143 143 return String.valueOf(str);
144 144 }
145 145  
  146 +
  147 + /**
  148 + * 替换短信中的表达式
  149 + * @return
  150 + */
  151 + public static String replaceEL(String name,Date checkDate,String repalceStr)
  152 + {
  153 + if (StringUtils.isNotEmpty(repalceStr))
  154 + {
  155 + String date = DateUtil.getyyyy_MM_dd(checkDate);
  156 + return repalceStr.replace("{{姓名}}",name).replace("{{预产期}}", date);
  157 + }
  158 + return repalceStr;
  159 + }
  160 +
  161 +
146 162 // public static void main(String[] arg) {
147 163 // System.out.print(encryPhone("18382670036"));
148 164 // }
platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java View file @ bf5a115
... ... @@ -23,6 +23,9 @@
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 29  
27 30 // MessageListRequest list = new MessageListRequest();
28 31 // List<MessageRequest> messages = new ArrayList<>();
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ bf5a115
... ... @@ -2183,7 +2183,7 @@
2183 2183 //计划发送时间
2184 2184 request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
2185 2185 //短信商
2186   - request.setServiceType(SmsProviderEnums.ALDY.getId());
  2186 + request.setServiceType(SmsProviderEnums.YM.getId());
2187 2187 request.setSubTypeId(smsType);
2188 2188 request.setStatus(SmsStatusEnums.WFS.getId());
2189 2189 request.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId());
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/ConnTools.java View file @ bf5a115
... ... @@ -8,24 +8,66 @@
8 8 * Created by Administrator on 2016/9/9 0009.
9 9 */
10 10 public class ConnTools {
11   - private static String dirverClassName = "com.mysql.jdbc.Driver";
12   - private static String url = "jdbc:mysql://192.168.104.101:3306/testdb?useUnicode=true&characterEncoding=utf8";
13   - private static String user = "root";
14   - private static String password = "leizhimin";
  11 + private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver";
  12 + private static String hisUrl = "jdbc:oracle:thin:@192.190.10.11:1521:xlsyy";
  13 + private static String hisUser = "mmbb";
  14 + private static String hisPassword = "mmbb";
15 15  
16   - public static Connection makeConnection() {
  16 + private static String pacsDirverClassName = "oracle.jdbc.driver.OracleDriver";
  17 + private static String pacsUrl = "jdbc:oracle:thin:@172.0.1.17:1521:ris";
  18 + private static String pacsUser = "YunYing";
  19 + private static String pacsPassword = "maroland";
  20 +
  21 + private static String lisDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
  22 + private static String lisUrl = "jdbc:sqlserver://172.0.1.20:1433; DatabaseName=rmlis6";
  23 + private static String lisUser = "sa";
  24 + private static String lisPassword = "skhis168";
  25 +
  26 + public static Connection makeHisConnection() {
17 27 Connection conn = null;
18 28 try {
19   - Class.forName(dirverClassName);
  29 + Class.forName(hisDirverClassName);
20 30 } catch (ClassNotFoundException e) {
21 31 e.printStackTrace();
22 32 }
23 33 try {
24   - conn = DriverManager.getConnection(url, user, password);
  34 + conn = DriverManager.getConnection(hisUrl, hisUser, hisPassword);
25 35 } catch (SQLException e) {
26 36 e.printStackTrace();
27 37 }
28 38 return conn;
29 39 }
  40 +
  41 + public static Connection makePacsConnection() {
  42 + Connection conn = null;
  43 + try {
  44 + Class.forName(pacsDirverClassName);
  45 + } catch (ClassNotFoundException e) {
  46 + e.printStackTrace();
  47 + }
  48 + try {
  49 + conn = DriverManager.getConnection(pacsUrl, pacsUser, pacsPassword);
  50 + } catch (SQLException e) {
  51 + e.printStackTrace();
  52 + }
  53 + return conn;
  54 + }
  55 +
  56 + public static Connection makeLisConnection() {
  57 + Connection conn = null;
  58 + try {
  59 + Class.forName(lisDirverClassName);
  60 + } catch (ClassNotFoundException e) {
  61 + e.printStackTrace();
  62 + }
  63 + try {
  64 + conn = DriverManager.getConnection(lisUrl, lisUser, lisPassword);
  65 + } catch (SQLException e) {
  66 + e.printStackTrace();
  67 + }
  68 + return conn;
  69 + }
  70 +
  71 +
30 72 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java View file @ bf5a115
  1 +package com.lyms.hospitalapi.v1;
  2 +
  3 +import com.lyms.hospitalapi.pojo.LisCheckInfo;
  4 +import com.lyms.hospitalapi.pojo.LisCheckResult;
  5 +import com.lyms.hospitalapi.v2.*;
  6 +import com.lyms.platform.common.utils.DateUtil;
  7 +import org.apache.commons.dbutils.DbUtils;
  8 +import org.apache.commons.dbutils.QueryRunner;
  9 +import org.apache.commons.dbutils.handlers.BeanListHandler;
  10 +import org.apache.commons.lang.StringUtils;
  11 +import org.springframework.stereotype.Service;
  12 +
  13 +import java.sql.Connection;
  14 +import java.sql.SQLException;
  15 +import java.util.List;
  16 +
  17 +/**
  18 + * Created by Administrator on 2016/9/9 0009.
  19 + */
  20 +@Service("hisServiceV1")
  21 +public class HisService {
  22 +
  23 + public void queryLisCheckList(String cardNo) {
  24 + if (StringUtils.isNotBlank(cardNo)) {
  25 + Connection conn = com.lyms.hospitalapi.v2.ConnTools.makeHisConnection();
  26 + QueryRunner queryRunner = new QueryRunner();
  27 + try {
  28 + List<LisCheckInfo> list = queryRunner.query(conn, "select * from lis_check_info where P_CARD = '"+cardNo+"'", new BeanListHandler<LisCheckInfo>(LisCheckInfo.class));
  29 + if (list.size() > 0) {
  30 + for (LisCheckInfo info:list) {
  31 + if (StringUtils.isNotBlank(info.getP_APPLICATIONNUM())) {
  32 + List<LisCheckResult> resultList = queryRunner.query(conn, "select * from lis_check_result where P_APPLICATIONNUM = '"+info.getP_APPLICATIONNUM()+"'", new BeanListHandler<LisCheckResult>(LisCheckResult.class));
  33 + if (resultList != null && resultList.size() > 0) {
  34 +
  35 + }
  36 + }
  37 + }
  38 + }
  39 + DbUtils.closeQuietly(conn);
  40 + } catch (SQLException e) {
  41 + DbUtils.closeQuietly(conn);
  42 + e.printStackTrace();
  43 + }
  44 + }
  45 + }
  46 +
  47 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/ConnTools.java View file @ bf5a115
... ... @@ -8,7 +8,7 @@
8 8 * Created by Administrator on 2016/9/9 0009.
9 9 */
10 10 public class ConnTools {
11   - private static String hisDirverClassName = "com.mysql.jdbc.Driver";
  11 + private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver";
12 12 private static String hisUrl = "jdbc:oracle:thin:@192.190.10.11:1521:xlsyy";
13 13 private static String hisUser = "mmbb";
14 14 private static String hisPassword = "mmbb";
platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/HisService.java View file @ bf5a115
1 1 package com.lyms.hospitalapi.v2;
2 2  
3 3 import com.lyms.platform.common.utils.DateUtil;
  4 +import org.apache.commons.dbutils.DbUtils;
4 5 import org.apache.commons.dbutils.QueryRunner;
5 6 import org.apache.commons.dbutils.handlers.BeanListHandler;
6 7 import org.apache.commons.lang.StringUtils;
7 8 import org.springframework.stereotype.Service;
8 9  
  10 +import java.sql.Connection;
9 11 import java.sql.SQLException;
10 12 import java.util.ArrayList;
11 13 import java.util.HashMap;
12 14  
... ... @@ -21,9 +23,10 @@
21 23 public Map<String,Object> getPatientInfo(String cardNo){
22 24 Map<String,Object> map = new HashMap<>();
23 25 if (StringUtils.isNotBlank(cardNo)) {
  26 + Connection conn = ConnTools.makeHisConnection();
24 27 QueryRunner queryRunner = new QueryRunner();
25 28 try {
26   - List<XinlePregPatientinfo> list = queryRunner.query(ConnTools.makeHisConnection(), "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
  29 + List<XinlePregPatientinfo> list = queryRunner.query(conn, "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
27 30 if (list.size() > 0) {
28 31 XinlePregPatientinfo info = list.get(0);
29 32 map.put("sickType", info.getSICKTYPE());
30 33  
... ... @@ -33,7 +36,9 @@
33 36 map.put("cardNo", info.getIC_CARD_ID());
34 37 map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
35 38 }
  39 + DbUtils.closeQuietly(conn);
36 40 } catch (SQLException e) {
  41 + DbUtils.closeQuietly(conn);
37 42 e.printStackTrace();
38 43 }
39 44 }
40 45  
... ... @@ -43,9 +48,10 @@
43 48 public List<Map<String,Object>> getPatientInfoList(String cardNo){
44 49 List<Map<String,Object>> result = new ArrayList<>();
45 50 if (StringUtils.isNotBlank(cardNo)) {
  51 + Connection conn = ConnTools.makeHisConnection();
46 52 QueryRunner queryRunner = new QueryRunner();
47 53 try {
48   - List<XinlePregPatientinfo> list = queryRunner.query(ConnTools.makeHisConnection(), "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
  54 + List<XinlePregPatientinfo> list = queryRunner.query(conn, "select * from v_preg_patientinfo where IC_CARD_ID = '"+cardNo+"'", new BeanListHandler<XinlePregPatientinfo>(XinlePregPatientinfo.class));
49 55 if (list.size() > 0) {
50 56 for (XinlePregPatientinfo info:list) {
51 57 Map<String,Object> map = new HashMap<>();
52 58  
53 59  
... ... @@ -54,11 +60,14 @@
54 60 map.put("sex", info.getSEX());
55 61 map.put("name", info.getNAME());
56 62 map.put("cardNo", info.getIC_CARD_ID());
  63 + map.put("phone", info.getASSOCIATION_PHONE());
57 64 map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
58 65 result.add(map);
59 66 }
60 67 }
  68 + DbUtils.closeQuietly(conn);
61 69 } catch (SQLException e) {
  70 + DbUtils.closeQuietly(conn);
62 71 e.printStackTrace();
63 72 }
64 73 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ bf5a115
... ... @@ -609,7 +609,7 @@
609 609 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
610 610 mr.setPhone(babyModel.getMphone());
611 611 //短信商
612   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
  612 + mr.setServiceType(SmsProviderEnums.YM.getId());
613 613 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
614 614 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
615 615 mr.setSubTypeId(SmsServiceEnums.FWKT.getId());
... ... @@ -960,6 +960,8 @@
960 960 result.setVcCardNo(model.getVcCardNo());
961 961 result.setHospitalId(model.getHospitalId());
962 962 result.setExpType(model.getExpType());
  963 +
  964 + result.setDueWeek(model.getDueWeek());
963 965 return result;
964 966 }
965 967  
... ... @@ -1591,7 +1593,7 @@
1591 1593 mr.setObjType(ServiceObjEnums.BABYOBJ.getId());
1592 1594 mr.setPhone(model.getMphone());
1593 1595 //短信商
1594   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
  1596 + mr.setServiceType(SmsProviderEnums.YM.getId());
1595 1597 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
1596 1598 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
1597 1599 mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ bf5a115
... ... @@ -437,7 +437,10 @@
437 437 MessageListRequest smsList = new MessageListRequest();
438 438 List<MessageRequest> messages = new ArrayList<>();
439 439 MessageRequest mr = new MessageRequest();
440   - mr.setContent("【"+messagePrefix+"】"+templateModel.getContent());
  440 + Date dueDate = DateUtil.addWeek(patient.getLastMenses(),42);
  441 + String content = StringUtils.replaceEL(patient.getUsername(),dueDate,templateModel.getContent());
  442 +
  443 + mr.setContent("【"+messagePrefix+"】"+content);
441 444 mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
442 445 mr.setPhone(patient.getPhone());
443 446 mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
444 447  
... ... @@ -652,11 +655,14 @@
652 655 if (pat != null)
653 656 {
654 657 BookbuildingRecordResult result = new BookbuildingRecordResult();
655   - Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
656   - if (org != null)
  658 + if (StringUtils.isNotEmpty(pat.getHospitalId()))
657 659 {
658   - result.setBookbuildHospital(org.getName());
659   - result.setHospitalId(String.valueOf(org.getId()));
  660 + Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
  661 + if (org != null)
  662 + {
  663 + result.setBookbuildHospital(org.getName());
  664 + result.setHospitalId(String.valueOf(org.getId()));
  665 + }
660 666 }
661 667 result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));
662 668 result.setId(pat.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ bf5a115
... ... @@ -547,7 +547,7 @@
547 547 mr.setObjType(Integer.valueOf(patientGuideSmsRequest.getType()));
548 548 mr.setPhone(model.getPhone());
549 549 //短信商
550   - mr.setServiceType(SmsProviderEnums.ALDY.getId());
  550 + mr.setServiceType(SmsProviderEnums.YM.getId());
551 551 mr.setTypeId(ProjectTypeEnums.YNXT.getId());
552 552 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
553 553 mr.setSubTypeId(SmsServiceEnums.YSGXHZD.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ bf5a115
... ... @@ -130,6 +130,16 @@
130 130 //体验类型
131 131 private Integer expType;
132 132  
  133 + //分娩孕周
  134 + private Integer dueWeek;
  135 +
  136 + public Integer getDueWeek() {
  137 + return dueWeek;
  138 + }
  139 +
  140 + public void setDueWeek(Integer dueWeek) {
  141 + this.dueWeek = dueWeek;
  142 + }
133 143  
134 144  
135 145 public Integer getExpType() {