diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 10ec2ef..c8f95f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.TrackDownQueryRequest; @@ -391,8 +392,13 @@ public class TrackDownFacade { List list2 = matDeliverService.query(matDeliverQuery); if(CollectionUtils.isNotEmpty(list2)){ MaternalDeliverModel maternalDeliverModel = list2.get(0); - /** 生产方式 */ - temp.put("scType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType())); + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { + Map deliveryModeMap = JsonUtil.getMap(maternalDeliverModel.getDeliveryMode()); + if(deliveryModeMap.containsKey("fmfs")){ + /** 生产方式 */ + temp.put("scType", FmTypeEnums.getFmNameById(deliveryModeMap.get("fmfs"))); + } + } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 038bb39..47e1b2d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -533,7 +533,6 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Integer nextId = TrackDownDateEnums.getEnum(trackDown.getTrackDownDateType()).getNextid(); trackDownRecord.setTrackType(nextId); trackDownRecordService.updateTrackDown(trackDownRecord, id); - } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) { TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setStatus(0);