jiangjiazhi / regional-platform

Authored by liquanyu almost 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 18 additions and 7 deletions

...	...	@@ -114,6 +114,16 @@
114	114	return DateUtil.parseYMD(birthday);
115	115	}
116	116
	117	+
	118	+ public static String emptyDeal(String str)
	119	+ {
	120	+ if (isEmpty(str))
	121	+ {
	122	+ return "-";
	123	+ }
	124	+ return str;
	125	+ }
	126	+
117	127	// public static void main(String[] arg) {
118	128	// System.out.print(encryPhone("18382670036"));
119	129	// }

...	...	@@ -1191,15 +1191,15 @@
1191	1191	} else {
1192	1192	result.setHighRisk("高危");
1193	1193	}
1194		- result.setSex(SexEnum.getTextById(model.getSex()));
1195		- result.setBabyName(model.getName());
1196		- result.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
1197		- result.setMommyName(model.getMname());
1198		- result.setMommnyPhone(model.getMphone());
	1194	+ result.setSex(StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
	1195	+ result.setBabyName(StringUtils.emptyDeal(model.getName()));
	1196	+ result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
	1197	+ result.setMommyName(StringUtils.emptyDeal(model.getMname()));
	1198	+ result.setMommnyPhone(StringUtils.emptyDeal(model.getMphone()));
1199	1199	result.setMommnyEncryptPhone(StringUtils.encryPhone(model.getMphone()));
1200	1200	result.setServiceStatus(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()));
1201		- result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate()));
1202		- result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date()));
	1201	+ result.setNextDate(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
	1202	+ result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
1203	1203	result.setPatientId(model.getParentId());
1204	1204
1205	1205	String diagnose = "";

...	...	@@ -101,6 +101,7 @@
101	101	patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
102	102	}
103	103	patient.setDueDate(new Date());
	104	+ patient.setType(3);
104	105
105	106	//分娩状态 0未终止妊娠 1终止妊娠
106	107	yunBookbuildingService.updatePregnant(patient, request.getPid());