From 78cc4602082cc1ebf25f37876d0a20b29d23db9e Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Fri, 25 Nov 2016 11:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=8C=E6=95=B4=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=B8=8E=E5=8C=BB=E9=99=A2=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/pojo/BabyModel.java  |  9 +++++++++
 .../operate/web/facade/BabyBookbuildingFacade.java   | 20 ++++++++++++++++++++
 .../operate/web/result/BabyManageListResult.java     | 20 ++++++++++++++++++++
 3 files changed, 49 insertions(+)

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 428e87a..a810c4c 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,6 +96,7 @@ public class BabyModel extends BaseModel {
     private String cardNo;
 
     private String hospitalId;
+    private String hospitalName;
     //建档类型  1、儿童直接建档 2 产妇分娩建档 3  为转诊自动建档
     private Integer buildType;
     /**
@@ -334,6 +335,14 @@ 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/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 0bd6d47..9ca08dc 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
@@ -38,6 +38,7 @@ public class BabyBookbuildingFacade {
 
     public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
 
+
     @Autowired
     private HisService hisServiceV2;
 
@@ -479,6 +480,9 @@ public class BabyBookbuildingFacade {
         model.setCreated(new Date());
         model.setModified(new Date());
         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) {
@@ -1488,6 +1492,22 @@ 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());
+
+                // 开始查询省市区街道
+                // 省
+                String provinceName = basicConfigService.getOneBasicConfigById(model.getProvinceId()).getName();
+                // 市
+                String cityName = basicConfigService.getOneBasicConfigById(model.getCityId()).getName();
+                // 区
+                String areaName = basicConfigService.getOneBasicConfigById(model.getAreaId()).getName();
+                // 街道
+                String streetName = basicConfigService.getOneBasicConfigById(model.getStreetId()).getName();
+                // 具体
+                String address = model.getAddress();
+                String completeAddress = provinceName+cityName+areaName+streetName+address;
+                result.setCompleteAddress(completeAddress);
+
                 String diagnose = "";
 //                if (!StringUtils.isEmpty(model.getDiagnose())) {
 //                    List diagList = JsonUtil.toList(model.getDiagnose(), List.class);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
index deb05ad..8763030 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
@@ -48,6 +48,26 @@ public class BabyManageListResult {
 
     private String buildTime;
 
+    private String hospitalName;
+
+    private String completeAddress;
+
+    public String getCompleteAddress() {
+        return completeAddress;
+    }
+
+    public void setCompleteAddress(String completeAddress) {
+        this.completeAddress = completeAddress;
+    }
+
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
     public String getBuildTime() {
         return buildTime;
     }
-- 
1.8.3.1