jiangjiazhi / regional-platform | GitLab

Commit c9a6bfb018d4aa144481d64931dfab897d32c4bd

Authored by litao@lymsh.com over 7 years ago

1 parent d7df020158

Exists in master and in 6 other branches

。。

Showing 2 changed files with 3 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ResolveUtils.java

...	...	@@ -235,7 +235,7 @@
235	235	map.put("serviceStatus", ServiceStatusEnums.getNameById(data.getServiceStatus()));
236	236
237	237	//建档孕周
238		- map.put("buildDueWeek", ResolveUtils.getPregnancyWeek3(data, data.getBookbuildingDate()));
	238	+ map.put("buildDueWeek", ResolveUtils.getPregnancyWeek(data, data.getBookbuildingDate()));
239	239
240	240	map.put("fuckLastMensWeek", ResolveUtils.getPregnancyWeek2(data, data.getBookbuildingDate()));
241	241

...	...	@@ -405,9 +405,9 @@
405	405	String dueWeek="";
406	406	if (null != patients.getDueStatus() && patients.getDueStatus() != null && 1 == patients.getDueStatus()) {
407	407	dueWeek = "终止妊娠";
408		- }/* else if (patients.getType() != null && 3 == patients.getType()) {
	408	+ } else if (patients.getType() != null && 3 == patients.getType()) {
409	409	dueWeek = "已分娩";
410		- }*/ else {
	410	+ } else {
411	411	if (null != patients.getLastMenses()) {
412	412	if(patients.getFuckLastMens() == null) {
413	413	return "";