jiangjiazhi / regional-platform

Commit b33b2ce23f2cf1f0f68f5efaa22c272dbeb441ea

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

处方实际报表bug修改

Showing 3 changed files with 17 additions and 67 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-common/src/main/java/com/lyms/platform/common/utils/ExpiryMap.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -1558,61 +1558,9 @@
1558	1558
1559	1559	public static void main(String[] args) {
1560	1560
1561		- int i = DateUtil.daysBetween(DateUtil.parseYMD("2018-02-20"), new Date());
1562		- System.out.println(i);
1563		-
1564		- int week = DateUtil.getWeek2(parseYMD("2017-10-12"), new Date());
1565		- System.out.println(week);
1566		- // System.out.println(getDayLastSecond(new Date()).toLocaleString());
1567		- // List<Map<String, Date>> monthBetween = getRange(parseYMD("2017-1-11"), parseYMD("2017-12-29"));
1568		- // for (Map<String, Date> map : monthBetween) {
1569		- // System.out.print("cname>> " + getyyyy_mm(map.get("cname")));
1570		- // System.out.print(" start>> " + getyyyy_MM_dd(map.get("start")));
1571		- // System.out.println(" end>> " + getyyyy_MM_dd(map.get("end")));
1572		- // }
1573		-
1574		- /* Date yesterday = DateUtil.getYesterday();
1575		- System.out.println(yesterday.toLocaleString());
1576		- System.out.println(getBetweenDay(parseDate("2017-12-19"), 7));
1577		-
1578		- Date date = parseDate("2017-11-30");
1579		- System.out.println(getYesterday().toLocaleString());
1580		- System.out.println("当月第一天: " + getMonthDay(date, 0, 1).toLocaleString());
1581		- System.out.println("当月最后一天: " + getMonthDay(date, 0, 0).toLocaleString());
1582		- System.out.println("上月第一天: " + getMonthDay(date, -1, 1).toLocaleString());
1583		- System.out.println("上月最后一天: " + getMonthDay(date, -1, 0).toLocaleString());
1584		- System.out.println("当前季度第一天: " + getQuartDay(date, 0, 1).toLocaleString());
1585		- System.out.println("当前季度最后一天: " + getQuartDay(date, 0, 0).toLocaleString());
1586		- System.out.println("上个季度第一天: " + getQuartDay(date, -1, 1).toLocaleString());
1587		- System.out.println("上个季度最后一天: " + getQuartDay(date, -1, 0).toLocaleString());
1588		- System.out.println("半年的第一天: " + getHalfDay(date, 0, 1).toLocaleString());
1589		- System.out.println("半年的最后一天: " + getHalfDay(date, 0, 0).toLocaleString());
1590		- System.out.println("上个半年的第一天: " + getHalfDay(date, -1, 1).toLocaleString());
1591		- System.out.println("上个半年的最后一天: " + getHalfDay(date, -1, 0).toLocaleString());
1592		- System.out.println("当前年的第一天: " + getYear(date, 0, 1).toLocaleString());
1593		- System.out.println("当前年的最后一天: " + getYear(date, 0, 0).toLocaleString());
1594		- System.out.println("上一年的第一天: " + getYear(date, -1, 1).toLocaleString());
1595		- System.out.println("上一年的最后一天: " + getYear(date, -1, 0).toLocaleString());
1596		- System.out.println(getBetweenDay(7));
1597		- System.out.println(date.getTime());*/
1598		-
1599		-
1600		-// Date baby = parseDate("2018-02-01");
1601		-// int weeks = daysBetween(baby, new Date()) / 7;
1602		-// String weekAge = String.valueOf(weeks);
1603		-
1604		-// Date startDate = addDay(new Date(),-10-1);
1605		-// Date endDate = addDay(new Date(), -10);
1606		-//
1607		-// String start = getyyyy_MM_dd(startDate);
1608		-// String end = getyyyy_MM_dd(endDate);
1609		-//
1610		-// System.out.println(start+"=="+end);
1611		- Date baby = parseDate("2019-10-24");
1612		-
1613		-// Date d = DateUtil.addDay(baby, 294);
1614		-
1615		- System.out.println(baby.getTime());
	1561	+ Date start = DateUtil.addDay(parseDate("2020-02-18"),1);
	1562	+ Date end = parseDate("2020-03-01");
	1563	+ System.out.println(getWeek(start, end));
1616	1564	}
1617	1565
1618	1566	}

...	...	@@ -116,16 +116,16 @@
116	116	expiryMap.put(e.getKey(), System.currentTimeMillis() + EXPIRY);
117	117	super.putAll(m);
118	118	}
119		-// public Set<Entry<K,V>> entrySet() {
120		-// Set<java.util.Map.Entry<K, V>> set = super.entrySet();
121		-// Iterator<Entry<K, V>> iterator = set.iterator();
122		-// while (iterator.hasNext()) {
123		-// java.util.Map.Entry<K, V> entry = iterator.next();
124		-// if(checkExpiry(entry.getKey(), false)) iterator.remove();
125		-// }
126		-//
127		-// return set;
128		-// }
	119	+ public Set<Entry<K,V>> entrySet() {
	120	+ Set<java.util.Map.Entry<K, V>> set = super.entrySet();
	121	+ Iterator<Entry<K, V>> iterator = set.iterator();
	122	+ while (iterator.hasNext()) {
	123	+ java.util.Map.Entry<K, V> entry = iterator.next();
	124	+ if(checkExpiry(entry.getKey(), false)) iterator.remove();
	125	+ }
	126	+
	127	+ return set;
	128	+ }
129	129	/**
130	130	*
131	131	* @Description: 是否过期

...	...	@@ -1327,7 +1327,8 @@
1327	1327	{
1328	1328	for(CheckItemConfig checkItemConfig : itemConfigs)
1329	1329	{
1330		- int currentWeek = DateUtil.getWeek(patients.getLastMenses(),nextCheckTime);
	1330	+ //末次月经加一天的原因是列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天
	1331	+ int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1),nextCheckTime);
1331	1332	if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek)
1332	1333	{
1333	1334	CheckItemOrder order = new CheckItemOrder();
...	...	@@ -1350,7 +1351,8 @@
1350	1351	{
1351	1352	for(CheckItemConfig checkItemConfig : itemConfigs)
1352	1353	{
1353		- int currentWeek = DateUtil.getWeek(patients.getLastMenses(),checkTime);
	1354	+ //末次月经加一天的原因是列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天
	1355	+ int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1),checkTime);
1354	1356	if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek)
1355	1357	{
1356	1358	CheckItemActual actual = new CheckItemActual();