From ef92a43f80952fa36f411bfe5cba167222560c2c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 15 Jan 2018 15:52:13 +0800
Subject: [PATCH] update code

---
 .../src/main/resources/mainOrm/master/MeasureInfoMapper.xml | 13 ++++++++++---
 .../main/java/com/lyms/platform/pojo/MeasureInfoModel.java  | 12 ++++++++++++
 .../main/java/com/lyms/platform/query/MeasureInfoQuery.java | 11 +++++++++++
 .../operate/web/controller/MeasureInfoController.java       |  2 ++
 .../lyms/platform/operate/web/facade/MeasureInfoFacade.java |  2 ++
 .../platform/operate/web/request/MeasureInfoRequest.java    | 10 ++++++++++
 6 files changed, 47 insertions(+), 3 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 d0d62f2..423eeb8 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
@@ -15,6 +15,7 @@
 		<result column="vc_card_no" property="vcCardNo"/>
 		<result column="value_one" property="valueOne"/>
 		<result column="value_two" property="valueTwo"/>
+		<result column="value_three" property="valueThree"/>
 		<result column="value_type" property="valueType"/>
 		<result column="record_time" property="recordTime"/>
 		<result column="wx_code" property="wxCode"/>
@@ -29,19 +30,19 @@
 	<insert id="addMeasureInfo" parameterType="com.lyms.platform.pojo.MeasureInfoModel" >
 		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
+		value_one,value_two,value_three,value_type,record_time,wx_code
 		,record_count,open_id,created,modified,hospital_id,today_count)
 		 VALUES (#{userName},#{certType},
 		 #{certNo},#{age},#{phone},#{sex}
 		 ,#{vcCardNo},#{valueOne}
-		 ,#{valueTwo},#{valueType},#{recordTime},
+		 ,#{valueTwo},#{valueThree},#{valueType},#{recordTime},
 		 #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount})
 	</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
+		value_one,value_two,value_three,value_type,record_time,wx_code
 		,record_count,open_id,created,modified,hospital_id,today_count
 		FROM measure_info
 
@@ -89,6 +90,9 @@
 			<if test="valueTwo != null and valueTwo != ''">
 				 value_two = #{valueTwo,jdbcType=VARCHAR},
 			</if>
+			<if test="valueThree != null and valueThree != ''">
+				 value_three = #{valueThree,jdbcType=VARCHAR},
+			</if>
 			<if test="valueType != null and valueType > 0">
 				 value_type = #{valueType,jdbcType=INTEGER},
 			</if>
@@ -164,6 +168,9 @@
 			<if test="valueTwo != null and valueTwo != ''">
 				and value_two = #{valueTwo,jdbcType=VARCHAR}
 			</if>
+			<if test="valueThree != null and valueThree != ''">
+				and value_three = #{valueThree,jdbcType=VARCHAR}
+			</if>
 			<if test="valueType != null and valueType > 0">
 				and value_type = #{valueType,jdbcType=INTEGER}
 			</if>
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java
index 525988b..d428554 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java
@@ -25,6 +25,10 @@ public class MeasureInfoModel {
     private  String valueOne;
     //脉搏/身高
     private  String valueTwo;
+
+    //体重测量存BMI值
+    private  String valueThree;
+
     //值类型： 1 体重和身高 2 血压和脉搏
     private  Integer valueType;
     //记录时间
@@ -51,6 +55,14 @@ public class MeasureInfoModel {
     //当天记录次数
     private Integer todayCount;
 
+    public String getValueThree() {
+        return valueThree;
+    }
+
+    public void setValueThree(String valueThree) {
+        this.valueThree = valueThree;
+    }
+
     public Integer getTodayCount() {
         return todayCount;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java
index 23c5a7a..068a9ff 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java
@@ -39,6 +39,9 @@ public class MeasureInfoQuery extends BaseQuery implements IConvertToNativeQuery
 
     //脉搏/身高
     private  String valueTwo;
+
+    //体重测量存BMI值
+    private  String valueThree;
     //值类型： 1 体重、身高 2 血压和脉搏
     private  Integer valueType;
     //记录时间
@@ -147,6 +150,14 @@ public class MeasureInfoQuery extends BaseQuery implements IConvertToNativeQuery
         return condition.toMongoQuery();
     }
 
+    public String getValueThree() {
+        return valueThree;
+    }
+
+    public void setValueThree(String valueThree) {
+        this.valueThree = valueThree;
+    }
+
     public Integer getTodayCount() {
         return todayCount;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
index 6c9763f..f83860a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
@@ -111,6 +111,7 @@ public class MeasureInfoController extends BaseController {
             @RequestParam(value = "vcCardNo", required = false) String vcCardNo,
             @RequestParam(value = "valueOne", required = false) String valueOne,
             @RequestParam(value = "valueTwo", required = false) String valueTwo,
+            @RequestParam(value = "valueThree", required = false) String valueThree,
             @RequestParam(value = "wxCode", required = false) String wxCode,
             @RequestParam(value = "hospitalId", required = false) String hospitalId,
             @RequestParam(value = "age", required = false) Integer age,
@@ -124,6 +125,7 @@ public class MeasureInfoController extends BaseController {
         measureInfoRequest.setVcCardNo(vcCardNo);
         measureInfoRequest.setValueOne(valueOne);
         measureInfoRequest.setValueTwo(valueTwo);
+        measureInfoRequest.setValueThree(valueThree);
         measureInfoRequest.setWxCode(wxCode);
         measureInfoRequest.setAge(age);
         measureInfoRequest.setPhone(phone);
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 b594b6f..ae27f10 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
@@ -172,6 +172,7 @@ public class MeasureInfoFacade {
                 model.setRecordTime(new Date());
                 model.setModified(new Date());
                 model.setId(measureInfoModel.getId());
+                model.setRecordCount(measureInfoModel.getRecordCount()+1);
                 mysqlMeasureInfoService.updateMeasureInfo(model);
             }
             else
@@ -233,6 +234,7 @@ public class MeasureInfoFacade {
         model.setRecordCount(measureInfoRequest.getRecordCount());
         model.setRecordTime(new Date(measureInfoRequest.getRecordTime()));
         model.setSex(measureInfoRequest.getSex());
+        model.setValueThree(measureInfoRequest.getValueThree());
         model.setAge(measureInfoRequest.getAge());
         model.setValueOne(measureInfoRequest.getValueOne());
         model.setValueTwo(measureInfoRequest.getValueTwo());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
index 7d7732d..a744d1d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
@@ -19,6 +19,8 @@ public class MeasureInfoRequest {
     private  String valueOne;
     //脉搏/身高
     private  String valueTwo;
+    //体重测量存BMI值
+    private  String valueThree;
     //值类型： 1 体重和身高 2 血压和脉搏
     private  Integer valueType;
     //记录时间
@@ -39,6 +41,14 @@ public class MeasureInfoRequest {
     //手机号码
     private String phone;
 
+    public String getValueThree() {
+        return valueThree;
+    }
+
+    public void setValueThree(String valueThree) {
+        this.valueThree = valueThree;
+    }
+
     public String getPhone() {
         return phone;
     }
-- 
1.8.3.1