shiyang / regional-platform

Download as
Browse Code »

Commit 188cfa5b73925a15f4ffa547156d27301bc3999d

Authored by jiangjiazhi
2 parents f7960465ae 6bd10f061b
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-data-api/src/main/java/com/lyms/platform/data/util/SaveMessageService.java View file @ 188cfa5
... ... @@ -13,12 +13,13 @@
13 13 */
14 14 public class SaveMessageService {
15 15  
16   - public static final String URL = "http://localhost:8090/v1/saveCreatedSMS";
  16 + public static final String URL = "http://192.168.5.3:8080/v1/saveCreatedSMS";
17 17  
18 18 public static boolean saveSmsCenter(MessageListRequest list)
19 19 {
20 20 String json = JsonUtil.obj2JsonString(list);
21 21 String result = HttpRequest.sendPost(URL,json,"YMer2016");
  22 + System.out.print(result);
22 23 return false;
23 24 }
24 25  
25 26  
26 27  
27 28  
... ... @@ -28,12 +29,25 @@
28 29 List<MessageRequest> messages = new ArrayList<>();
29 30 MessageRequest request = new MessageRequest();
30 31 request.setTypeId(1);
31   - request.setContent("aaaa");
  32 + request.setContent("222222222222222");
32 33 request.setObjType(1);
33   - request.setPhone("123333");
  34 + request.setPhone("18382670032");
34 35 request.setPlanTime("2015-01-06 15:22:12");
35 36 request.setServiceType(1);
  37 + request.setStatus(1);
36 38 messages.add(request);
  39 +
  40 +
  41 + MessageRequest request1 = new MessageRequest();
  42 + request1.setTypeId(1);
  43 + request1.setContent("1111111111111111");
  44 + request1.setObjType(1);
  45 + request1.setPhone("18382670031");
  46 + request1.setPlanTime("2015-01-06 15:22:12");
  47 + request1.setServiceType(1);
  48 + request1.setStatus(1);
  49 + messages.add(request1);
  50 +
37 51 list.setTypeId(1);
38 52 list.setMessages(messages);
39 53 saveSmsCenter(list);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 188cfa5
... ... @@ -63,16 +63,22 @@
63 63 patientsQuery.setYn(YnEnums.YES.getId());
64 64 patientsQuery.setType(1);
65 65 patientsQuery.setHospitalId(yunRequest.getHospitalId());
  66 + patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum());
66 67  
67   - //判断该身份证号码是否有孕妇建档 在该医院
68   - List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
69   - if (CollectionUtils.isNotEmpty(patients))
  68 + if (yunRequest.getPregnantCertificateNum() != null)
70 69 {
71   - br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
72   - br.setErrormsg("孕妇在该医院已建档");
73   - return br;
  70 + //判断该身份证号码是否有孕妇建档 在该医院
  71 + List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
  72 + if (CollectionUtils.isNotEmpty(patients))
  73 + {
  74 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  75 + br.setErrormsg("孕妇在该医院已建档");
  76 + return br;
  77 + }
74 78 }
75 79  
  80 +
  81 +
76 82 PersonModel pmodel = new PersonModel();
77 83 pmodel.setName(yunRequest.getPregnantName());
78 84 pmodel.setBirth(DateUtil.parseYMD(yunRequest.getBirthday()));
... ... @@ -162,7 +168,7 @@
162 168 {
163 169 patientsQuery.setHospitalId(null);
164 170 patientsQuery.setVcCardNo(null);
165   - patientsQuery.setCardNo(patients.get(0).getCardNo());
  171 + patientsQuery.setCardNo(patientsVc.get(0).getCardNo());
166 172 patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
167 173 }
168 174 }
... ... @@ -443,6 +449,8 @@
443 449 result.setBookbuildingDoctor(p.getBookbuildingDoctor());
444 450 result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
445 451 result.setServiceType(p.getServiceType());
  452 +
  453 + result.setExpType(p.getExpType());
446 454 }
447 455 BaseObjectResponse objectResponse = new BaseObjectResponse();
448 456 objectResponse.setData(result);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ 188cfa5
... ... @@ -126,6 +126,15 @@
126 126 //备注
127 127 private String mremark;
128 128  
  129 + private Integer expType;
  130 +
  131 + public Integer getExpType() {
  132 + return expType;
  133 + }
  134 +
  135 + public void setExpType(Integer expType) {
  136 + this.expType = expType;
  137 + }
129 138  
130 139 public String getMremark() {
131 140 return mremark;