jiangjiazhi / regional-platform

Commit 3bae53b89c8c1b9fbb06769c7d536210ab937555

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

导出添加高危因素

Showing 4 changed files with 84 additions and 2 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/HighRiskEnum.java
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.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/request/MatdeliverFollowRequest.java

...	...	@@ -19,6 +19,19 @@
19	19	TWMGY(10, "体外膜给氧"),
20	20	JXTQCG(11, "机械通气超过48小时"),
21	21	MQYQTNB(12, "母亲孕期糖尿病、妊高症或曾使用过耳毒性药物或袢利尿剂、或滥用药物和酒精"),
	22	+ M1(14, "听力异常家族史"),
	23	+ M2(15, "宫内感染史"),
	24	+ M3(16, "极低体重儿"),
	25	+ M4(17, "出生窒息史"),
	26	+ M5(18, "机械通气史"),
	27	+ M6(19, "颌面畸形史"),
	28	+ M7(20, "颅内感染史"),
	29	+ M8(21, "耳外伤史"),
	30	+ M9(22, "反复发作的中耳炎"),
	31	+ M10(23, "耳毒性药物使用史"),
	32	+ M11(24, "早产儿"),
	33	+ M12(25, "II型神经纤维瘤和神经衰退性疾病"),
	34	+ M13(26, "其他"),
22	35	LCSCZ(13, "临床上存在或怀疑有与听力障碍有关的综合征或遗传病");
23	36
24	37	private int id;

...	...	@@ -1556,8 +1556,16 @@
1556	1556	// int weeks = daysBetween(baby, new Date()) / 7;
1557	1557	// String weekAge = String.valueOf(weeks);
1558	1558
1559		- Date baby = parseDate("2018-07-15");
1560		- System.out.println(baby.getTime());
	1559	+ Date startDate = addDay(new Date(),-10-1);
	1560	+ Date endDate = addDay(new Date(), -10);
	1561	+
	1562	+ String start = getyyyy_MM_dd(startDate);
	1563	+ String end = getyyyy_MM_dd(endDate);
	1564	+
	1565	+ System.out.println(start+"=="+end);
	1566	+
	1567	+// Date baby = parseDate("2018-07-15");
	1568	+// System.out.println(baby.getTime());
1561	1569	}
1562	1570
1563	1571	}

...	...	@@ -1678,6 +1678,25 @@
1678	1678	matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
1679	1679	matDeliverQuery.setEndStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]);
1680	1680	}
	1681	+ if (matdeliverFollowRequest.getStartDay() != null && matdeliverFollowRequest.getEndDay() != null )
	1682	+ {
	1683	+ matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
	1684	+ matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
	1685	+ }
	1686	+ else if (matdeliverFollowRequest.getStartDay() != null)
	1687	+ {
	1688	+ matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay()-1)));
	1689	+ matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getStartDay())));
	1690	+ }
	1691	+ else if(matdeliverFollowRequest.getEndDay() != null)
	1692	+ {
	1693	+ matDeliverQuery.setCreatedStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay()-1)));
	1694	+ matDeliverQuery.setEndStart(DateUtil.formatDate(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getEndDay())));
	1695	+ }
	1696	+
	1697	+ System.out.println(DateUtil.getyyyy_MM_dd(matDeliverQuery.getCreatedStart()));
	1698	+ System.out.println(DateUtil.getyyyy_MM_dd(matDeliverQuery.getEndStart()));
	1699	+
1681	1700	if (matdeliverFollowRequest.getFollowStage() != null) {//按访视阶段查询
1682	1701	if (matdeliverFollowRequest.getFollowStage() == 1) {//1、访视期内分娩时间为：21天到当前时间
1683	1702	matDeliverQuery.setCreatedStart(DateUtil.addDay(new Date(), -22));
...	...	@@ -1700,6 +1719,20 @@
1700	1719	matDeliverQuery.setVisitStatus(matdeliverFollowRequest.getVisitStatus());
1701	1720	matDeliverQuery.setMakeType(matdeliverFollowRequest.getMakeType());
1702	1721	List<MaternalDeliverModel> maternalDeliverModelList;
	1722	+
	1723	+ if (StringUtils.isNotEmpty(matdeliverFollowRequest.getRiskId()))
	1724	+ {
	1725	+ PatientsQuery patientsQuery = new PatientsQuery();
	1726	+ patientsQuery.setYn(YnEnums.YES.getId());
	1727	+ patientsQuery.setrFactor(matdeliverFollowRequest.getRiskId());
	1728	+ List<String> parentIdList = new ArrayList<>();
	1729	+ List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
	1730	+ for (Patients md : patientsList) {
	1731	+ parentIdList.add(md.getId());
	1732	+ }
	1733	+ matDeliverQuery.setParentIdList(parentIdList);
	1734	+ }
	1735	+
1703	1736
1704	1737	if (StringUtils.isNotEmpty(matdeliverFollowRequest.getNeed())) {//是否分页
1705	1738	matDeliverQuery.setNeed("need");

...	...	@@ -94,6 +94,34 @@
94	94	*/
95	95	private String need;
96	96
	97	+ private String riskId;
	98	+ private Integer startDay;
	99	+ private Integer endDay;
	100	+
	101	+ public String getRiskId() {
	102	+ return riskId;
	103	+ }
	104	+
	105	+ public void setRiskId(String riskId) {
	106	+ this.riskId = riskId;
	107	+ }
	108	+
	109	+ public Integer getStartDay() {
	110	+ return startDay;
	111	+ }
	112	+
	113	+ public void setStartDay(Integer startDay) {
	114	+ this.startDay = startDay;
	115	+ }
	116	+
	117	+ public Integer getEndDay() {
	118	+ return endDay;
	119	+ }
	120	+
	121	+ public void setEndDay(Integer endDay) {
	122	+ this.endDay = endDay;
	123	+ }
	124	+
97	125	public Date getFollowStarDate() {
98	126	return followStarDate;
99	127	}