|
|
|
|
@ -18,6 +18,8 @@ import org.springblade.lims.entry.*; |
|
|
|
|
import org.springblade.lims.service.*; |
|
|
|
|
import org.springblade.resource.enums.SysTypeEnum; |
|
|
|
|
import org.springblade.resource.feign.IMessageClient; |
|
|
|
|
import org.springblade.system.cache.DictBizCache; |
|
|
|
|
import org.springblade.system.enums.DictBizEnum; |
|
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
|
import org.springblade.system.user.entity.User; |
|
|
|
|
import org.springblade.system.user.feign.IUserClient; |
|
|
|
|
@ -122,8 +124,10 @@ public class ExamineController extends BladeController { |
|
|
|
|
Map<String, Object> map = new HashMap<>(); |
|
|
|
|
//检验数据
|
|
|
|
|
Examine examine = examineService.getById(id); |
|
|
|
|
Entrust entrust = service.getById(examine.getEntrustId()); |
|
|
|
|
examine.setSimpleStatus(entrust.getSimpleState()); |
|
|
|
|
// Entrust entrust = service.getById(examine.getEntrustId());
|
|
|
|
|
// 字典获取样品状态
|
|
|
|
|
String simpleStatus = DictBizCache.getValue(DictBizEnum.SIMPLE_STATUS, examine.getSimpleName().split("-")[1]); |
|
|
|
|
examine.setSimpleStatus(simpleStatus); |
|
|
|
|
|
|
|
|
|
if (examine != null) { |
|
|
|
|
//实验项目
|
|
|
|
|
|