fangcheng / regional-platform

Download as
Browse Code »

Commit 6186b852425f5716f46616864983d1cb5c27c7d1

Authored by jiangjiazhi
2 parents 8daf33a859 df9150685b
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 10 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/HttpRequest.java View file @ 6186b85
... ... @@ -165,20 +165,14 @@
165 165 while(keys.hasNext()){
166 166 String key = keys.next();
167 167 String value = headers.get(key);
168   - System.out.println(key+"====="+value);
169 168 connection.setRequestProperty(key,value);
170 169 }
171 170 }
172   -// connection.setRequestProperty("Authorization", "healthbaby2015");
173 171 // 建立实际的连接
174 172 connection.connect();
175 173 // 获取所有响应头字段
176 174 Map<String, List<String>> map = connection.getHeaderFields();
177   - // 遍历所有的响应头字段
178   -// for (String key : map.keySet()) {
179   -// System.out.println(key + "--->" + map.get(key));
180   -// }
181   - System.out.println("--->" + map);
  175 +
182 176 // 定义 BufferedReader输入流来读取URL的响应
183 177 in = new BufferedReader(new InputStreamReader(
184 178 connection.getInputStream(),"utf-8"));
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java View file @ 6186b85
... ... @@ -40,9 +40,6 @@
40 40  
41 41 public static final String SEND_TIME= PropertiesUtils.getPropertyValue("send_time");
42 42  
43   -
44   - private List<MessageRequest> allMsgs = new ArrayList<>();
45   -
46 43 @Autowired
47 44 private SmsConfigService smsConfigService;
48 45  
49 46  
... ... @@ -350,16 +347,15 @@
350 347  
351 348 list.setMessages(messages);
352 349 sendSms(list);
  350 + for (MessageRequest msg :messages)
  351 + {
  352 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信======="+msg.getPhone()+ "content="+ msg.getContent());
  353 + }
353 354 }
354 355  
355 356 }
356 357 }
357 358  
358   - for (MessageRequest msg :allMsgs)
359   - {
360   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"孕妇ams短信=======" + msg.getContent());
361   - }
362   - allMsgs.clear();
363 359 }
364 360  
365 361  
366 362  
... ... @@ -525,17 +521,16 @@
525 521 }
526 522 list.setMessages(messages);
527 523 sendSms(list);
  524 +
  525 + for (MessageRequest msg :messages)
  526 + {
  527 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信===="+msg.getPhone()+ "content=" + msg.getContent());
  528 + }
528 529 }
529 530  
530 531 }
531 532 }
532 533  
533   - for (MessageRequest msg :allMsgs)
534   - {
535   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"儿童ams短信=======" + msg.getContent());
536   - }
537   -
538   - allMsgs.clear();
539 534 }
540 535  
541 536  
542 537  
... ... @@ -657,16 +652,14 @@
657 652 }
658 653 list.setMessages(messages);
659 654 sendSms(list);
  655 + for (MessageRequest msg :messages)
  656 + {
  657 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信===="+msg.getPhone()+ "content="+ msg.getContent());
  658 + }
660 659 }
661 660 }
662 661 }
663 662  
664   - for (MessageRequest msg :allMsgs)
665   - {
666   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"产妇ams短信=======" + msg.getContent());
667   - }
668   - allMsgs.clear();
669   -
670 663 }
671 664  
672 665 /**
... ... @@ -1842,6 +1835,10 @@
1842 1835 }
1843 1836 list.setMessages(messages);
1844 1837 sendSms(list);
  1838 + for (MessageRequest msg :messages)
  1839 + {
  1840 + System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信======"+msg.getPhone()+"content=" + msg.getContent());
  1841 + }
1845 1842 }
1846 1843 }
1847 1844 }
... ... @@ -1853,12 +1850,6 @@
1853 1850 }
1854 1851 }
1855 1852 }
1856   - for (MessageRequest msg :allMsgs)
1857   - {
1858   - System.out.println(DateUtil.getyyyy_MM_dd_hms(new Date())+"模板短信=======" + msg.getContent());
1859   - }
1860   -
1861   - allMsgs.clear();
1862 1853 }
1863 1854  
1864 1855  
1865 1856  
... ... @@ -2423,10 +2414,25 @@
2423 2414 if (list != null && list.getMessages() != null)
2424 2415 {
2425 2416 List<MessageRequest> msgs = list.getMessages();
2426   - allMsgs.addAll(msgs);
  2417 + int batchSize = 200;
  2418 + int end = 0;
  2419 + for (int i = 0; i < msgs.size(); i += batchSize) {
  2420 + end = (end + batchSize);
  2421 + if (end > msgs.size()) {
  2422 + end = msgs.size();
  2423 + }
  2424 + System.out.println("start:" + i + ",end:" + end);
  2425 + List<MessageRequest> tempList = msgs.subList(i, end);
  2426 + MessageListRequest sentList = new MessageListRequest();
  2427 + sentList.setMessages(tempList);
  2428 + sentList.setTypeId(ProjectTypeEnums.YNXT.getId());
  2429 + SaveMessageService.saveSmsCenter(sentList);
  2430 + }
2427 2431  
2428 2432 }
2429   - SaveMessageService.saveSmsCenter(list);
  2433 +
  2434 +
  2435 +
2430 2436 }
2431 2437 }
2432 2438  
platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java View file @ 6186b85
... ... @@ -183,12 +183,12 @@
183 183  
184 184  
185 185 public static void main(String[] args) {
186   - Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000006",
  186 + Map<String,List<MessageContent>> list = getMessageTemplateMap("204",
187 187 AmsServiceTypeEnum.CHILD_GUIDE);
188 188  
189 189 // List<MessageContent> msgs = list.get("肺结核");
190   -
191   - System.out.println(list);
  190 +//
  191 +// System.out.println(list);
192 192  
193 193 // for (int i = 0;i< 100 ;i++)
194 194 // {
platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java View file @ 6186b85
... ... @@ -28,6 +28,7 @@
28 28 // String result = HttpRequest.sendPost("http://192.168.5.13:8080/v1/saveCreatedSMS",json,"YMer2016");
29 29 if (StringUtils.isNotEmpty(result))
30 30 {
  31 + System.out.println("result=="+result);
31 32 Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
32 33 if ("0".equals(map.get("errorcode")))
33 34 {
34 35  
35 36  
36 37  
... ... @@ -78,14 +79,14 @@
78 79 // MessageListRequest list = new MessageListRequest();
79 80 // List<MessageRequest> messages = new ArrayList<>();
80 81 // MessageRequest request = new MessageRequest();
81   -// request.setTypeId(1);
  82 +// request.setTypeId(5);
82 83 // request.setStatus(0);
83   -// request.setContent("cccccccccccccccccc");
  84 +// request.setContent("四川省妇幼");
84 85 // request.setObjType(1);
85   -// request.setPhone("18382670000");
  86 +// request.setPhone("18382670036");
86 87 // request.setPlanTime("2015-01-06 15:22:12");
87 88 // request.setServiceType(1);
88   -// request.setExt1("196");
  89 +// request.setExt1("221");
89 90 // request.setExt2("10");
90 91 // request.setExt3("10");
91 92 // request.setSubTypeId(6);
92 93  
... ... @@ -105,13 +106,12 @@
105 106 // request1.setExt2("10");
106 107 // request1.setExt3("10");
107 108 // messages.add(request1);
108   -//
109   -// list.setTypeId(1);
  109 +////
  110 +// list.setTypeId(5);
110 111 // list.setMessages(messages);
111 112 // saveSmsCenter(list);
112 113  
113 114  
114   - deleteDueSms("15265444440,");
115 115 }
116 116 }
platform-data-api/src/main/resources/config.properties View file @ 6186b85
1 1 #短信中心url
  2 +#center_base_url=http://sms.healthbaby.com.cn/v1/
2 3 center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
3 4  
4 5 #区域平台访问短信中心的token
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ 6186b85
... ... @@ -26,10 +26,7 @@
26 26 import javax.servlet.http.HttpServletRequest;
27 27 import javax.servlet.http.HttpServletResponse;
28 28 import javax.validation.Valid;
29   -import java.util.ArrayList;
30   -import java.util.HashMap;
31   -import java.util.List;
32   -import java.util.Map;
  29 +import java.util.*;
33 30  
34 31 /**
35 32 * 产妇分娩记录
... ... @@ -137,6 +134,7 @@
137 134 return baseListResponse;
138 135 }
139 136  
  137 + @TokenRequired
140 138 @RequestMapping(value = "childbirthManagerExcel", method = RequestMethod.POST)
141 139 public void childbirthManagerExcel(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest, HttpServletResponse httpServletResponse) {
142 140 try {
... ... @@ -149,7 +147,7 @@
149 147 Map<String, Object> map = BeanUtils.objectToObjectMap(childbirthManagerQueryModel);
150 148 list.add(map);
151 149 }
152   - Map<String, String> header = new HashMap<>();
  150 + Map<String, String> header = new LinkedHashMap<>();
153 151 header.put("dueDate", "分娩日期");
154 152 header.put("username", "姓名");
155 153 header.put("age", "年龄");
... ... @@ -194,6 +192,7 @@
194 192 return baseListResponse;
195 193 }
196 194  
  195 + @TokenRequired
197 196 @RequestMapping(value = "newBabyManagerExcel", method = RequestMethod.POST)
198 197 public void newBabyManagerExcel(HttpServletRequest httpServletRequest, @RequestBody NewBabyManagerRequest newBabyManagerRequest, HttpServletResponse httpServletResponse) {
199 198 try {
... ... @@ -227,7 +226,7 @@
227 226 }
228 227 list.add(map);
229 228 }
230   - Map<String, String> header = new HashMap<>();
  229 + Map<String, String> header = new LinkedHashMap<>();
231 230 header.put("birthYMD", "分娩日期");
232 231 header.put("birthHM", "娩出时间");
233 232 header.put("name", "姓名");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ 6186b85
... ... @@ -59,6 +59,28 @@
59 59 }
60 60  
61 61 /**
  62 + * 通过证件号,就诊卡号查询居民建档信息,优先返回本院
  63 + * @param vcCardNo
  64 + * @param cardNo
  65 + * @param request
  66 + * @return
  67 + */
  68 + @RequestMapping(value = "/findResidentInformation", method = RequestMethod.GET)
  69 + @ResponseBody
  70 + @TokenRequired
  71 + public BaseObjectResponse findResidentInformation(@RequestParam(value = "vcCardNo",required = false) String vcCardNo,
  72 + @RequestParam(value = "cardNo",required = false) String cardNo,
  73 + HttpServletRequest request) {
  74 + ResidentsArchiveQueryRequest queryRequest = new ResidentsArchiveQueryRequest();
  75 + queryRequest.setCardNo(cardNo);
  76 + queryRequest.setVcCardNo(vcCardNo);
  77 + //获取当前登录用户ID
  78 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  79 + return residentsArchiveFacade.findResidentsArchive(queryRequest,loginState.getId());
  80 + }
  81 +
  82 +
  83 + /**
62 84 * 居民建档接口(新增或修改)
63 85 * @param addRequest
64 86 * @param request
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 6186b85
... ... @@ -1206,7 +1206,11 @@
1206 1206 matDeliverQuery.setParentId(babyModel.getParentId());
1207 1207 List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1208 1208 if (maternalDeliverModelList != null && maternalDeliverModelList.size() == 1) {
1209   - newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModelList.get(0).getDeliverDoctor())).getName());
  1209 + MaternalDeliverModel maternalDeliverModel = maternalDeliverModelList.get(0);
  1210 + newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
  1211 + newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
  1212 + newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
  1213 + newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
1210 1214 }
1211 1215 } catch (Exception e) {
1212 1216 // 什么都不干，这么干是为了避开原始数据的问题
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 6186b85
... ... @@ -64,6 +64,52 @@
64 64 @Autowired
65 65 private SyncDataService syncDataService;
66 66  
  67 + public BaseObjectResponse findResidentsArchive(ResidentsArchiveQueryRequest queryRequest,Integer userId){
  68 +
  69 + List<ResidentsArchiveModel> residents = new ArrayList<>();
  70 +
  71 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  72 +
  73 + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
  74 + archiveQuery.setYn(YnEnums.YES.getId());
  75 + if (StringUtils.isNotEmpty(queryRequest.getCardNo())){
  76 + archiveQuery.setCertificateNum(queryRequest.getCardNo());
  77 + residents = residentsArchiveService.queryResident(archiveQuery);
  78 + }else if (StringUtils.isNotEmpty(queryRequest.getVcCardNo())){
  79 + //通过用户ID查询医院ID
  80 +
  81 + archiveQuery.setVcCardNo(queryRequest.getVcCardNo());
  82 + archiveQuery.setHospitalId(hospitalId);
  83 + List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
  84 + if (CollectionUtils.isNotEmpty(archiveModelList)){
  85 + //判断身份证号是否为null
  86 + if (StringUtils.isEmpty(archiveModelList.get(0).getCertificateNum())){
  87 + residents = archiveModelList;
  88 + }else {
  89 + archiveQuery.setHospitalId(null);
  90 + archiveQuery.setVcCardNo(null);
  91 + archiveQuery.setCertificateNum(archiveModelList.get(0).getCertificateNum());
  92 + residents = residentsArchiveService.queryResident(archiveQuery);
  93 + }
  94 + }
  95 + }
  96 +
  97 + ResidentsArchiveModel archiveModel = null;
  98 +
  99 + if (residents.size()!=0){
  100 + for (ResidentsArchiveModel model : residents){
  101 + if (model.getHospitalId().equals(hospitalId)){
  102 + archiveModel = model;
  103 + }
  104 + }
  105 + }
  106 +
  107 + if (archiveModel==null && residents.size()!=0){
  108 + archiveModel = residents.get(0);
  109 + }
  110 + return new BaseObjectResponse().setData(archiveModel).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  111 + }
  112 +
67 113 /**
68 114 * 查询居民健康记录,获取基础数据
69 115 * @param residentsArchiveQueryRequest
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java View file @ 6186b85
... ... @@ -7,6 +7,12 @@
7 7 */
8 8 public class NewBabyManagerQueryModel {
9 9  
  10 + private String maternalDeliverId;
  11 +
  12 + private String patientId;
  13 +
  14 + private String pId;
  15 +
10 16 /**
11 17 * @auther HuJiaqi
12 18 * @createTime 2016年12月08日 10时51分
... ... @@ -112,6 +118,22 @@
112 118 */
113 119 private String deliverDoctor;
114 120  
  121 + public String getMaternalDeliverId() {
  122 + return maternalDeliverId;
  123 + }
  124 +
  125 + public void setMaternalDeliverId(String maternalDeliverId) {
  126 + this.maternalDeliverId = maternalDeliverId;
  127 + }
  128 +
  129 + public String getpId() {
  130 + return pId;
  131 + }
  132 +
  133 + public void setpId(String pId) {
  134 + this.pId = pId;
  135 + }
  136 +
115 137 public String getBirthYMD() {
116 138 return birthYMD;
117 139 }
... ... @@ -230,6 +252,14 @@
230 252  
231 253 public void setDeliverDoctor(String deliverDoctor) {
232 254 this.deliverDoctor = deliverDoctor;
  255 + }
  256 +
  257 + public String getPatientId() {
  258 + return patientId;
  259 + }
  260 +
  261 + public void setPatientId(String patientId) {
  262 + this.patientId = patientId;
233 263 }
234 264 }