shiyang / regional-platform

Download as
Browse Code »

Commit 62db5609bd1128b1d91a793f2185aac3079995b8

Authored by hujiaqi
1 parent 9c481ad2cf
Exists in master and in 1 other branch nobuildprocess

儿童建档删除医院名称字段

Showing 3 changed files with 2 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ 62db560
... ... @@ -96,7 +96,6 @@
96 96 private String cardNo;
97 97  
98 98 private String hospitalId;
99   - private String hospitalName;
100 99 //建档类型 1、儿童直接建档 2 产妇分娩建档 3 为转诊自动建档
101 100 private Integer buildType;
102 101 /**
... ... @@ -333,14 +332,6 @@
333 332  
334 333 public void setHospitalId(String hospitalId) {
335 334 this.hospitalId = hospitalId;
336   - }
337   -
338   - public String getHospitalName() {
339   - return hospitalName;
340   - }
341   -
342   - public void setHospitalName(String hospitalName) {
343   - this.hospitalName = hospitalName;
344 335 }
345 336  
346 337 public String getCardNo() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ 62db560
... ... @@ -323,7 +323,7 @@
323 323 * @createTime 2016年11月24日 17时01分
324 324 * @discription 医院列表
325 325 */
326   - @RequestMapping(method = RequestMethod.GET, value = "/queryHospitalList")
  326 + @RequestMapping(method = RequestMethod.POST, value = "/queryHospitalList")
327 327 @ResponseBody
328 328 public BaseResponse queryHospitalList(@RequestParam(value = "provinceId", required = false) String provinceId,
329 329 @RequestParam(value = "cityId", required = false) String cityId,
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 62db560
... ... @@ -482,7 +482,6 @@
482 482 model.setBuildType(1);
483 483 model.setHospitalId(request.getHospitalId());
484 484 String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName();
485   - model.setHospitalName(hospitalName);
486 485 model = babyBookbuildingService.addBabyBookbuilding(model);
487 486  
488 487 if (model == null || model.getId() == null) {
... ... @@ -1496,7 +1495,7 @@
1496 1495 result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
1497 1496 result.setPatientId(model.getParentId());
1498 1497 result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
1499   - result.setHospitalName(model.getHospitalName());
  1498 + result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName());
1500 1499  
1501 1500 // 开始查询省市区街道
1502 1501 // 省