jiangjiazhi / regional-platform

Commit 555bc9521df984162cd2fedad80fb7d3cf7fdd7e

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 33 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java

...	...	@@ -2774,14 +2774,14 @@
2774	2774	basicConfigService,
2775	2775	organizationService,
2776	2776	babyCheckFacade,
2777		- ms, request.getIsArea(), hospitalName, usersService);
	2777	+ ms, request.getIsArea(), hospitalName, usersService,babyCheckService);
2778	2778	Future f = commonThreadPool.submit(c);
2779	2779	futures.add(f);
2780	2780	}
2781	2781	if (CollectionUtils.isNotEmpty(futures)) {
2782	2782	for (Future f : futures) {
2783	2783	try {
2784		- list.addAll((List <BabyManageListResult>) f. get());
	2784	+ list.addAll((List <BabyManageListResult>) f.get());
2785	2785	} catch (Exception e) {
2786	2786	ExceptionUtils.catchException(e, "baby list error.");
2787	2787	}

...	...	@@ -2877,6 +2877,7 @@
2877	2877	public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest, Integer userId) {
2878	2878	NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult();
2879	2879	BabyModelQuery babyModelQuery = new BabyModelQuery();
	2880	+ babyModelQuery.setExistSource(false);
2880	2881	//babyModelQuery.setYn(YnEnums.YES.getId());
2881	2882	babyModelQuery.setQueryNo(StringUtils.isEmpty(newBabyManagerRequest.getQueryNo()) ? null : newBabyManagerRequest.getQueryNo());
2882	2883	if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) {
...	...	@@ -2926,6 +2927,7 @@
2926	2927	if (null != newBabyManagerRequest.getAsphyxiaMEnd()) {
2927	2928	babyModelQuery.setAsphyxiaMEnd(newBabyManagerRequest.getAsphyxiaMEnd());
2928	2929	}
	2930	+ System.out.println(babyModelQuery.convertToQuery().convertToMongoQuery().toString());
2929	2931	List <BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
2930	2932
2931	2933

...	...	@@ -32,6 +32,9 @@
32	32	//下次儿保时间
33	33	private String nextDate;
34	34
	35	+ //最后一次检查的下次预约时间
	36	+ private String lastNextDate;
	37	+
35	38	//服务状态
36	39	private String serviceStatus;
37	40
...	...	@@ -83,6 +86,14 @@
83	86	private Integer dueWeek;
84	87	private String lastCheckDoctor;
85	88	private String riskCode;
	89	+
	90	+ public String getLastNextDate() {
	91	+ return lastNextDate;
	92	+ }
	93	+
	94	+ public void setLastNextDate(String lastNextDate) {
	95	+ this.lastNextDate = lastNextDate;
	96	+ }
86	97
87	98	public String getRiskCode() {
88	99	return riskCode;

1	1	package com.lyms.platform.operate.web.utils;
2	2
	3	+import com.lyms.platform.biz.service.BabyCheckService;
3	4	import com.lyms.platform.biz.service.BasicConfigService;
4	5	import com.lyms.platform.common.enums.ServiceStatusEnums;
5	6	import com.lyms.platform.common.enums.ServiceTypeEnums;
6	7	import com.lyms.platform.common.enums.SexEnum;
	8	+import com.lyms.platform.common.enums.YnEnums;
7	9	import com.lyms.platform.common.utils.DateUtil;
8	10	import com.lyms.platform.common.utils.StringUtils;
9	11	import com.lyms.platform.operate.web.facade.BabyCheckFacade;
10	12
...	...	@@ -12,8 +14,10 @@
12	14	import com.lyms.platform.permission.model.Users;
13	15	import com.lyms.platform.permission.service.OrganizationService;
14	16	import com.lyms.platform.permission.service.UsersService;
	17	+import com.lyms.platform.pojo.BabyCheckModel;
15	18	import com.lyms.platform.pojo.BabyModel;
16	19	import com.lyms.platform.pojo.BasicConfig;
	20	+import com.lyms.platform.query.BabyCheckModelQuery;
17	21	import org.apache.commons.collections.CollectionUtils;
18	22
19	23	import java.util.ArrayList;
...	...	@@ -40,6 +44,8 @@
40	44
41	45	private BasicConfigFacade basicConfigFacade;
42	46
	47	+ private BabyCheckService babyCheckService;
	48	+
43	49	public BabyListTask(
44	50	BasicConfigFacade basicConfigFacade,
45	51	BasicConfigService basicConfigService,
...	...	@@ -48,7 +54,8 @@
48	54	List<BabyModel> models,
49	55	String isArea,
50	56	String hospitalName,
51		- UsersService usersService) {
	57	+ UsersService usersService,
	58	+ BabyCheckService babyCheckService) {
52	59	this.basicConfigFacade = basicConfigFacade;
53	60	this.basicConfigService = basicConfigService;
54	61	this.organizationService = organizationService;
...	...	@@ -57,6 +64,7 @@
57	64	this.isArea = isArea;
58	65	this.hospitalName = hospitalName;
59	66	this.usersService = usersService;
	67	+ this.babyCheckService = babyCheckService;
60	68
61	69	}
62	70
...	...	@@ -134,6 +142,15 @@
134	142	result.setMcertNo(model.getMcertNo());
135	143	result.setMcertTypeId(model.getMcertTypeId());
136	144
	145	+ BabyCheckModelQuery query = new BabyCheckModelQuery();
	146	+ query.setBuildId(model.getId());
	147	+ query.setYn(YnEnums.YES.getId());
	148	+ List <BabyCheckModel> models = babyCheckService.queryBabyCheckRecord(query);
	149	+ if (CollectionUtils.isNotEmpty(models))
	150	+ {
	151	+ BabyCheckModel checkModel = models.get(0);
	152	+ result.setLastNextDate(DateUtil.getyyyy_MM_dd(checkModel.getNextDate()));
	153	+ }
137	154	if (String.valueOf("true").equals(isArea)) {
138	155
139	156	result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName());