jiangjiazhi / regional-platform

Commit 9fe226acfbbb7c8d76b8325e54459684e3a0d6d5

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

update code

Showing 5 changed files with 88 additions and 28 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

...	...	@@ -23,25 +23,26 @@
23	23	<result column="hospital_id" property="hospitalId"/>
24	24	<result column="created" property="created"/>
25	25	<result column="modified" property="modified"/>
	26	+ <result column="today_count" property="todayCount"/>
26	27	</resultMap>
27	28
28	29	<insert id="addMeasureInfo" parameterType="com.lyms.platform.pojo.MeasureInfoModel" >
29	30	INSERT INTO measure_info(user_name,cert_type,
30	31	cert_no,age,phone,sex,vc_card_no,
31	32	value_one,value_two,value_type,record_time,wx_code
32		- ,record_count,open_id,created,modified,hospital_id)
	33	+ ,record_count,open_id,created,modified,hospital_id,today_count)
33	34	VALUES (#{userName},#{certType},
34	35	#{certNo},#{age},#{phone},#{sex}
35	36	,#{vcCardNo},#{valueOne}
36	37	,#{valueTwo},#{valueType},#{recordTime},
37		- #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId})
	38	+ #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount})
38	39	</insert>
39	40
40	41	<select id="queryMeasureInfoList" parameterType="com.lyms.platform.query.MeasureInfoQuery" resultMap="measureInfoModelMap">
41	42	SELECT id,user_name,cert_type,
42	43	cert_no,age,phone,sex,vc_card_no,
43	44	value_one,value_two,value_type,record_time,wx_code
44		- ,record_count,open_id,created,modified,hospital_id
	45	+ ,record_count,open_id,created,modified,hospital_id,today_count
45	46	FROM measure_info
46	47
47	48	<include refid="queryMeasureInfoCondition"/>
...	...	@@ -112,6 +113,9 @@
112	113	<if test="modified != null">
113	114	modified = #{modified},
114	115	</if>
	116	+ <if test="todayCount != null and todayCount > 0">
	117	+ today_count = #{todayCount,jdbcType=INTEGER},
	118	+ </if>
115	119	</set>
116	120	where id = #{id,jdbcType=INTEGER}
117	121	</update>
...	...	@@ -195,6 +199,9 @@
195	199	<foreach collection="hospitalIds" index="index" item="item" open="(" separator="," close=")">
196	200	#{item}
197	201	</foreach>
	202	+ </if>
	203	+ <if test="todayCount != null and todayCount > 0">
	204	+ today_count = #{todayCount,jdbcType=INTEGER},
198	205	</if>
199	206	</where>
200	207	</sql>

...	...	@@ -48,6 +48,17 @@
48	48
49	49	private Integer age;
50	50
	51	+ //当天记录次数
	52	+ private Integer todayCount;
	53	+
	54	+ public Integer getTodayCount() {
	55	+ return todayCount;
	56	+ }
	57	+
	58	+ public void setTodayCount(Integer todayCount) {
	59	+ this.todayCount = todayCount;
	60	+ }
	61	+
51	62	public String getPhone() {
52	63	return phone;
53	64	}

...	...	@@ -61,8 +61,10 @@
61	61
62	62	private Date recordTime;
63	63
	64	+ private Integer todayCount;
64	65
65	66
	67	+
66	68	@Override
67	69	public MongoQuery convertToQuery() {
68	70	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -145,6 +147,13 @@
145	147	return condition.toMongoQuery();
146	148	}
147	149
	150	+ public Integer getTodayCount() {
	151	+ return todayCount;
	152	+ }
	153	+
	154	+ public void setTodayCount(Integer todayCount) {
	155	+ this.todayCount = todayCount;
	156	+ }
148	157
149	158	public Date getRecordTime() {
150	159	return recordTime;

...	...	@@ -53,7 +53,7 @@
53	53	*/
54	54	@RequestMapping(method = RequestMethod.POST, value = "/addMeasureInfo")
55	55	@ResponseBody
56		- public BaseResponse addMeasureInfo(MeasureInfoRequest measureInfoRequest, HttpServletRequest request) {
	56	+ public Object addMeasureInfo(MeasureInfoRequest measureInfoRequest, HttpServletRequest request) {
57	57	return measureInfoFacade.addMeasureInfo(measureInfoRequest);
58	58	}
59	59
...	...	@@ -64,7 +64,7 @@
64	64	*/
65	65	@RequestMapping(method = RequestMethod.GET, value = "/addXueYaInfo")
66	66	@ResponseBody
67		- public BaseResponse addXueYaInfo(
	67	+ public Object addXueYaInfo(
68	68	@RequestParam(value = "userName", required = false) String userName,
69	69	@RequestParam(value = "certType", required = false) String certType,
70	70	@RequestParam(value = "certNo", required = false) String certNo,
...	...	@@ -103,7 +103,7 @@
103	103	*/
104	104	@RequestMapping(method = RequestMethod.GET, value = "/addTzSgInfo")
105	105	@ResponseBody
106		- public BaseResponse addTzSgInfo(
	106	+ public Object addTzSgInfo(
107	107	@RequestParam(value = "userName", required = false) String userName,
108	108	@RequestParam(value = "certType", required = false) String certType,
109	109	@RequestParam(value = "certNo", required = false) String certNo,

...	...	@@ -41,6 +41,8 @@
41	41	@Autowired
42	42	private BasicConfigService basicConfigService;
43	43
	44	+ private static final Integer MAX_TODAY_COUNT = 5;
	45	+
44	46	public BaseListResponse queryMeasureInfoList(String queryNo,
45	47	Integer valueType, String vcCardNo,
46	48	String recordTime, Integer age,
47	49
48	50
49	51
...	...	@@ -136,31 +138,62 @@
136	138	return objectResponse;
137	139	}
138	140
139		- public BaseResponse addMeasureInfo(MeasureInfoRequest measureInfoRequest) {
140		-
141		- MeasureInfoModel model = getModel(measureInfoRequest);
142		- MeasureInfoQuery query = new MeasureInfoQuery();
143		- query.setCertNo(measureInfoRequest.getCertNo());
144		- query.setCertType(measureInfoRequest.getCertType());
145		- query.setValueType(measureInfoRequest.getValueType());
146		- List<MeasureInfoModel> list = mysqlMeasureInfoService.queryMeasureInfoList(query);
147		- if (CollectionUtils.isNotEmpty(list))
148		- {
149		- model.setModified(new Date());
150		- model.setId(list.get(0).getId());
151		- model.setRecordCount(list.get(0).getRecordCount()+1);
152		- mysqlMeasureInfoService.updateMeasureInfo(model);
	141	+ public Object addMeasureInfo(MeasureInfoRequest measureInfoRequest) {
	142	+ //今天测量次数
	143	+ Integer todayCount = 0;
	144	+ Map<String,String> map = new HashMap<>();
	145	+ try {
	146	+ MeasureInfoModel model = getModel(measureInfoRequest);
	147	+ MeasureInfoQuery query = new MeasureInfoQuery();
	148	+ query.setCertNo(measureInfoRequest.getCertNo());
	149	+ query.setCertType(measureInfoRequest.getCertType());
	150	+ query.setValueType(measureInfoRequest.getValueType());
	151	+ List<MeasureInfoModel> list = mysqlMeasureInfoService.queryMeasureInfoList(query);
	152	+ if (CollectionUtils.isNotEmpty(list))
	153	+ {
	154	+ MeasureInfoModel measureInfoModel = list.get(0);
	155	+ if (DateUtil.getyyyy_MM_dd(measureInfoModel.getRecordTime()).equals(DateUtil.getyyyy_MM_dd(new Date())))
	156	+ {
	157	+ todayCount = measureInfoModel.getTodayCount()+1;
	158	+ if (todayCount > MAX_TODAY_COUNT)
	159	+ {
	160	+ map.put("errorcode", String.valueOf(ErrorCodeConstants.SUCCESS));
	161	+ map.put("errormsg", measureInfoRequest.getValueType() == 1
	162	+ ? "今日测量体重和身高次数已经使用完了!" : "今日测量血压和脉搏次数已经使用完了!");
	163	+ return map;
	164	+ }
	165	+ model.setTodayCount(todayCount);
	166	+ }
	167	+ else
	168	+ {
	169	+ todayCount = 1;
	170	+ model.setTodayCount(todayCount);
	171	+ }
	172	+ model.setRecordTime(new Date());
	173	+ model.setModified(new Date());
	174	+ model.setId(measureInfoModel.getId());
	175	+ mysqlMeasureInfoService.updateMeasureInfo(model);
	176	+ }
	177	+ else
	178	+ {
	179	+ todayCount = 1;
	180	+ model.setCreated(new Date());
	181	+ model.setModified(new Date());
	182	+ model.setTodayCount(todayCount);
	183	+ mysqlMeasureInfoService.addMeasureInfo(model);
	184	+ }
153	185	}
154		- else
	186	+ catch (Exception e)
155	187	{
156		- model.setCreated(new Date());
157		- model.setModified(new Date());
158		- mysqlMeasureInfoService.addMeasureInfo(model);
	188	+ map.put("errorcode", String.valueOf(ErrorCodeConstants.SYSTEM_ERROR));
	189	+ map.put("errormsg","发生错误了，请稍后重试！");
	190	+ return map;
159	191	}
160		- BaseResponse objectResponse = new BaseResponse();
161		- objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
162		- objectResponse.setErrormsg("成功");
163		- return objectResponse;
	192	+ Integer count = MAX_TODAY_COUNT - todayCount;
	193	+ map.put("errorcode", String.valueOf(ErrorCodeConstants.SUCCESS));
	194	+ map.put("errormsg", measureInfoRequest.getValueType() == 1
	195	+ ? "信息记录成功，今天您还可以测量"+count+"次体重和身高" : "信息记录成功，今天您还可以测量"+count+"次血压和脉搏");
	196	+ return map;
164	197	}
165	198
166	199	public BaseResponse updateMeasureInfo(MeasureInfoRequest measureInfoRequest) {