From 62db5609bd1128b1d91a793f2185aac3079995b8 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Wed, 30 Nov 2016 11:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8C=BB=E9=99=A2=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java | 9 --------- .../platform/operate/web/controller/BabyBuildController.java | 2 +- .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 3 +-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index a810c4c..428e87a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -96,7 +96,6 @@ public class BabyModel extends BaseModel { private String cardNo; private String hospitalId; - private String hospitalName; //建档类型 1、儿童直接建档 2 产妇分娩建档 3 为转诊自动建档 private Integer buildType; /** @@ -335,14 +334,6 @@ public class BabyModel extends BaseModel { this.hospitalId = hospitalId; } - public String getHospitalName() { - return hospitalName; - } - - public void setHospitalName(String hospitalName) { - this.hospitalName = hospitalName; - } - public String getCardNo() { return cardNo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index e411128..aa9e8ff 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -323,7 +323,7 @@ public class BabyBuildController extends BaseController { * @createTime 2016年11月24日 17时01分 * @discription 医院列表 */ - @RequestMapping(method = RequestMethod.GET, value = "/queryHospitalList") + @RequestMapping(method = RequestMethod.POST, value = "/queryHospitalList") @ResponseBody public BaseResponse queryHospitalList(@RequestParam(value = "provinceId", required = false) String provinceId, @RequestParam(value = "cityId", required = false) String cityId, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index ce48581..87b77ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -482,7 +482,6 @@ public class BabyBookbuildingFacade { model.setBuildType(1); model.setHospitalId(request.getHospitalId()); String hospitalName = organizationService.getOrganization(Integer.valueOf(request.getHospitalId())).getName(); - model.setHospitalName(hospitalName); model = babyBookbuildingService.addBabyBookbuilding(model); if (model == null || model.getId() == null) { @@ -1496,7 +1495,7 @@ public class BabyBookbuildingFacade { result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); result.setPatientId(model.getParentId()); result.setBuildTime(DateUtil.getyyyy_MM_dd(model.getBuildDate())); - result.setHospitalName(model.getHospitalName()); + result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName()); // 开始查询省市区街道 // 省 -- 1.8.3.1