jiangjiazhi / regional-platform

Authored by Administrator over 6 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 84 additions and 1 deletions

...	...	@@ -15,6 +15,16 @@
15	15	*/
16	16	List<FolviteRecordModel> queryList(FolviteQuery query);
17	17
	18	+ /**
	19	+ * 通过建档id查询详情
	20	+ *
	21	+ * @param id
	22	+ * @return
	23	+ */
	24	+ FolviteRecordModel queryOne(String id);
	25	+
	26	+
	27	+
18	28
19	29	List<Map<String, Object>> queryListMap(FolviteQuery query);
20	30

...	...	@@ -85,6 +85,48 @@
85	85	</select>
86	86
87	87
	88	+ <select id="queryOne" parameterType="java.lang.String" resultMap="folviteResultMap">
	89	+ SELECT
	90	+ id AS id,
	91	+ NAME AS NAME,
	92	+ sex AS sex,
	93	+ birthday AS birthday,
	94	+ nationality AS nationality,
	95	+ nation AS nation,
	96	+ marital_status AS maritalStatus,
	97	+ certificate_type AS certificateType,
	98	+ card_no AS cardNo,
	99	+ census_type AS censusType,
	100	+ live_type AS liveType,
	101	+ education AS education,
	102	+ occupation AS occupation,
	103	+ phone AS phone,
	104	+ work_unit AS workUnit,
	105	+ habitation_province AS habitationProvince,
	106	+ habitation_city AS habitationCity,
	107	+ habitation_area AS habitationArea,
	108	+ habitation_country AS habitationCountry,
	109	+ habitation_address AS habitationAddress,
	110	+ domicile_province AS domicileProvince,
	111	+ domicile_city AS domicileCity,
	112	+ domicile_area AS domicileArea,
	113	+ domicile_country AS domicileCountry,
	114	+ domicile_address AS domicileAddress,
	115	+ woman_id AS womanId,
	116	+ isconceive AS isconceive,
	117	+ lastmenstrual AS lastmenstrual,
	118	+ ispregnancy AS ispregnancy,
	119	+ operation_doctor AS operationDoctor,
	120	+ created AS created,
	121	+ vc_card AS vcCard,
	122	+ receivesum as receiveSum,
	123	+ hospitalid as hospitalId,
	124	+ drawTime as drawTime
	125	+ FROM
	126	+ lyms_folvite_Info
	127	+ where id=#{id}
	128	+ </select>
	129	+
88	130	<select id="queryListMap" parameterType="com.lyms.platform.permission.model.FolviteQuery"
89	131	resultType="map">
90	132	SELECT

...	...	@@ -54,6 +54,7 @@
54	54	return folviteService.queryFolvite(vcCardNo, cardNo, certificateTypeId, getUserId(request));
55	55	}
56	56
	57	+
57	58	/**
58	59	* 添加修改叶酸建档记录
59	60	*
...	...	@@ -70,6 +71,20 @@
70	71	}
71	72
72	73	/**
	74	+ * 通过建档id 查询看详情
	75	+ *
	76	+ * @param id
	77	+ * @return
	78	+ */
	79	+ @RequestMapping(value = "queryFolviteOne/{id}", method = RequestMethod.GET)
	80	+ @ResponseBody
	81	+ @TokenRequired
	82	+ public BaseResponse queryFolviteOne(@PathVariable("id") String id) {
	83	+
	84	+ return folviteService.queryFolviteOne(id);
	85	+ }
	86	+
	87	+ /**
73	88	* 添加叶酸发放记录
74	89	*
75	90	* @param receiveModel
...	...	@@ -191,7 +206,6 @@
191	206	response.setData(maps);
192	207	return response;
193	208	}
194		-
195	209
196	210	}

...	...	@@ -34,6 +34,14 @@
34	34	*/
35	35	BaseResponse saveFolvite(FolviteRecordModel recordModel, Integer userId);
36	36
	37	+ /**
	38	+ * 通过建档id 查询详情
	39	+ *
	40	+ * @param id
	41	+ * @return
	42	+ */
	43	+ BaseResponse queryFolviteOne(String id);
	44	+
37	45
38	46	/**
39	47	* 保存叶酸发放记录

...	...	@@ -159,6 +159,15 @@
159	159	}
160	160
161	161	@Override
	162	+ public BaseResponse queryFolviteOne(String id) {
	163	+ FolviteRecordModel folviteRecordModel = folviteMapper.queryOne(id);
	164	+
	165	+ BaseResponse response = new BaseResponse();
	166	+ response.setObject(folviteRecordModel);
	167	+ return response;
	168	+ }
	169	+
	170	+ @Override
162	171	public BaseResponse saveProvideFolvite(FolviteReceiveRecordModel receiveRecordModel, Integer userId) {
163	172	if (StringUtils.isNotEmpty(receiveRecordModel.getId())) {
164	173	receiveRecordModel.setModified(new Date());