jiangjiazhi / regional-platform

Commit e689a98070f863b81ac539d8f74bb7b527fa8248

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

产筛修改

Showing 5 changed files with 107 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeSummaryRequest.java

...	...	@@ -11,6 +11,7 @@
11	11	import com.lyms.platform.operate.web.facade.DischargeAbstractFacade;
12	12	import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
13	13	import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
	14	+import com.lyms.platform.operate.web.request.DischargeSummaryRequest;
14	15	import com.lyms.platform.operate.web.result.DischargeAbstractQueryResult;
15	16	import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult;
16	17	import com.lyms.platform.permission.service.CouponService;
17	18
18	19
...	...	@@ -109,15 +110,14 @@
109	110	return dischargeAbstractFacade.correctDisCharge();
110	111	}
111	112
112		- @RequestMapping(value = "list", method = RequestMethod.GET)
	113	+ @RequestMapping(value = "/list", method = RequestMethod.GET)
113	114	@ResponseBody
114	115	@TokenRequired
115	116	public BaseResponse list(HttpServletRequest request,
116		-
117	117	@RequestParam(value = "page") Integer page,
118		- @RequestParam(value = "limit") Integer limit) {
119		-
120		- return dischargeAbstractFacade.list(page, limit, getUserId(request));
	118	+ @RequestParam(value = "limit") Integer limit,
	119	+ DischargeSummaryRequest dischargeSummaryRequest) {
	120	+ return dischargeAbstractFacade.list(page, limit, getUserId(request), dischargeSummaryRequest);
121	121	}
122	122	}

...	...	@@ -556,6 +556,7 @@
556	556	antExChuModel.setParentId(parentId);
557	557	excAddRequest.setParentId(parentId);
558	558	Patients p = patientsService.findOnePatientById(parentId);
	559	+ System.out.println("===============>" + p);
559	560	//加入产筛
560	561	patientsService.validata(p);
561	562	}
...	...	@@ -592,6 +593,19 @@
592	593	antExChuQuery.setId(antExChuModel.getId());
593	594	List<AntExChuModel> list = antenatalExaminationService.queryAntExChu(antExChuQuery);
594	595	operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), antExChuModel, OptActionEnums.UPDATE.getId(), "修改初诊");
	596	+ /**
	597	+ * 承德区域产筛状态修改
	598	+ * */
	599	+ if (null != excAddRequest.getScreeningState() && StringUtils.isNotEmpty(excAddRequest.getParentId())) {
	600	+ SieveQuery sieveQuery = new SieveQuery();
	601	+ sieveQuery.setYn(YnEnums.YES.getId());
	602	+ sieveQuery.setParentId(excAddRequest.getParentId());
	603	+ List<SieveModel> sieveModels = sieveDao.queryList(sieveQuery.convertToQuery());
	604	+ for (SieveModel sieveModel : sieveModels) {
	605	+ sieveModel.setStatus(excAddRequest.getScreeningState());
	606	+ sieveDao.updateChanQianSieve(sieveModel);
	607	+ }
	608	+ }
595	609	} else {
596	610	AntExChuQuery antExChuQuery1 = new AntExChuQuery();
597	611	antExChuQuery1.setParentId(excAddRequest.getParentId());
...	...	@@ -712,7 +726,7 @@
712	726	sieveDao.updateChanQianSieve(sieveModel);
713	727	}
714	728	}
715		-
	729	+
716	730
717	731	//初诊是添加追访记录
718	732	addTrackDownInfo(userId, patients);

...	...	@@ -797,8 +797,10 @@
797	797	if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) {
798	798	/***
799	799	*儿保列表展示暂未开放
800		- *
801	800	*/
	801	+
	802	+
	803	+
802	804
803	805
804	806	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.hospitalapi.dzfy.DzfyHisService;
4		-import com.lyms.platform.biz.service.BabyService;
5		-import com.lyms.platform.biz.service.DischargeAbstractBabyService;
6		-import com.lyms.platform.biz.service.DischargeAbstractMotherService;
7		-import com.lyms.platform.biz.service.PatientsService;
	4	+import com.lyms.platform.biz.service.*;
8	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
9	6	import com.lyms.platform.common.enums.OptActionEnums;
10	7	import com.lyms.platform.common.enums.RenShenJieJuEnums;
...	...	@@ -14,6 +11,7 @@
14	11	import com.lyms.platform.common.utils.DateUtil;
15	12	import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest;
16	13	import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest;
	14	+import com.lyms.platform.operate.web.request.DischargeSummaryRequest;
17	15	import com.lyms.platform.operate.web.result.*;
18	16	import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
19	17	import com.lyms.platform.permission.service.CouponService;
20	18
...	...	@@ -60,8 +58,9 @@
60	58
61	59	@Autowired
62	60	private DzfyHisService dzfyHisService;
	61	+ @Autowired
	62	+ private CommonService commonService;
63	63
64		-
65	64	@Autowired
66	65	private AntenatalExaminationFacade antenatalExaminationFacade;
67	66
68	67
69	68
...	...	@@ -397,12 +396,14 @@
397	396	return new BaseResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS);
398	397	}
399	398
400		- public BaseResponse list(Integer page, Integer limit, Integer userId) {
	399	+ public BaseResponse list(Integer page, Integer limit, Integer userId, DischargeSummaryRequest dischargeSummaryRequest) {
401	400	List<String> hospital = groupsFacade.findGroupHospital(userId, false);
402	401	Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
403	402	Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital);
404		- boolean flag = true;
	403	+ boolean flag = false;
	404	+ if (StringUtils.isNotEmpty(dischargeSummaryRequest.getStartLeaveHospital()) && StringUtils.isNotEmpty(dischargeSummaryRequest.getEndLeaveHospiital())) {
405	405
	406	+ }
406	407
407	408	if (flag) {
408	409	List<DischargeAbstractMotherModel> discharge = mongoTemplate.find(Query.query(pCriteria), DischargeAbstractMotherModel.class);
409	410
...	...	@@ -425,10 +426,23 @@
425	426	map.put("name", patients.getUsername());
426	427	map.put("phoen", patients.getPhone());
427	428	map.put("age", patients.getAge() + "岁");
	429	+ map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate()));
	430	+ String rFactor = commonService.resloveFactor(patients.getRiskFactorId());
	431	+ if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor())) {
	432	+ if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)) {
	433	+ rFactor += "," + patients.getoRiskFactor();
	434	+ } else {
	435	+ rFactor = patients.getoRiskFactor();
	436	+ }
	437	+ }
	438	+ map.put("highRisk", rFactor);
428	439	}
429	440	map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getLeaveHospitalDate()));
430	441	map.put("description", dischargeAbstract.getDescription());
431	442	map.put("afterMakeBabyDays", dischargeAbstract.getAfterMakeBabyDays());
	443	+ map.put("litterIndex", "");
	444	+ map.put("inputPerson", dischargeAbstract.getInputMan());
	445	+ map.put("inputdate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getCreateDate()));
432	446
433	447	data.add(map);
434	448	}

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+public class DischargeSummaryRequest {
	4	+
	5	+ private String startLeaveHospital;
	6	+ private String endLeaveHospiital;
	7	+
	8	+ private String queryNo;//查询号
	9	+
	10	+ private Integer postpartumDays;
	11	+
	12	+ private String startFmDate;
	13	+
	14	+ private String endFmDate;
	15	+
	16	+ public String getStartLeaveHospital() {
	17	+ return startLeaveHospital;
	18	+ }
	19	+
	20	+ public void setStartLeaveHospital(String startLeaveHospital) {
	21	+ this.startLeaveHospital = startLeaveHospital;
	22	+ }
	23	+
	24	+ public String getEndLeaveHospiital() {
	25	+ return endLeaveHospiital;
	26	+ }
	27	+
	28	+ public void setEndLeaveHospiital(String endLeaveHospiital) {
	29	+ this.endLeaveHospiital = endLeaveHospiital;
	30	+ }
	31	+
	32	+ public String getQueryNo() {
	33	+ return queryNo;
	34	+ }
	35	+
	36	+ public void setQueryNo(String queryNo) {
	37	+ this.queryNo = queryNo;
	38	+ }
	39	+
	40	+ public Integer getPostpartumDays() {
	41	+ return postpartumDays;
	42	+ }
	43	+
	44	+ public void setPostpartumDays(Integer postpartumDays) {
	45	+ this.postpartumDays = postpartumDays;
	46	+ }
	47	+
	48	+ public String getStartFmDate() {
	49	+ return startFmDate;
	50	+ }
	51	+
	52	+ public void setStartFmDate(String startFmDate) {
	53	+ this.startFmDate = startFmDate;
	54	+ }
	55	+
	56	+ public String getEndFmDate() {
	57	+ return endFmDate;
	58	+ }
	59	+
	60	+ public void setEndFmDate(String endFmDate) {
	61	+ this.endFmDate = endFmDate;
	62	+ }
	63	+}