From 912d330aecbb1bb9d879354ea46164863f719350 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 24 Feb 2018 14:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=B5=8B=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mainOrm/master/MeasureDataInfoMapper.xml    | 15 ++++++++++++---
 .../platform/operate/web/facade/MeasureInfoFacade.java    |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
index e7aa53a..3f04eef 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
@@ -30,6 +30,7 @@
 		<result column="created" property="created"/>
 		<result column="modified" property="modified"/>
 		<result column="today_count" property="todayCount"/>
+		<result column="record_content" property="recordContent"/>
 		<result column="remark_value" property="remarkValue"/>
 		<association property="measureUserInfoModel" javaType="com.lyms.platform.pojo.MeasureUserInfoModel">
 			<result column="user_name" property="userName"/>
@@ -54,16 +55,16 @@
 	<insert id="addMeasureDataInfo" parameterType="com.lyms.platform.pojo.MeasureDataInfoModel" >
 		INSERT INTO measure_data_info(measure_user_id,
 		value_one,value_two,value_three,value_type
-		,record_count,created,modified,today_count,remark_value)
+		,record_count,created,modified,today_count,remark_value,record_content)
 		 VALUES (#{measureUserId},#{valueOne}
-		 ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue})
+		 ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{recordContent})
 	</insert>
 
 	<select id="queryMeasureDataInfoList" parameterType="com.lyms.platform.query.MeasureDataInfoQuery"
 			resultMap="measureDataInfoModelMap">
 		SELECT  id,measure_user_id,
 		value_one,value_two,value_three,value_type
-		,record_count,created,modified,today_count,remark_value
+		,record_count,created,modified,today_count,remark_value,recordContent
 		FROM measure_data_info
 		<include refid="queryMeasureDataInfoCondition"/>
 		<include refid="orderAndLimit"/>
@@ -77,6 +78,7 @@
 		m.value_one,m.value_two,m.value_three,m.value_type,
 		m.record_count,m.created,m.modified,
 		m.today_count,m.remark_value,
+		m.record_content,
 		u.user_name,u.cert_type,
 		u.cert_no,u.age,u.phone,u.sex,u.vc_card_no,
 		u.hospital_id,u.patient_id,u.address,u.face,u.finger
@@ -207,6 +209,9 @@
 			<if test="recordCount != null and recordCount >= 0">
 				 record_count = #{recordCount,jdbcType=INTEGER},
 			</if>
+			<if test="recordContent != null">
+				record_content = #{recordContent,jdbcType=VARCHAR},
+			</if>
 			<if test="created != null">
 				 created = #{created},
 			</if>
@@ -258,6 +263,10 @@
 			<if test="recordCount != null and recordCount >= 0">
 				and record_count = #{recordCount,jdbcType=INTEGER}
 			</if>
+
+			<if test="recordContent != null">
+				and record_content = #{recordContent,jdbcType=VARCHAR}
+			</if>
 			<if test="createdTimeStart != null">
 				AND   created >= date_format(#{createdTimeStart},'%Y-%m-%d')
 			</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 f1716b9..5f59992 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
@@ -141,7 +141,7 @@ public class MeasureInfoFacade {
                     }
                     result.setHospitalName(hospital);
 
-                    result.setRecordContent(model.getRecordContent());
+                    result.setRecordContent(model.getRecordContent() == null ? "" : model.getRecordContent());
 
                     results.add(result);
                 }
@@ -256,7 +256,7 @@ public class MeasureInfoFacade {
                     }
                     dataInfoModel.setTodayCount(todayCount);
 
-                    dataInfoModel.setRecordContent((measureDataInfoModel.getRecordContent() == null ? "" : measureDataInfoModel.getRecordContent()) + "," + measureInfoRequest.getValueOne());
+                    dataInfoModel.setRecordContent((measureDataInfoModel.getRecordContent() == null ? "" : measureDataInfoModel.getRecordContent()+ "," ) + measureInfoRequest.getValueOne());
                 }
                 else
                 {
-- 
1.8.3.1