From b503156cc8b2829ea1e1a1fb54562e0d39acf5c2 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 16 Jan 2018 16:06:12 +0800
Subject: [PATCH] update code

---
 .../src/main/resources/mainOrm/master/MeasureInfoMapper.xml | 13 ++++++++++---
 .../main/java/com/lyms/platform/pojo/MeasureInfoModel.java  | 11 +++++++++++
 .../main/java/com/lyms/platform/query/MeasureInfoQuery.java | 11 ++++++++++-
 .../operate/web/controller/MeasureInfoController.java       |  4 ++++
 .../lyms/platform/operate/web/facade/MeasureInfoFacade.java |  1 +
 .../platform/operate/web/request/MeasureInfoRequest.java    | 11 +++++++++++
 6 files changed, 47 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 423eeb8..74dccb2 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
@@ -25,25 +25,26 @@
 		<result column="created" property="created"/>
 		<result column="modified" property="modified"/>
 		<result column="today_count" property="todayCount"/>
+		<result column="zy_no" property="zyNo"/>
 	</resultMap>
 	
 	<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_three,value_type,record_time,wx_code
-		,record_count,open_id,created,modified,hospital_id,today_count)
+		,record_count,open_id,created,modified,hospital_id,today_count,zy_no)
 		 VALUES (#{userName},#{certType},
 		 #{certNo},#{age},#{phone},#{sex}
 		 ,#{vcCardNo},#{valueOne}
 		 ,#{valueTwo},#{valueThree},#{valueType},#{recordTime},
-		 #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount})
+		 #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount},#{zyNo})
 	</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_three,value_type,record_time,wx_code
-		,record_count,open_id,created,modified,hospital_id,today_count
+		,record_count,open_id,created,modified,hospital_id,today_count,,zy_no
 		FROM measure_info
 
 		<include refid="queryMeasureInfoCondition"/>
@@ -84,6 +85,9 @@
 			<if test="vcCardNo != null">
 				 vc_card_no = #{vcCardNo,jdbcType=VARCHAR},
 			</if>
+			<if test="zyNo != null">
+				zy_no = #{zyNo,jdbcType=VARCHAR},
+			</if>
 			<if test="valueOne != null and valueOne != ''">
 				 value_one = #{valueOne,jdbcType=VARCHAR},
 			</if>
@@ -162,6 +166,9 @@
 			<if test="vcCardNo != null and vcCardNo != ''">
 				and vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
 			</if>
+			<if test="zyNo != null and zyNo != ''">
+				and zy_no = #{zyNo,jdbcType=VARCHAR}
+			</if>
 			<if test="valueOne != null and valueOne != ''">
 				and value_one = #{valueOne,jdbcType=VARCHAR}
 			</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 d428554..3099efa 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
@@ -55,6 +55,17 @@ public class MeasureInfoModel {
     //当天记录次数
     private Integer todayCount;
 
+    //住院号
+    private String zyNo;
+
+    public String getZyNo() {
+        return zyNo;
+    }
+
+    public void setZyNo(String zyNo) {
+        this.zyNo = zyNo;
+    }
+
     public String getValueThree() {
         return valueThree;
     }
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 068a9ff..0edb9ba 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
@@ -65,7 +65,8 @@ public class MeasureInfoQuery extends BaseQuery implements IConvertToNativeQuery
     private Date recordTime;
 
     private Integer todayCount;
-
+    //住院号
+    private String zyNo;
 
 
     @Override
@@ -150,6 +151,14 @@ public class MeasureInfoQuery extends BaseQuery implements IConvertToNativeQuery
         return condition.toMongoQuery();
     }
 
+    public String getZyNo() {
+        return zyNo;
+    }
+
+    public void setZyNo(String zyNo) {
+        this.zyNo = zyNo;
+    }
+
     public String getValueThree() {
         return valueThree;
     }
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 f83860a..88f2b33 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
@@ -76,6 +76,7 @@ public class MeasureInfoController extends BaseController {
             @RequestParam(value = "hospitalId", required = false) String hospitalId,
             @RequestParam(value = "age", required = false) Integer age,
             @RequestParam(value = "phone", required = false) String phone,
+            @RequestParam(value = "zyNo", required = false) String zyNo,
             HttpServletRequest request) {
         MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
         measureInfoRequest.setUserName(userName);
@@ -92,6 +93,7 @@ public class MeasureInfoController extends BaseController {
         measureInfoRequest.setRecordTime(new Date().getTime());
         measureInfoRequest.setRecordCount(1);
         measureInfoRequest.setValueType(2);
+        measureInfoRequest.setZyNo(zyNo);
         System.out.println(" 添加血压和脉搏请求参数："+measureInfoRequest.toString());
         return measureInfoFacade.addMeasureInfo(measureInfoRequest);
     }
@@ -116,6 +118,7 @@ public class MeasureInfoController extends BaseController {
             @RequestParam(value = "hospitalId", required = false) String hospitalId,
             @RequestParam(value = "age", required = false) Integer age,
             @RequestParam(value = "phone", required = false) String phone,
+            @RequestParam(value = "zyNo", required = false) String zyNo,
             HttpServletRequest request) {
         MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
         measureInfoRequest.setUserName(userName);
@@ -133,6 +136,7 @@ public class MeasureInfoController extends BaseController {
         measureInfoRequest.setRecordTime(new Date().getTime());
         measureInfoRequest.setRecordCount(1);
         measureInfoRequest.setValueType(1);
+        measureInfoRequest.setZyNo(zyNo);
         System.out.println("添加体重和身高请求参数："+measureInfoRequest.toString());
         return measureInfoFacade.addMeasureInfo(measureInfoRequest);
     }
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 2e79086..8269d61 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
@@ -241,6 +241,7 @@ public class MeasureInfoFacade {
         model.setVcCardNo(measureInfoRequest.getVcCardNo());
         model.setWxCode(measureInfoRequest.getWxCode());
         model.setPhone(measureInfoRequest.getPhone());
+        model.setZyNo(measureInfoRequest.getZyNo());
         return model;
     }
 }
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 a744d1d..aee0122 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
@@ -41,6 +41,17 @@ public class MeasureInfoRequest {
     //手机号码
     private String phone;
 
+    //住院号
+    private String zyNo;
+
+    public String getZyNo() {
+        return zyNo;
+    }
+
+    public void setZyNo(String zyNo) {
+        this.zyNo = zyNo;
+    }
+
     public String getValueThree() {
         return valueThree;
     }
-- 
1.8.3.1