shiyang / regional-platform

Download as
Browse Code »

Commit 5da3b6d10bc60e67c63f29a3cef936bc44dc6cd0

Authored by jiangjiazhi
2 parents e7db861fb1 b2cbea40de
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java View file @ 5da3b6d
... ... @@ -84,7 +84,7 @@
84 84 * @param id
85 85 * @return
86 86 */
87   - @RequestMapping(method = RequestMethod.GET, value = "/deleteTempById/{id}")
  87 + @RequestMapping(method = RequestMethod.DELETE, value = "/deleteTempById/{id}")
88 88 @ResponseBody
89 89 public BaseResponse deleteTempById(@PathVariable("id") String id) {
90 90 return smsTemplateFacade.deleteTempById(id);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 5da3b6d
... ... @@ -435,7 +435,7 @@
435 435 result.setHusbandAreaRegisterId(p.getHareaRegisterId());
436 436 result.setHusbandStreetRegisterId(p.getHstreetRegisterId());
437 437  
438   - result.setServiceStatus(p.getServiceStatus());
  438 + result.setServiceStatus(p.getServiceStatus() == null ? "" : String.valueOf(p.getServiceStatus()));
439 439 result.setVipEndTime(DateUtil.getyyyy_MM_dd(p.getVipEndTime()));
440 440 result.setExpVip(p.getExpVip());
441 441 result.setMremark(p.getMremark());
... ... @@ -448,7 +448,7 @@
448 448 result.setVcCardNo(p.getVcCardNo());
449 449 result.setBookbuildingDoctor(p.getBookbuildingDoctor());
450 450 result.setBookbuildingDate(DateUtil.getyyyy_MM_dd(p.getBookbuildingDate()));
451   - result.setServiceType(p.getServiceType());
  451 + result.setServiceType(p.getServiceType() == null ? "" : String.valueOf(p.getServiceType()));
452 452  
453 453 result.setExpType(p.getExpType());
454 454 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ 5da3b6d
... ... @@ -105,7 +105,7 @@
105 105 //建档日期
106 106 private String bookbuildingDate;
107 107 //服务类型
108   - private Integer serviceType;
  108 + private String serviceType;
109 109  
110 110 //就诊卡号
111 111 private String vcCardNo;
... ... @@ -115,7 +115,7 @@
115 115  
116 116  
117 117 //服务状态
118   - private Integer serviceStatus;
  118 + private String serviceStatus;
119 119  
120 120 //体验会员 0非会员 1会员
121 121 private Integer expVip;
122 122  
... ... @@ -144,13 +144,7 @@
144 144 this.mremark = mremark;
145 145 }
146 146  
147   - public Integer getServiceStatus() {
148   - return serviceStatus;
149   - }
150 147  
151   - public void setServiceStatus(Integer serviceStatus) {
152   - this.serviceStatus = serviceStatus;
153   - }
154 148  
155 149 public Integer getExpVip() {
156 150 return expVip;
... ... @@ -364,12 +358,6 @@
364 358 this.bookbuildingDate = bookbuildingDate;
365 359 }
366 360  
367   - public Integer getServiceType() {
368   - return serviceType;
369   - }
370   - public void setServiceType(Integer serviceType) {
371   - this.serviceType = serviceType;
372   - }
373 361 public String getPregnantCensusAddr() {
374 362 return pregnantCensusAddr;
375 363 }
376 364  
... ... @@ -437,14 +425,8 @@
437 425 this.childbirthAreaId = childbirthAreaId;
438 426 }
439 427  
440   -// public String getHospitalId() {
441   -// return hospitalId;
442   -// }
443   -//
444   -// public void setHospitalId(String hospitalId) {
445   -// this.hospitalId = hospitalId;
446   -// }
447 428  
  429 +
448 430 public String getVcCardNo() {
449 431 return vcCardNo;
450 432 }
... ... @@ -491,6 +473,22 @@
491 473  
492 474 public void setId(String id) {
493 475 this.id = id;
  476 + }
  477 +
  478 + public String getServiceType() {
  479 + return serviceType;
  480 + }
  481 +
  482 + public void setServiceType(String serviceType) {
  483 + this.serviceType = serviceType;
  484 + }
  485 +
  486 + public String getServiceStatus() {
  487 + return serviceStatus;
  488 + }
  489 +
  490 + public void setServiceStatus(String serviceStatus) {
  491 + this.serviceStatus = serviceStatus;
494 492 }
495 493 }