From 3f6dd5df81eef2efa3af8db6d3990626d3328107 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 11 Jan 2018 15:35:31 +0800
Subject: [PATCH] update code

---
 .../main/resources/mainOrm/master/MeasureInfoMapper.xml |  9 ++++++---
 .../platform/operate/web/facade/MeasureInfoFacade.java  | 17 ++++++++++++++++-
 .../platform/operate/web/result/MeasureInfoResult.java  | 12 ++++++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
index a74f6ea..97a654f 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
@@ -29,19 +29,19 @@
 		INSERT INTO measure_info(user_name,cert_type,
 		cert_no,age,phone,sex,vc_card_no,
 		value_one,value_two,value_type,record_time,wx_code
-		,record_count,open_id,created,modified)
+		,record_count,open_id,created,modified,hospital_id)
 		 VALUES (#{userName},#{certType},
 		 #{certNo},#{age},#{phone},#{sex}
 		 ,#{vcCardNo},#{valueOne}
 		 ,#{valueTwo},#{valueType},#{recordTime},
-		 #{wxCode},#{recordCount},#{openId},#{created},#{modified})
+		 #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId})
 	</insert>
 
 	<select id="queryMeasureInfoList" parameterType="com.lyms.platform.query.MeasureInfoQuery" resultMap="measureInfoModelMap">
 		SELECT  id,user_name,cert_type,
 		cert_no,age,phone,sex,vc_card_no,
 		value_one,value_two,value_type,record_time,wx_code
-		,record_count,open_id,created,modified
+		,record_count,open_id,created,modified,hospital_id
 		FROM measure_info
 
 		<include refid="queryMeasureInfoCondition"/>
@@ -103,6 +103,9 @@
 			<if test="openId != null and openId != ''">
 				 open_id = #{openId,jdbcType=VARCHAR},
 			</if>
+			<if test="hospitalId != null and hospitalId != ''">
+				hospital_id = #{hospitalId,jdbcType=VARCHAR},
+			</if>
 			<if test="created != null">
 				 created = #{created},
 			</if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index ce67b79..fbc8ef7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -4,11 +4,14 @@ import com.lyms.platform.biz.service.BasicConfigService;
 import com.lyms.platform.biz.service.DataPermissionService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.SexEnum;
+import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.MeasureInfoRequest;
 import com.lyms.platform.operate.web.result.MeasureInfoResult;
+import com.lyms.platform.permission.model.Organization;
+import com.lyms.platform.permission.service.OrganizationService;
 import com.lyms.platform.pojo.BasicConfig;
 import com.lyms.platform.pojo.DataPermissionsModel;
 import com.lyms.platform.pojo.MeasureInfoModel;
@@ -33,6 +36,9 @@ public class MeasureInfoFacade {
     private DataPermissionService dataPermissionService;
 
     @Autowired
+    private OrganizationService organizationService;
+
+    @Autowired
     private BasicConfigService basicConfigService;
 
     public BaseListResponse queryMeasureInfoList(String queryNo,
@@ -44,7 +50,6 @@ public class MeasureInfoFacade {
         DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
         dataPermissionsModelQuery.setUserId(userId);
 
-
         List<String> hospitalList = new ArrayList<>();
 
         List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
@@ -58,6 +63,7 @@ public class MeasureInfoFacade {
                 }
             }
         }
+        System.out.println(hospitalList);
 
         List<MeasureInfoResult> results = new ArrayList<>();
         MeasureInfoQuery query = new MeasureInfoQuery();
@@ -109,6 +115,15 @@ public class MeasureInfoFacade {
                     result.setVcCardNo(model.getVcCardNo() == null ? "--" : model.getVcCardNo());
                     result.setWxXode(model.getWxCode());
                     result.setPhone(model.getPhone());
+
+                    String hospital = "";
+                    if (org.apache.commons.lang.StringUtils.isNotEmpty(result.getHospitalId())) {
+                        Organization organization = organizationService.getOrganization(Integer.parseInt(result.getHospitalId()));
+                        if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
+                            hospital = organization.getName();
+                        }
+                    }
+                    result.setHospitalName(hospital);
                     results.add(result);
                 }
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java
index d477aa2..4838f99 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java
@@ -36,6 +36,18 @@ public class MeasureInfoResult {
     //手机号码
     private String phone;
 
+    //医院名称
+    private String hospitalName;
+
+
+    public String getHospitalName() {
+        return hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
     public String getPhone() {
         return phone;
     }
-- 
1.8.3.1