jiangjiazhi / regional-platform

Authored by yangfei about 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 8 additions and 3 deletions

...	...	@@ -9,6 +9,7 @@
9	9	import com.lyms.platform.common.result.PageResult;
10	10	import com.lyms.platform.common.result.RespBuilder;
11	11	import com.lyms.platform.common.utils.DateUtil;
	12	+import com.lyms.platform.common.utils.JsonUtil;
12	13	import com.lyms.platform.common.utils.StringUtils;
13	14	import com.lyms.platform.common.utils.SystemConfig;
14	15	import com.lyms.platform.operate.web.request.TrackDownQueryRequest;
...	...	@@ -391,8 +392,13 @@
391	392	List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
392	393	if(CollectionUtils.isNotEmpty(list2)){
393	394	MaternalDeliverModel maternalDeliverModel = list2.get(0);
394		- /** 生产方式 */
395		- temp.put("scType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType()));
	395	+ if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) {
	396	+ Map<String, String> deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode());
	397	+ if(deliveryModeMap.containsKey("fmfs")){
	398	+ /** 生产方式 */
	399	+ temp.put("scType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs")));
	400	+ }
	401	+ }
396	402	}
397	403	}
398	404

...	...	@@ -533,7 +533,6 @@
533	533	Integer nextId = TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid();
534	534	trackDownRecord.setTrackType(nextId);
535	535	trackDownRecordService.updateTrackDown(trackDownRecord, id);
536		-
537	536	} else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) {
538	537	TrackDownRecord trackDownRecord = new TrackDownRecord();
539	538	trackDownRecord.setStatus(0);