liquanyu / regional-platform

Commit 98c23ac7910e36ded7458148da410d0a3e599078

Authored by Administrator over 6 years ago

update

Showing 4 changed files with 61 additions and 66 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
platform-dal/src/main/java/com/lyms/platform/pojo/FolviteReceiveRecordModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java

...	...	@@ -13,35 +13,38 @@
13	13	<result column="receive_date" property="receiveDate"/>
14	14	<result column="creation_date" property="creationDate"/>
15	15	<result column="modified" property="modified"/>
	16	+ <result column="hospitalid" property="hospitalId"/>
16	17	</resultMap>
17	18
18	19	<insert id="saveFolviteReceive" parameterType="com.lyms.platform.pojo.FolviteReceiveRecordModel">
19		-INSERT INTO lyms_folvite_provide (
20		- id,
21		- folvite_id,
22		- receive_number,
23		- receive_week,
24		- highrisk,
25		- provide_unit,
26		- ISSUER,
27		- receive_date,
28		- creation_date,
29		- modified,
30		- isconceive
	20	+INSERT INTO lyms_folvite_provide(
	21	+id,
	22	+folvite_id,
	23	+receive_number,
	24	+receive_week,
	25	+highrisk,
	26	+provide_unit,
	27	+issuer,
	28	+receive_date,
	29	+creation_date,
	30	+modified,
	31	+isconceive,
	32	+hospitalid
	33	+) VALUES (
	34	+#{id,jdbcType=VARCHAR},
	35	+#{folviteId,jdbcType=VARCHAR},
	36	+#{receiveNumber,jdbcType=INTEGER},
	37	+#{receiveWeek,jdbcType=INTEGER},
	38	+#{highrisk,jdbcType=VARCHAR},
	39	+#{provideUnit,jdbcType=VARCHAR},
	40	+#{issuer,jdbcType=VARCHAR},
	41	+#{receiveDate,jdbcType=TIMESTAMP},
	42	+#{creationDate,jdbcType=TIMESTAMP},
	43	+#{modified,jdbcType=TIMESTAMP},
	44	+#{isconceive,jdbcType=INTEGER},
	45	+#{hospitalId,jdbcType=VARCHAR}
31	46	)
32		-VALUES
33		- (
34		- #{id,jdbcType=VARCHAR},
35		- #{folviteId,jdbcType=VARCHAR},
36		- #{receiveNumber,jdbcType=INTEGER},
37		- #{receiveWeek,jdbcType=INTEGER},
38		- #{highrisk,jdbcType=VARCHAR},
39		- #{provideUnit,jdbcType=VARCHAR},
40		- #{issuer,jdbcType=VARCHAR},
41		- #{receiveDate,jdbcType=TIMESTAMP},
42		- #{creationDate,jdbcType=TIMESTAMP},
43		- #{modified,jdbcType=TIMESTAMP})
44		- #{isconceive,jdbcType=INTEGER}
	47	+
45	48	</insert>
46	49
47	50	<select id="queryFolviteReceiveList" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"

1	1	package com.lyms.platform.pojo;
2	2
	3	+import com.fasterxml.jackson.annotation.JsonFormat;
	4	+
3	5	import java.util.Date;
4	6	import java.util.UUID;
5	7
6	8
...	...	@@ -34,9 +36,10 @@
34	36	private String provideUnit;
35	37
36	38	//发放人
37		- private String Issuer;
	39	+ private String issuer;
38	40
39	41	//领取日期
	42	+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
40	43	private Date receiveDate;
41	44
42	45	//创建日期
43	46
...	...	@@ -132,12 +135,11 @@
132	135	}
133	136
134	137	public String getIssuer() {
135		- return this.Issuer;
	138	+ return issuer;
136	139	}
137	140
138		-
139		- public void setIssuer(String Issuer) {
140		- this.Issuer = Issuer;
	141	+ public void setIssuer(String issuer) {
	142	+ this.issuer = issuer;
141	143	}
142	144
143	145	public Date getReceiveDate() {

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.common.annotation.TokenRequired;
4	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.result.BaseListResponse;
5	6	import com.lyms.platform.common.result.BaseResponse;
6	7	import com.lyms.platform.operate.web.service.FolviteService;
7	8	import com.lyms.platform.permission.model.FolviteQuery;
...	...	@@ -73,7 +74,7 @@
73	74	@RequestMapping(value = "saveOrUpdateProvideFolvite", method = RequestMethod.POST)
74	75	@ResponseBody
75	76	@TokenRequired
76		- public BaseResponse saveProvideFolvite(@RequestBody FolviteReceiveRecordModel receiveModel, HttpServletRequest request) {
	77	+ public BaseResponse saveProvideFolvite(@Valid @RequestBody FolviteReceiveRecordModel receiveModel, HttpServletRequest request) {
77	78	return folviteService.saveProvideFolvite(receiveModel, getUserId(request));
78	79
79	80	}
80	81
...	...	@@ -104,8 +105,10 @@
104	105	query.setWomanId(womanId);
105	106	query.setSort("created asc");
106	107	List<FolviteRecordModel> recordModels = folviteService.queryFolviteList(query);
107		- BaseResponse baseResponse = new BaseResponse();
	108	+ BaseListResponse baseResponse = new BaseListResponse();
108	109	baseResponse.setObject(recordModels);
	110	+ query.setCount(recordModels.size());
	111	+ baseResponse.setPageInfo(query.getPageInfo());
109	112	return baseResponse;
110	113	}
111	114

...	...	@@ -95,6 +95,7 @@
95	95	FolviteRecordQuery recordQuery = new FolviteRecordQuery();
96	96	recordQuery.setFolviteId(folviteId);
97	97	List<Map<String, Object>> listMap = new ArrayList<>();
	98	+
98	99	List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
99	100	if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
100	101	for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
...	...	@@ -111,8 +112,6 @@
111	112	listMap.add(recordMap);
112	113	}
113	114	}
114		-
115		-
116	115	FolviteResult result = null;
117	116	if (flag) {
118	117	//如果为空查询孕妇档案进行叶酸档案建档回显孕妇档案数据回去
119	118
...	...	@@ -201,12 +200,11 @@
201	200	folviteQuery.setHospitalId(hospitalId);
202	201	folviteQuery.setId(folviteId);
203	202	List<FolviteRecordModel> folviteRecordModels1 = folviteMapper.queryOne(folviteQuery);
204		- String womanId = null;
205		- String cardNo = null;
	203	+ String folviteid = null;
	204	+
206	205	Map<String, Object> folvite = new HashMap<>();
207	206	if (CollectionUtils.isNotEmpty(folviteRecordModels1)) {
208	207	FolviteRecordModel recordModel = folviteRecordModels1.get(0);
209		-
210	208	if (recordModel != null) {
211	209	folvite.put("username", recordModel.getName());
212	210	folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday()));
213	211
214	212
215	213
...	...	@@ -218,43 +216,32 @@
218	216	recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService));
219	217	folvite.put("alreadySum", "已领总数");
220	218	folvite.put("canSum", "可领总数");
221		- womanId = recordModel.getWomanId();
222		- cardNo = recordModel.getCardNo();
	219	+ folviteid = recordModel.getId();
223	220	}
224	221	}
225		- FolviteQuery query = new FolviteQuery();
226		- query.setWomanId(womanId);
227		- query.setCardNo(cardNo);
228		- List<FolviteRecordModel> recordModels = queryFolviteList(query);
229		- List<List<Map<String, Object>>> list = new ArrayList();
230		- if (CollectionUtils.isNotEmpty(recordModels)) {
231		- FolviteRecordQuery recordQuery = new FolviteRecordQuery();
232		- for (FolviteRecordModel folviteModel : recordModels) {
233		- List<Map<String, Object>> listMap = new ArrayList<>();
234		- recordQuery.setFolviteId(folviteModel.getId());
235		- List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
236		- if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
237		- for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
238		- Map<String, Object> recordMap = new HashMap<>();
239		- recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
240		- recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
241		- recordMap.put("id", folviteRecordModel.getId());
242		- recordMap.put("other", folviteRecordModel.getIsconceive());
243		- if (folviteRecordModel.getIsconceive() == 0) {
244		- recordMap.put("pregnancyType", "孕前");
245		- } else {
246		- recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
247		- }
248		- listMap.add(recordMap);
249		- }
	222	+ FolviteRecordQuery recordQuery = new FolviteRecordQuery();
	223	+ List<Map<String, Object>> listMap = new ArrayList<>();
	224	+ recordQuery.setFolviteId(folviteid);
	225	+ List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
	226	+ if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
	227	+ for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
	228	+ Map<String, Object> recordMap = new HashMap<>();
	229	+ recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
	230	+ recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
	231	+ recordMap.put("id", folviteRecordModel.getId());
	232	+ recordMap.put("other", folviteRecordModel.getIsconceive());
	233	+ if (folviteRecordModel.getIsconceive() == 0) {
	234	+ recordMap.put("pregnancyType", "孕前");
	235	+ } else {
	236	+ recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
250	237	}
251		- list.add(listMap);
	238	+ listMap.add(recordMap);
252	239	}
253	240	}
254	241	BaseResponse response = new BaseResponse();
255	242	respone.put("folicAcidResult", provide);
256	243	respone.put("archiveResult", folvite);
257		- respone.put("folicAcidHistory", list);
	244	+ respone.put("folicAcidHistory", listMap);
258	245	response.setObject(respone);
259	246	return response;
260	247	}