jiangjiazhi / regional-platform

Commit 932a8585de027517738a2d3aa2534a33ba2d6459

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

update code

Showing 6 changed files with 48 additions and 4 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

...	...	@@ -26,25 +26,26 @@
26	26	<result column="modified" property="modified"/>
27	27	<result column="today_count" property="todayCount"/>
28	28	<result column="zy_no" property="zyNo"/>
	29	+ <result column="visit_id" property="visitId"/>
29	30	</resultMap>
30	31
31	32	<insert id="addMeasureInfo" parameterType="com.lyms.platform.pojo.MeasureInfoModel" >
32	33	INSERT INTO measure_info(user_name,cert_type,
33	34	cert_no,age,phone,sex,vc_card_no,
34	35	value_one,value_two,value_three,value_type,record_time,wx_code
35		- ,record_count,open_id,created,modified,hospital_id,today_count,zy_no)
	36	+ ,record_count,open_id,created,modified,hospital_id,today_count,zy_no,visit_id)
36	37	VALUES (#{userName},#{certType},
37	38	#{certNo},#{age},#{phone},#{sex}
38	39	,#{vcCardNo},#{valueOne}
39	40	,#{valueTwo},#{valueThree},#{valueType},#{recordTime},
40		- #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount},#{zyNo})
	41	+ #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount},#{zyNo},#{visitId})
41	42	</insert>
42	43
43	44	<select id="queryMeasureInfoList" parameterType="com.lyms.platform.query.MeasureInfoQuery" resultMap="measureInfoModelMap">
44	45	SELECT id,user_name,cert_type,
45	46	cert_no,age,phone,sex,vc_card_no,
46	47	value_one,value_two,value_three,value_type,record_time,wx_code
47		- ,record_count,open_id,created,modified,hospital_id,today_count,zy_no
	48	+ ,record_count,open_id,created,modified,hospital_id,today_count,zy_no,visit_id
48	49	FROM measure_info
49	50
50	51	<include refid="queryMeasureInfoCondition"/>
51	52
...	...	@@ -85,9 +86,12 @@
85	86	<if test="vcCardNo != null">
86	87	vc_card_no = #{vcCardNo,jdbcType=VARCHAR},
87	88	</if>
88		- <if test="zyNo != null">
	89	+ <if test="zyNo != null and zyNo != ''">
89	90	zy_no = #{zyNo,jdbcType=VARCHAR},
90	91	</if>
	92	+ <if test="visitId != null and visitId != ''">
	93	+ visit_id = #{visitId,jdbcType=VARCHAR},
	94	+ </if>
91	95	<if test="valueOne != null and valueOne != ''">
92	96	value_one = #{valueOne,jdbcType=VARCHAR},
93	97	</if>
...	...	@@ -168,6 +172,9 @@
168	172	</if>
169	173	<if test="zyNo != null and zyNo != ''">
170	174	and zy_no = #{zyNo,jdbcType=VARCHAR}
	175	+ </if>
	176	+ <if test="visitId != null and visitId != ''">
	177	+ and visit_id = #{visitId,jdbcType=VARCHAR}
171	178	</if>
172	179	<if test="valueOne != null and valueOne != ''">
173	180	and value_one = #{valueOne,jdbcType=VARCHAR}

...	...	@@ -58,6 +58,17 @@
58	58	//住院号
59	59	private String zyNo;
60	60
	61	+ //住院次数
	62	+ private String visitId;
	63	+
	64	+ public String getVisitId() {
	65	+ return visitId;
	66	+ }
	67	+
	68	+ public void setVisitId(String visitId) {
	69	+ this.visitId = visitId;
	70	+ }
	71	+
61	72	public String getZyNo() {
62	73	return zyNo;
63	74	}

...	...	@@ -68,6 +68,8 @@
68	68	//住院号
69	69	private String zyNo;
70	70
	71	+ //住院次数
	72	+ private String visitId;
71	73
72	74	@Override
73	75	public MongoQuery convertToQuery() {
...	...	@@ -149,6 +151,14 @@
149	151	condition = condition.andCondition(new MongoCondition(c1));
150	152	}
151	153	return condition.toMongoQuery();
	154	+ }
	155	+
	156	+ public String getVisitId() {
	157	+ return visitId;
	158	+ }
	159	+
	160	+ public void setVisitId(String visitId) {
	161	+ this.visitId = visitId;
152	162	}
153	163
154	164	public String getZyNo() {

...	...	@@ -77,6 +77,7 @@
77	77	@RequestParam(value = "age", required = false) Integer age,
78	78	@RequestParam(value = "phone", required = false) String phone,
79	79	@RequestParam(value = "zyNo", required = false) String zyNo,
	80	+ @RequestParam(value = "visitId", required = false) String visitId,
80	81	HttpServletRequest request) {
81	82	MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
82	83	measureInfoRequest.setUserName(userName);
...	...	@@ -94,6 +95,7 @@
94	95	measureInfoRequest.setRecordCount(1);
95	96	measureInfoRequest.setValueType(2);
96	97	measureInfoRequest.setZyNo(zyNo);
	98	+ measureInfoRequest.setVisitId(visitId);
97	99	System.out.println(" 添加血压和脉搏请求参数："+measureInfoRequest.toString());
98	100	return measureInfoFacade.addMeasureInfo(measureInfoRequest);
99	101	}
...	...	@@ -119,6 +121,7 @@
119	121	@RequestParam(value = "age", required = false) Integer age,
120	122	@RequestParam(value = "phone", required = false) String phone,
121	123	@RequestParam(value = "zyNo", required = false) String zyNo,
	124	+ @RequestParam(value = "visitId", required = false) String visitId,
122	125	HttpServletRequest request) {
123	126	MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
124	127	measureInfoRequest.setUserName(userName);
...	...	@@ -137,6 +140,7 @@
137	140	measureInfoRequest.setRecordCount(1);
138	141	measureInfoRequest.setValueType(1);
139	142	measureInfoRequest.setZyNo(zyNo);
	143	+ measureInfoRequest.setVisitId(visitId);
140	144	System.out.println("添加体重和身高请求参数："+measureInfoRequest.toString());
141	145	return measureInfoFacade.addMeasureInfo(measureInfoRequest);
142	146	}

...	...	@@ -242,6 +242,7 @@
242	242	model.setWxCode(measureInfoRequest.getWxCode());
243	243	model.setPhone(measureInfoRequest.getPhone());
244	244	model.setZyNo(measureInfoRequest.getZyNo());
	245	+ model.setVisitId(measureInfoRequest.getVisitId());
245	246	return model;
246	247	}
247	248	}

...	...	@@ -44,6 +44,17 @@
44	44	//住院号
45	45	private String zyNo;
46	46
	47	+ //住院次数
	48	+ private String visitId;
	49	+
	50	+ public String getVisitId() {
	51	+ return visitId;
	52	+ }
	53	+
	54	+ public void setVisitId(String visitId) {
	55	+ this.visitId = visitId;
	56	+ }
	57	+
47	58	public String getZyNo() {
48	59	return zyNo;
49	60	}