jiangjiazhi / regional-platform | GitLab

Commit 58d26b70826f00f2a6454f57a8e2fb8d76f9957c

Authored by wtt over 5 years ago

1 parent b654eac133

Exists in master and in 6 other branches

update

Showing 2 changed files with 6 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker2.java

...	...	@@ -1019,6 +1019,7 @@
1019	1019	if (StringUtils.isNotEmpty(lymsSieveId)) {
1020	1020	result.put("lymsSieveId", lymsSieveId);
1021	1021	}
	1022	+ result.put("noOfFetuses", sieveApply.getNoOfFetuses());
1022	1023	result.put("patientID", sieveApply.getPatientID());
1023	1024	result.put("applicationNo", sieveApply.getApplicationNo());
1024	1025	result.put("smoking", sieveApply.getSmoking());

...	...	@@ -130,7 +130,11 @@
130	130	//吸烟 0：不吸烟；-1或空字符串：未知;1：吸烟；3：妊娠期间终止;2:妊娠前终止
131	131	sieveListResult.setSmoking(sieveApplyOrderModel.getSmoking());
132	132	//孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠
133		- sieveListResult.setPatientID(sieveApplyOrderModel.getPatientID());
	133	+ String parentId = sieveApplyOrderModel.getParentId();
	134	+ if(StringUtils.isNotEmpty(parentId) && parentId.length() > 30){
	135	+ parentId=sieveApplyOrderModel.getParentId().substring(0, 30);
	136	+ }
	137	+ sieveListResult.setPatientID(parentId);
134	138	//如果有NT，则必须有
135	139	sieveListResult.setnT(sieveApplyOrderModel.getnT());
136	140	//送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠