jiangjiazhi / regional-platform

Authored by Administrator over 5 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 89 additions and 5 deletions

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.pojo.FolviteRecordModel;
5	5
6	6	import java.util.List;
	7	+import java.util.Map;
7	8
8	9
9	10	public interface FolviteMapper {
...	...	@@ -12,7 +13,12 @@
12	13	*
13	14	* @return
14	15	*/
15		- List<FolviteRecordModel> queryOne(FolviteQuery query);
	16	+ List<FolviteRecordModel> queryList(FolviteQuery query);
	17	+
	18	+
	19	+ List<Map<String, Object>> queryListMap(FolviteQuery query);
	20	+
	21	+ Integer queryListCount(FolviteQuery query);
16	22
17	23	/**
18	24	* 保存叶酸建档记录

...	...	@@ -11,6 +11,9 @@
11	11
12	12	private String id;
13	13
	14	+ //查询号
	15	+ private String queryNo;
	16	+
14	17	//就诊卡号
15	18	private String vcCard;
16	19
...	...	@@ -31,6 +34,14 @@
31	34
32	35	public String getWomanId() {
33	36	return womanId;
	37	+ }
	38	+
	39	+ public String getQueryNo() {
	40	+ return queryNo;
	41	+ }
	42	+
	43	+ public void setQueryNo(String queryNo) {
	44	+ this.queryNo = queryNo;
34	45	}
35	46
36	47	public void setWomanId(String womanId) {

...	...	@@ -36,6 +36,7 @@
36	36	return queryNo;
37	37	}
38	38
	39	+
39	40	public void setQueryNo(String queryNo) {
40	41	this.queryNo = queryNo;
41	42	}

...	...	@@ -42,7 +42,7 @@
42	42	</resultMap>
43	43
44	44
45		- <select id="queryOne" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultMap="folviteResultMap">
	45	+ <select id="queryList" parameterType="com.lyms.platform.permission.model.FolviteQuery" resultMap="folviteResultMap">
46	46	SELECT
47	47	id AS id,
48	48	NAME AS NAME,
...	...	@@ -83,6 +83,38 @@
83	83	lyms_folvite_Info
84	84	<include refid="whereSql"/>
85	85	</select>
	86	+
	87	+
	88	+ <select id="queryListMap" parameterType="com.lyms.platform.permission.model.FolviteQuery"
	89	+ resultType="map">
	90	+ SELECT
	91	+ 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`
	92	+ FROM
	93	+ lyms_folvite_provide AS p
	94	+ LEFT JOIN
	95	+ lyms_folvite_Info f ON p.folvite_id = f.id
	96	+ <where>
	97	+ 1=1
	98	+ <if test="queryNo !=null and queryNo != ''">
	99	+ and f.name =#{queryNo}
	100	+ </if>
	101	+
	102	+
	103	+ </where>
	104	+ <include refid="orderAndLimit"/>
	105	+ </select>
	106	+
	107	+
	108	+ <select id="queryListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
	109	+ resultType="java.lang.Integer">
	110	+ SELECT
	111	+ count(1)
	112	+ FROM
	113	+ lyms_folvite_provide AS p
	114	+ LEFT JOIN
	115	+ lyms_folvite_Info f ON p.folvite_id = f.id
	116	+ </select>
	117	+
86	118
87	119	<select id="queryFolviteListCount" parameterType="com.lyms.platform.permission.model.FolviteQuery"
88	120	resultType="java.lang.Integer">

...	...	@@ -97,7 +97,17 @@
97	97	return folviteService.queryOneProvide(id, getUserId(request));
98	98	}
99	99
100		-
	100	+ /***
	101	+ * 孕次管理查询列表
	102	+ *
	103	+ * @param queryNo
	104	+ * @param isconceive
	105	+ * @param startReceiveDate
	106	+ * @param endReceiveDate
	107	+ * @param startDrawTime
	108	+ * @param endDrawTime
	109	+ * @return
	110	+ */
101	111	@RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
102	112	@ResponseBody
103	113	@TokenRequired
...	...	@@ -124,6 +134,21 @@
124	134	baseResponse.setData(list);
125	135	baseResponse.setPageInfo(query.getPageInfo());
126	136	return baseResponse;
	137	+ }
	138	+
	139	+
	140	+ @RequestMapping(value = "/queryFolviteRecord", method = RequestMethod.GET)
	141	+ @ResponseBody
	142	+ @TokenRequired
	143	+ public BaseResponse queryFolviteRecord(@Param("queryNo") String queryNo) {
	144	+ FolviteQuery query = new FolviteQuery();
	145	+ query.setQueryNo(queryNo);
	146	+
	147	+ List<Map<String, Object>> maps = folviteService.recordList(query);
	148	+ BaseListResponse response = new BaseListResponse();
	149	+ response.setPageInfo(query.getPageInfo());
	150	+ response.setData(maps);
	151	+ return response;
127	152	}
128	153
129	154

...	...	@@ -51,6 +51,7 @@
51	51	* @return
52	52	*/
53	53	BaseResponse queryOneProvide(String id, Integer userId);
	54	+
54	55	List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery);
55	56
56	57	List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
...	...	@@ -58,7 +59,7 @@
58	59	List<Map<String, Object>> list(FolviteRecordQuery folviteQuery);
59	60
60	61
61		-
	62	+ List<Map<String, Object>> recordList(FolviteQuery folviteQuery);
62	63
63	64
64	65	}

...	...	@@ -79,7 +79,7 @@
79	79	//未结束孕辰
80	80	folviteQuery.setIspregnancy(0);
81	81	folviteQuery.setHospitalId(hospitalId);
82		- List<FolviteRecordModel> recordModels = folviteMapper.queryOne(folviteQuery);
	82	+ List<FolviteRecordModel> recordModels = folviteMapper.queryList(folviteQuery);
83	83	Map<String, Object> data = new HashMap<>();
84	84	String folviteId = null;
85	85	if (CollectionUtils.isNotEmpty(recordModels)) {
...	...	@@ -250,6 +250,14 @@
250	250	datas.add(m);
251	251	}
252	252	return datas;
	253	+ }
	254	+
	255	+ @Override
	256	+ public List<Map<String, Object>> recordList(FolviteQuery folviteQuery) {
	257	+ if (folviteQuery.getNeed() != null) {
	258	+ folviteQuery.mysqlBuild(folviteMapper.queryListCount(folviteQuery) == null ? 0 : folviteMapper.queryListCount(folviteQuery));
	259	+ }
	260	+ return folviteMapper.queryListMap(folviteQuery);
253	261	}
254	262
255	263	FolviteResult result(ResidentsArchiveModel archiveModel) {