jiangjiazhi / regional-platform

Commit 676f76fd67e70b69f99d5c06be6a55072f32405d

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

快速测量

Showing 4 changed files with 35 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MeasureDataInfoModel.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/result/AntexListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java

...	...	@@ -25,6 +25,9 @@
25	25	//记录总次数
26	26	private Integer recordCount;
27	27
	28	+ //当天血压记录类容
	29	+ private String recordContent;
	30	+
28	31	//创建时间
29	32	private Date created;
30	33	//修改时间
...	...	@@ -36,6 +39,13 @@
36	39	//备注值
37	40	private String remarkValue;
38	41
	42	+ public String getRecordContent() {
	43	+ return recordContent;
	44	+ }
	45	+
	46	+ public void setRecordContent(String recordContent) {
	47	+ this.recordContent = recordContent;
	48	+ }
39	49
40	50	private MeasureUserInfoModel measureUserInfoModel;
41	51

...	...	@@ -140,6 +140,9 @@
140	140	}
141	141	}
142	142	result.setHospitalName(hospital);
	143	+
	144	+ result.setRecordContent(model.getRecordContent());
	145	+
143	146	results.add(result);
144	147	}
145	148	}
146	149
...	...	@@ -252,10 +255,13 @@
252	255	return baseResponse;
253	256	}
254	257	dataInfoModel.setTodayCount(todayCount);
	258	+
	259	+ dataInfoModel.setRecordContent((measureDataInfoModel.getRecordContent() == null ? "" : measureDataInfoModel.getRecordContent()) + "," + measureInfoRequest.getValueOne());
255	260	}
256	261	else
257	262	{
258	263	todayCount = 1;
	264	+ dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
259	265	dataInfoModel.setTodayCount(todayCount);
260	266	}
261	267
...	...	@@ -278,6 +284,7 @@
278	284	dataInfoModel.setModified(new Date());
279	285	dataInfoModel.setTodayCount(todayCount);
280	286	dataInfoModel.setRecordCount(1);
	287	+ dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
281	288	mysqlMeasureDataInfoService.addMeasureDataInfo(dataInfoModel);
282	289	}
283	290	else
284	291
...	...	@@ -526,9 +533,9 @@
526	533	return objectResponse;
527	534	}
528	535
529		- public Map<String,String> getMeasureInfo(String certType,String certNo,String hospitalId)
	536	+ public Map<String,Object> getMeasureInfo(String certType,String certNo,String hospitalId)
530	537	{
531		- Map<String,String> measureMap = new HashMap<>();
	538	+ Map<String,Object> measureMap = new HashMap<>();
532	539	MeasureDataInfoQuery query = new MeasureDataInfoQuery();
533	540	query.setCertNo(certNo);
534	541	query.setCertType(certType);
535	542
...	...	@@ -546,11 +553,11 @@
546	553	}
547	554	else if (dataInfoModel.getValueType() != null && dataInfoModel.getValueType() == 2)
548	555	{
549		- String bloodPressure = dataInfoModel.getValueOne();
550		- if (StringUtils.isNotEmpty(bloodPressure) && bloodPressure.contains("/"))
	556	+ String recordContent = dataInfoModel.getRecordContent();
	557	+ if (StringUtils.isNotEmpty(recordContent))
551	558	{
552		- measureMap.put("bloodPressure1",dataInfoModel.getValueOne().split("/")[0]);
553		- measureMap.put("bloodPressure2",dataInfoModel.getValueOne().split("/")[1]);
	559	+ List<String> recordContents = Arrays.asList(recordContent.split(","));
	560	+ measureMap.put("bloodPressure",recordContents);
554	561	}
555	562	measureMap.put("pulse",dataInfoModel.getValueTwo());
556	563	}

...	...	@@ -65,13 +65,13 @@
65	65	private String isH = "0";
66	66	//<!---------基本信息----------->
67	67
68		- private Map<String,String> measureData;
	68	+ private Map<String,Object> measureData;
69	69
70		- public Map<String, String> getMeasureData() {
	70	+ public Map<String, Object> getMeasureData() {
71	71	return measureData;
72	72	}
73	73
74		- public void setMeasureData(Map<String, String> measureData) {
	74	+ public void setMeasureData(Map<String, Object> measureData) {
75	75	this.measureData = measureData;
76	76	}
77	77

...	...	@@ -36,6 +36,15 @@
36	36	//医院名称
37	37	private String hospitalName;
38	38
	39	+ private String recordContent;
	40	+
	41	+ public String getRecordContent() {
	42	+ return recordContent;
	43	+ }
	44	+
	45	+ public void setRecordContent(String recordContent) {
	46	+ this.recordContent = recordContent;
	47	+ }
39	48
40	49	public String getHospitalName() {
41	50	return hospitalName;