jiangjiazhi / regional-platform

Commit a3779e917414101f988a7dd26c203d211c1b63f3

Authored by Administrator over 6 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 38 additions and 9 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java
platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
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

...	...	@@ -23,10 +23,8 @@
23	23	*/
24	24	FolviteRecordModel queryOne(String id);
25	25
26		-
27		-
28		-
29	26	List<Map<String, Object>> queryListMap(FolviteQuery query);
	27	+
30	28
31	29	Integer queryListCount(FolviteQuery query);
32	30

...	...	@@ -130,7 +130,8 @@
130	130	<select id="queryListMap" parameterType="com.lyms.platform.permission.model.FolviteQuery"
131	131	resultType="map">
132	132	SELECT
133		- f.`name`,f.card_no,f.phone,p.receive_date,p.receive_number,p.receive_week,p.highrisk,p.provide_unit,f.habitation_address,f.habitation_area,f.habitation_city,f.habitation_country,f.habitation_province,p.`issuer`
	133	+ f.`name`,f.card_no,f.phone,p.receive_date,p.receive_number,p.receive_week,p.highrisk,p.provide_unit,f.habitation_address,f.habitation_area,f.habitation_city,
	134	+ f.habitation_country,f.habitation_province,p.`issuer`,p.id as id, f.id as folviteId
134	135	FROM
135	136	lyms_folvite_provide AS p
136	137	LEFT JOIN

...	...	@@ -29,7 +29,8 @@
29	29	creation_date,
30	30	modified,
31	31	isconceive,
32		-hospitalid
	32	+hospitalid,
	33	+end_pregnancy
33	34	) VALUES (
34	35	#{id,jdbcType=VARCHAR},
35	36	#{folviteId,jdbcType=VARCHAR},
...	...	@@ -42,7 +43,8 @@
42	43	#{creationDate,jdbcType=TIMESTAMP},
43	44	#{modified,jdbcType=TIMESTAMP},
44	45	#{isconceive,jdbcType=INTEGER},
45		-#{hospitalId,jdbcType=VARCHAR}
	46	+#{hospitalId,jdbcType=VARCHAR},
	47	+#{endPregnancy,jdbcType=INTEGER}
46	48	)
47	49
48	50	</insert>
...	...	@@ -133,8 +135,6 @@
133	135	<if test="folviteId != null and folviteId != ''">
134	136	and folvite_id=#{folviteId}
135	137	</if>
136		-
137		-
138	138	</where>
139	139
140	140
...	...	@@ -180,7 +180,10 @@
180	180	modified=#{modified,jdbcType=TIMESTAMP},
181	181	</if>
182	182	<if test="isconceive != null">
183		- isconceive=#{isconceive,jdbcType=INTEGER}
	183	+ isconceive=#{isconceive,jdbcType=INTEGER},
	184	+ </if>
	185	+ <if test="endPregnancy != null and endPregnancy !=''">
	186	+ end_pregnancy=#{endPregnancy,jdbcType=INTEGER}
184	187	</if>
185	188
186	189	</set>

...	...	@@ -52,6 +52,19 @@
52	52	private String hospitalId;
53	53
54	54
	55	+ //是否完结 0 为完结 1 已完结
	56	+ private Integer endPregnancy;
	57	+
	58	+
	59	+ public Integer getEndPregnancy() {
	60	+ return endPregnancy;
	61	+ }
	62	+
	63	+
	64	+ public void setEndPregnancy(Integer endPregnancy) {
	65	+ this.endPregnancy = endPregnancy;
	66	+ }
	67	+
55	68	public String getHospitalId() {
56	69	return hospitalId;
57	70	}

...	...	@@ -84,6 +84,7 @@
84	84	return folviteService.queryFolviteOne(id);
85	85	}
86	86
	87	+
87	88	/**
88	89	* 添加叶酸发放记录
89	90	*

...	...	@@ -147,10 +147,12 @@
147	147	recordModel.setHospitalId(hospitalId);
148	148	recordModel.setCreated(new Date());
149	149	recordModel.setModify(new Date());
	150	+ recordModel.setIspregnancy(0);
150	151	folviteMapper.saveFolvite(recordModel);
151	152	} else {
152	153	recordModel.setHospitalId(hospitalId);
153	154	recordModel.setModify(new Date());
	155	+ recordModel.setIspregnancy(0);
154	156	folviteMapper.updateFolvite(recordModel);
155	157	}
156	158	BaseResponse response = new BaseResponse();
...	...	@@ -178,6 +180,14 @@
178	180	receiveRecordModel.setModified(new Date());
179	181	receiveMapper.saveFolviteReceive(receiveRecordModel);
180	182	}
	183	+ //表示本次孕次已完结
	184	+ if (receiveRecordModel.getEndPregnancy() == 1) {
	185	+ FolviteRecordModel recordModel = new FolviteRecordModel();
	186	+ recordModel.setModify(new Date());
	187	+ recordModel.setIspregnancy(receiveRecordModel.getEndPregnancy());
	188	+ recordModel.setId(receiveRecordModel.getFolviteId());
	189	+ folviteMapper.updateFolvite(recordModel);
	190	+ }
181	191	BaseResponse response = new BaseResponse();
182	192	response.setObject(receiveRecordModel.getId());
183	193	return response;
...	...	@@ -290,6 +300,9 @@
290	300	m.put("name", map.get("name"));
291	301	m.put("address", CommonsHelper.getResidence(map.get("habitation_province").toString(), map.get("habitation_city").toString(),
292	302	map.get("habitation_area").toString(), map.get("habitation_country").toString(), map.get("habitation_address").toString(), basicConfigService));
	303	+ m.put("id", map.get("id"));
	304	+ m.put("folviteId", map.get("folviteId"));
	305	+
293	306	data.add(m);
294	307	}
295	308	return data;