jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 17 additions and 0 deletions

...	...	@@ -972,6 +972,11 @@
972	972
973	973	request.setEncoded(encodedUtil);
974	974	BabyModel model = getBabyModel(request, true, userId, hid);
	975	+
	976	+ if (request.getEndCase() != null)
	977	+ {
	978	+ model.setEndCaseTime(new Date());
	979	+ }
975	980	if (StringUtils.isEmpty(request.getDisplayState())) {
976	981	model.setDisplayState("2");
977	982	} else {
...	...	@@ -1432,6 +1437,8 @@
1432	1437	private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
1433	1438	// hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
1434	1439	BabyModel bm = new BabyModel();
	1440	+ bm.setEndCase(b.getEndCase());
	1441	+
1435	1442	bm.setMfileCode(b.getMfileCode());
1436	1443	bm.setBeforeName(b.getBeforeName());
1437	1444	bm.setNationId(b.getNationId());

...	...	@@ -455,6 +455,8 @@
455	455	private Integer areaType;
456	456
457	457
	458	+ private Integer endCase;
	459	+
458	460	private String mfileCode; //纸质档案编号
459	461	private String beforeName; //曾用名
460	462	private String nationId; //民族
...	...	@@ -519,6 +521,14 @@
519	521
520	522
521	523	private Map<String,Object> newZx; //新生儿窒息：无、有（轻、中、重）
	524	+
	525	+ public Integer getEndCase() {
	526	+ return endCase;
	527	+ }
	528	+
	529	+ public void setEndCase(Integer endCase) {
	530	+ this.endCase = endCase;
	531	+ }
522	532
523	533	public String getMfileCode() {
524	534	return mfileCode;