jiangjiazhi / regional-platform

Commit ef92a43f80952fa36f411bfe5cba167222560c2c

Authored by liquanyu over 8 years ago

Exists in master and in 6 other branches

update code

Showing 6 changed files with 47 additions and 3 deletions

platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java
platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java

...	...	@@ -15,6 +15,7 @@
15	15	<result column="vc_card_no" property="vcCardNo"/>
16	16	<result column="value_one" property="valueOne"/>
17	17	<result column="value_two" property="valueTwo"/>
	18	+ <result column="value_three" property="valueThree"/>
18	19	<result column="value_type" property="valueType"/>
19	20	<result column="record_time" property="recordTime"/>
20	21	<result column="wx_code" property="wxCode"/>
21	22
22	23
...	...	@@ -29,19 +30,19 @@
29	30	<insert id="addMeasureInfo" parameterType="com.lyms.platform.pojo.MeasureInfoModel" >
30	31	INSERT INTO measure_info(user_name,cert_type,
31	32	cert_no,age,phone,sex,vc_card_no,
32		- value_one,value_two,value_type,record_time,wx_code
	33	+ value_one,value_two,value_three,value_type,record_time,wx_code
33	34	,record_count,open_id,created,modified,hospital_id,today_count)
34	35	VALUES (#{userName},#{certType},
35	36	#{certNo},#{age},#{phone},#{sex}
36	37	,#{vcCardNo},#{valueOne}
37		- ,#{valueTwo},#{valueType},#{recordTime},
	38	+ ,#{valueTwo},#{valueThree},#{valueType},#{recordTime},
38	39	#{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount})
39	40	</insert>
40	41
41	42	<select id="queryMeasureInfoList" parameterType="com.lyms.platform.query.MeasureInfoQuery" resultMap="measureInfoModelMap">
42	43	SELECT id,user_name,cert_type,
43	44	cert_no,age,phone,sex,vc_card_no,
44		- value_one,value_two,value_type,record_time,wx_code
	45	+ value_one,value_two,value_three,value_type,record_time,wx_code
45	46	,record_count,open_id,created,modified,hospital_id,today_count
46	47	FROM measure_info
47	48
...	...	@@ -89,6 +90,9 @@
89	90	<if test="valueTwo != null and valueTwo != ''">
90	91	value_two = #{valueTwo,jdbcType=VARCHAR},
91	92	</if>
	93	+ <if test="valueThree != null and valueThree != ''">
	94	+ value_three = #{valueThree,jdbcType=VARCHAR},
	95	+ </if>
92	96	<if test="valueType != null and valueType > 0">
93	97	value_type = #{valueType,jdbcType=INTEGER},
94	98	</if>
...	...	@@ -163,6 +167,9 @@
163	167	</if>
164	168	<if test="valueTwo != null and valueTwo != ''">
165	169	and value_two = #{valueTwo,jdbcType=VARCHAR}
	170	+ </if>
	171	+ <if test="valueThree != null and valueThree != ''">
	172	+ and value_three = #{valueThree,jdbcType=VARCHAR}
166	173	</if>
167	174	<if test="valueType != null and valueType > 0">
168	175	and value_type = #{valueType,jdbcType=INTEGER}

...	...	@@ -25,6 +25,10 @@
25	25	private String valueOne;
26	26	//脉搏/身高
27	27	private String valueTwo;
	28	+
	29	+ //体重测量存BMI值
	30	+ private String valueThree;
	31	+
28	32	//值类型： 1 体重和身高 2 血压和脉搏
29	33	private Integer valueType;
30	34	//记录时间
...	...	@@ -50,6 +54,14 @@
50	54
51	55	//当天记录次数
52	56	private Integer todayCount;
	57	+
	58	+ public String getValueThree() {
	59	+ return valueThree;
	60	+ }
	61	+
	62	+ public void setValueThree(String valueThree) {
	63	+ this.valueThree = valueThree;
	64	+ }
53	65
54	66	public Integer getTodayCount() {
55	67	return todayCount;

...	...	@@ -39,6 +39,9 @@
39	39
40	40	//脉搏/身高
41	41	private String valueTwo;
	42	+
	43	+ //体重测量存BMI值
	44	+ private String valueThree;
42	45	//值类型： 1 体重、身高 2 血压和脉搏
43	46	private Integer valueType;
44	47	//记录时间
...	...	@@ -145,6 +148,14 @@
145	148	condition = condition.andCondition(new MongoCondition(c1));
146	149	}
147	150	return condition.toMongoQuery();
	151	+ }
	152	+
	153	+ public String getValueThree() {
	154	+ return valueThree;
	155	+ }
	156	+
	157	+ public void setValueThree(String valueThree) {
	158	+ this.valueThree = valueThree;
148	159	}
149	160
150	161	public Integer getTodayCount() {

...	...	@@ -111,6 +111,7 @@
111	111	@RequestParam(value = "vcCardNo", required = false) String vcCardNo,
112	112	@RequestParam(value = "valueOne", required = false) String valueOne,
113	113	@RequestParam(value = "valueTwo", required = false) String valueTwo,
	114	+ @RequestParam(value = "valueThree", required = false) String valueThree,
114	115	@RequestParam(value = "wxCode", required = false) String wxCode,
115	116	@RequestParam(value = "hospitalId", required = false) String hospitalId,
116	117	@RequestParam(value = "age", required = false) Integer age,
...	...	@@ -124,6 +125,7 @@
124	125	measureInfoRequest.setVcCardNo(vcCardNo);
125	126	measureInfoRequest.setValueOne(valueOne);
126	127	measureInfoRequest.setValueTwo(valueTwo);
	128	+ measureInfoRequest.setValueThree(valueThree);
127	129	measureInfoRequest.setWxCode(wxCode);
128	130	measureInfoRequest.setAge(age);
129	131	measureInfoRequest.setPhone(phone);

...	...	@@ -172,6 +172,7 @@
172	172	model.setRecordTime(new Date());
173	173	model.setModified(new Date());
174	174	model.setId(measureInfoModel.getId());
	175	+ model.setRecordCount(measureInfoModel.getRecordCount()+1);
175	176	mysqlMeasureInfoService.updateMeasureInfo(model);
176	177	}
177	178	else
...	...	@@ -233,6 +234,7 @@
233	234	model.setRecordCount(measureInfoRequest.getRecordCount());
234	235	model.setRecordTime(new Date(measureInfoRequest.getRecordTime()));
235	236	model.setSex(measureInfoRequest.getSex());
	237	+ model.setValueThree(measureInfoRequest.getValueThree());
236	238	model.setAge(measureInfoRequest.getAge());
237	239	model.setValueOne(measureInfoRequest.getValueOne());
238	240	model.setValueTwo(measureInfoRequest.getValueTwo());

...	...	@@ -19,6 +19,8 @@
19	19	private String valueOne;
20	20	//脉搏/身高
21	21	private String valueTwo;
	22	+ //体重测量存BMI值
	23	+ private String valueThree;
22	24	//值类型： 1 体重和身高 2 血压和脉搏
23	25	private Integer valueType;
24	26	//记录时间
...	...	@@ -38,6 +40,14 @@
38	40
39	41	//手机号码
40	42	private String phone;
	43	+
	44	+ public String getValueThree() {
	45	+ return valueThree;
	46	+ }
	47	+
	48	+ public void setValueThree(String valueThree) {
	49	+ this.valueThree = valueThree;
	50	+ }
41	51
42	52	public String getPhone() {
43	53	return phone;