jiangjiazhi / regional-platform

Commit 9f73fc2a9aaf08cc75578e929403e5ffb1e33dcf

Authored by Administrator over 5 years ago

Exists in master and in 6 other branches

UPDATE

Showing 7 changed files with 139 additions and 74 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteReceiveMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml
platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
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/FolviteService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.pojo.FolviteReceiveRecordModel;
5	5
6	6	import java.util.List;
	7	+import java.util.Map;
7	8
8	9	/**
9	10	* @author: shuai-Bo
...	...	@@ -21,5 +22,9 @@
21	22	List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
22	23
23	24	int queyFolviteReceiveCount(FolviteRecordQuery query);
	25	+
	26	+ List<Map<String, Object>> list(FolviteRecordQuery query);
	27	+
	28	+ int listCount(FolviteRecordQuery query);
24	29	}

...	...	@@ -2,6 +2,8 @@
2	2
3	3	import com.lyms.platform.common.dao.BaseQuery;
4	4
	5	+import java.util.Date;
	6	+
5	7	/**
6	8	* @author: shuai-Bo
7	9	* @Date: 2019/10/30 0030
...	...	@@ -12,6 +14,71 @@
12	14	//叶酸建档id
13	15	private String folviteId;
14	16
	17	+ //查询号（姓名、联系方式、证件号、就诊卡）
	18	+ private String queyNo;
	19	+
	20	+ // 孕前/孕后 0 孕前 1 孕后
	21	+ private Integer isconceive;
	22	+
	23	+ //开始领取日期
	24	+ private Date startReceiveDate;
	25	+
	26	+ //结束领取日期
	27	+ private Date endReceiveDate;
	28	+
	29	+ //开始建档日期
	30	+ private Date startDrawTime;
	31	+
	32	+ //结束建档日期
	33	+ private Date endDrawTime;
	34	+
	35	+ public String getQueyNo() {
	36	+ return queyNo;
	37	+ }
	38	+
	39	+ public void setQueyNo(String queyNo) {
	40	+ this.queyNo = queyNo;
	41	+ }
	42	+
	43	+ public Integer getIsconceive() {
	44	+ return isconceive;
	45	+ }
	46	+
	47	+ public void setIsconceive(Integer isconceive) {
	48	+ this.isconceive = isconceive;
	49	+ }
	50	+
	51	+ public Date getStartReceiveDate() {
	52	+ return startReceiveDate;
	53	+ }
	54	+
	55	+ public void setStartReceiveDate(Date startReceiveDate) {
	56	+ this.startReceiveDate = startReceiveDate;
	57	+ }
	58	+
	59	+ public Date getEndReceiveDate() {
	60	+ return endReceiveDate;
	61	+ }
	62	+
	63	+ public void setEndReceiveDate(Date endReceiveDate) {
	64	+ this.endReceiveDate = endReceiveDate;
	65	+ }
	66	+
	67	+ public Date getStartDrawTime() {
	68	+ return startDrawTime;
	69	+ }
	70	+
	71	+ public void setStartDrawTime(Date startDrawTime) {
	72	+ this.startDrawTime = startDrawTime;
	73	+ }
	74	+
	75	+ public Date getEndDrawTime() {
	76	+ return endDrawTime;
	77	+ }
	78	+
	79	+ public void setEndDrawTime(Date endDrawTime) {
	80	+ this.endDrawTime = endDrawTime;
	81	+ }
15	82
16	83	public String getFolviteId() {
17	84	return folviteId;

...	...	@@ -93,7 +93,7 @@
93	93
94	94	<select id="queryFolviteList" parameterType="com.lyms.platform.permission.model.FolviteQuery"
95	95	resultMap="folviteResultMap">
96		- SELECT * FROM lyms_folvite_Info
	96	+ SELECT * FROM lyms_folvite_Info
97	97	<include refid="whereSql"/>
98	98	<include refid="orderAndLimit"/>
99	99	</select>
...	...	@@ -315,6 +315,7 @@
315	315
316	316	</set>
317	317	</sql>
	318	+
318	319
319	320	<sql id="orderAndLimit">
320	321	<if test="sort != null and sort != '' ">

...	...	@@ -54,11 +54,40 @@
54	54	<include refid="orderAndLimit"/>
55	55	</select>
56	56
	57	+ <select id="list" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="map">
	58	+ SELECT
	59	+ f.`name`,f.birthday,f.card_no,f.vc_card,p.isconceive,f.receivesum,
	60	+ SUM(p.receive_number),f.drawTime,f.domicile_address,f.domicile_area,
	61	+ f.domicile_city,f.domicile_country,f.domicile_province
	62	+ FROM
	63	+ lyms_folvite_provide AS p
	64	+ LEFT JOIN
	65	+ lyms_folvite_Info f ON p.folvite_id = f.id
	66	+ <where>
	67	+ 1=1
	68	+ <if test="queyNo != null and queyNo != ''">
	69	+ and f.`name` =#{queryNo}
	70	+ </if>
	71	+
	72	+ </where>
	73	+ GROUP BY p.folvite_id
	74	+ <include refid="orderAndLimit"/>
	75	+ </select>
	76	+
	77	+ <select id="listCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery" resultType="int">
	78	+ SELECT
	79	+ count(1)
	80	+ FROM
	81	+ lyms_folvite_provide AS p
	82	+ LEFT JOIN
	83	+ lyms_folvite_Info f ON p.folvite_id = f.id
	84	+ <include refid="whereSql"/>
	85	+ GROUP BY p.folvite_id
	86	+ </select>
57	87	<select id="queyFolviteReceiveCount" parameterType="com.lyms.platform.permission.model.FolviteRecordQuery"
58	88	resultType="java.lang.Integer">
59	89	select count(id) from lyms_folvite_provide
60	90	<include refid="whereSql"/>
61		-
62	91	</select>
63	92
64	93	<sql id="whereSql">
...	...	@@ -67,6 +96,8 @@
67	96	<if test="folviteId != null and folviteId != ''">
68	97	and folvite_id=#{folviteId}
69	98	</if>
	99	+
	100	+
70	101	</where>
71	102
72	103
...	...	@@ -118,8 +149,7 @@
118	149	</set>
119	150	</sql>
120	151
121		- <select id="queryOneReceive" parameterType="java.lang.String"
122		- resultType="com.lyms.platform.pojo.FolviteReceiveRecordModel">
	152	+ <select id="queryOneReceive" parameterType="java.lang.String" resultMap="folviteReceiveResultMap">
123	153	SELECT * FROM lyms_folvite_provide
124	154	where id=#{id,jdbcType=VARCHAR}
125	155

...	...	@@ -6,6 +6,7 @@
6	6	import com.lyms.platform.common.result.BaseResponse;
7	7	import com.lyms.platform.operate.web.service.FolviteService;
8	8	import com.lyms.platform.permission.model.FolviteQuery;
	9	+import com.lyms.platform.permission.model.FolviteRecordQuery;
9	10	import com.lyms.platform.pojo.FolviteReceiveRecordModel;
10	11	import com.lyms.platform.pojo.FolviteRecordModel;
11	12	import org.apache.ibatis.annotations.Param;
...	...	@@ -16,6 +17,7 @@
16	17	import javax.servlet.http.HttpServletRequest;
17	18	import javax.validation.Valid;
18	19	import java.util.List;
	20	+import java.util.Map;
19	21
20	22	/**
21	23	* 叶酸接口
22	24
23	25
24	26
...	...	@@ -97,17 +99,15 @@
97	99	@RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
98	100	@ResponseBody
99	101	@TokenRequired
100		- public BaseResponse queryFolviteList(@Param("cardNo") String cardNo,
101		- @Param("womanId") String womanId) {
	102	+ public BaseResponse queryFolviteList(@Param("queryNo") String queryNo) {
102	103
103		- FolviteQuery query = new FolviteQuery();
104		- query.setCardNo(cardNo);
105		- query.setWomanId(womanId);
	104	+ FolviteRecordQuery query = new FolviteRecordQuery();
106	105	query.setSort("created asc");
107		- List<FolviteRecordModel> recordModels = folviteService.queryFolviteList(query);
	106	+ query.setQueyNo(queryNo);
	107	+ query.setNeed("true");
	108	+ List<Map<String, Object>> list = folviteService.list(query);
108	109	BaseListResponse baseResponse = new BaseListResponse();
109		- baseResponse.setObject(recordModels);
110		- query.setCount(recordModels.size());
	110	+ baseResponse.setData(list);
111	111	baseResponse.setPageInfo(query.getPageInfo());
112	112	return baseResponse;
113	113	}

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.pojo.FolviteRecordModel;
8	8
9	9	import java.util.List;
	10	+import java.util.Map;
10	11
11	12	/**
12	13	* @author: shuai-Bo
13	14
...	...	@@ -50,13 +51,14 @@
50	51	* @return
51	52	*/
52	53	BaseResponse queryOneProvide(String id, Integer userId);
53		-
54		-
55	54	List<FolviteRecordModel> queryFolviteList(FolviteQuery folviteQuery);
56	55
57	56	List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
58	57
59		- List<FolviteRecordModel> list(FolviteQuery folviteQuery);
	58	+ List<Map<String, Object>> list(FolviteRecordQuery folviteQuery);
	59	+
	60	+
	61	+
60	62
61	63
62	64	}

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.service.BasicConfigService;
4	4	import com.lyms.platform.biz.service.ResidentsArchiveService;
5	5	import com.lyms.platform.common.enums.YnEnums;
	6	+import com.lyms.platform.common.result.BaseListResponse;
6	7	import com.lyms.platform.common.result.BaseResponse;
7	8	import com.lyms.platform.common.utils.DateUtil;
8	9	import com.lyms.platform.common.utils.StringUtils;
...	...	@@ -18,6 +19,7 @@
18	19	import com.lyms.platform.permission.model.FolviteRecordQuery;
19	20	import com.lyms.platform.permission.model.Organization;
20	21	import com.lyms.platform.permission.service.OrganizationService;
	22	+import com.lyms.platform.permission.service.UsersService;
21	23	import com.lyms.platform.pojo.FolviteReceiveRecordModel;
22	24	import com.lyms.platform.pojo.FolviteRecordModel;
23	25	import com.lyms.platform.pojo.ResidentsArchiveModel;
...	...	@@ -54,6 +56,9 @@
54	56	@Autowired
55	57	private OrganizationService organizationService;
56	58
	59	+ @Autowired
	60	+ private UsersService usersService;
	61	+
57	62	@Override
58	63	public BaseResponse queryFolvite(String vcCardNo, String cardNo, String certificateTypeId, Integer userId) {
59	64	Map<String, Object> response = new HashMap<>();
60	65
61	66
62	67
63	68
64	69
65	70
...	...	@@ -172,75 +177,28 @@
172	177	@Override
173	178	public BaseResponse queryOneProvide(String id, Integer userId) {
174	179	Map<String, Object> respone = new HashMap<>();
175		- String hospitalId = autoMatchFacade.getHospitalId(userId);
176	180	//叶酸建档id
177		- String folviteId = null;
178	181	FolviteReceiveRecordModel receiveRecordModel = receiveMapper.queryOneReceive(id);
179	182	Map<String, Object> provide = new HashMap<>();
180	183	if (receiveRecordModel != null) {
181	184	provide.put("created", DateUtil.getyyyy_MM_dd(receiveRecordModel.getCreationDate()));
182		- provide.put("drawCount", receiveRecordModel.getReceiveNumber());
183		- provide.put("drawTime", receiveRecordModel.getReceiveDate());
184		- provide.put("highRisk", receiveRecordModel.getHighrisk());
	185	+ provide.put("receiveNumber", receiveRecordModel.getReceiveNumber());
	186	+ provide.put("receiveDate", receiveRecordModel.getReceiveDate());
	187	+ provide.put("highrisk", receiveRecordModel.getHighrisk());
185	188	String hospital = "";
186		- if (org.apache.commons.lang.StringUtils.isNotEmpty(receiveRecordModel.getHospitalId())) {
187		- Organization organization = organizationService.getOrganization(Integer.parseInt(receiveRecordModel.getHospitalId()));
	189	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(receiveRecordModel.getProvideUnit())) {
	190	+ Organization organization = organizationService.getOrganization(Integer.parseInt(receiveRecordModel.getProvideUnit()));
188	191	if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
189	192	hospital = organization.getName();
190	193	}
191	194	}
192	195	provide.put("hospitalName", hospital);
193	196	provide.put("id", receiveRecordModel.getId());
194		- provide.put("operator", receiveRecordModel.getIssuer());
195		- provide.put("pregnancyWeeks", receiveRecordModel.getReceiveWeek());
196		- folviteId = receiveRecordModel.getFolviteId();
	197	+ provide.put("issuer", usersService.getUsers(Integer.valueOf(receiveRecordModel.getIssuer())).getName());
	198	+ provide.put("receiveWeek", receiveRecordModel.getReceiveWeek());
197	199	}
198		- FolviteQuery folviteQuery = new FolviteQuery();
199		- folviteQuery.setHospitalId(hospitalId);
200		- folviteQuery.setId(folviteId);
201		- List<FolviteRecordModel> folviteRecordModels1 = folviteMapper.queryOne(folviteQuery);
202		- String folviteid = null;
203		-
204		- Map<String, Object> folvite = new HashMap<>();
205		- if (CollectionUtils.isNotEmpty(folviteRecordModels1)) {
206		- FolviteRecordModel recordModel = folviteRecordModels1.get(0);
207		- if (recordModel != null) {
208		- folvite.put("username", recordModel.getName());
209		- folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday()));
210		- folvite.put("certificateNum", recordModel.getCardNo());
211		- folvite.put("certificateTypeId", recordModel.getCertificateType());
212		- folvite.put("id", recordModel.getId());
213		- folvite.put("phone", recordModel.getPhone());
214		- folvite.put("residenceRegister", CommonsHelper.getResidence(recordModel.getDomicileProvince(), recordModel.getDomicileCity(),
215		- recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService));
216		- folvite.put("alreadySum", "已领总数");
217		- folvite.put("canSum", "可领总数");
218		- folviteid = recordModel.getId();
219		- }
220		- }
221		- FolviteRecordQuery recordQuery = new FolviteRecordQuery();
222		- List<Map<String, Object>> listMap = new ArrayList<>();
223		- recordQuery.setFolviteId(folviteid);
224		- List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
225		- if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
226		- for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
227		- Map<String, Object> recordMap = new HashMap<>();
228		- recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
229		- recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
230		- recordMap.put("id", folviteRecordModel.getId());
231		- recordMap.put("other", folviteRecordModel.getIsconceive());
232		- if (folviteRecordModel.getIsconceive() == 0) {
233		- recordMap.put("pregnancyType", "孕前");
234		- } else {
235		- recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
236		- }
237		- listMap.add(recordMap);
238		- }
239		- }
240		- BaseResponse response = new BaseResponse();
241	200	respone.put("folicAcidResult", provide);
242		- respone.put("archiveResult", folvite);
243		- respone.put("folicAcidHistory", listMap);
	201	+ BaseResponse response = new BaseResponse();
244	202	response.setObject(respone);
245	203	return response;
246	204	}
247	205
...	...	@@ -262,11 +220,13 @@
262	220	}
263	221
264	222	@Override
265		- public List<FolviteRecordModel> list(FolviteQuery folviteQuery) {
266		-
267		-
268		- return null;
	223	+ public List<Map<String, Object>> list(FolviteRecordQuery folviteQuery) {
	224	+ if (folviteQuery.getNeed() != null) {
	225	+ folviteQuery.mysqlBuild(receiveMapper.listCount(folviteQuery));
	226	+ }
	227	+ return receiveMapper.list(folviteQuery);
269	228	}
	229	+
270	230
271	231	FolviteResult result(ResidentsArchiveModel archiveModel) {
272	232	FolviteResult folviteResult = new FolviteResult();