fix(tcm):检验检测机构的项目代码

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -61,50 +61,41 @@ public class TzBaseEnterpriseInfoServiceImpl
 		extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
 		implements ITzBaseEnterpriseInfoService {
 
-	@Autowired
+    public static final String HZXM = "HZXM";
+    /**
+     * 企业管理员变更缓存key前缀
+     */
+    private final String adminChange = "ADMIN_CHANGE_";
+    @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    BaseUnitLicenceServiceImpl baseUnitLicenceService;
 
-	@Autowired
-	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
-
-	@Autowired
-	BaseUnitLicenceServiceImpl baseUnitLicenceService;
-
-	@Autowired
+    @Autowired
     RegUnitIcServiceImpl regUnitIcService;
 
-	@Autowired
+    @Autowired
     RegUnitInfoServiceImpl regUnitInfoService;
-
-	@Autowired
-	private StartPlatformTokenService platformTokenService;
-
-	@Autowired
-	private SpeUseUnitServiceImpl speUseUnitService;
-
-	@Autowired
-	private AccessFeignService accessFeignService;
-
-	@Autowired
-	private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
-	@Autowired
-	DataDictionaryServiceImpl iDataDictionaryService;
-
-	@Autowired
-	RegUnitInfoMapper regUnitInfoMapper;
-
-	@Autowired
-	TzsBaseInstitutionServiceImpl tzsBaseInstitutionService;
-
-	@Autowired
-	private TzsUserInfoMapper tzsUserInfoMapper;
-
-	/**
-	 * 企业管理员变更缓存key前缀
-	 */
-	private final  String adminChange = "ADMIN_CHANGE_";
-	@Autowired
-	private EquipmentCategoryServiceImpl equipmentCategoryService;
+    @Autowired
+    DataDictionaryServiceImpl iDataDictionaryService;
+    @Autowired
+    RegUnitInfoMapper regUnitInfoMapper;
+    @Autowired
+    TzsBaseInstitutionServiceImpl tzsBaseInstitutionService;
+    @Autowired
+    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+    @Autowired
+    private StartPlatformTokenService platformTokenService;
+    @Autowired
+    private SpeUseUnitServiceImpl speUseUnitService;
+    @Autowired
+    private AccessFeignService accessFeignService;
+    @Autowired
+    private ITzBaseEnterpriseInfoService tzBaseEnterpriseInfoService;
+    @Autowired
+    private TzsUserInfoMapper tzsUserInfoMapper;
+    @Autowired
+    private EquipmentCategoryServiceImpl equipmentCategoryService;
 
 	@Override
 	public List<EquEnterDto> getInfo(String sequenceNbr) {
@@ -615,13 +606,13 @@ public class TzBaseEnterpriseInfoServiceImpl
 	    // 设置许可证书类型
 	    certTypeOptional.ifPresent(baseUnitLicence::setCertType);
 
-	    // 查询项目代码对应的名称
-	    Optional<String> itemCodeOptional = dictionaries.stream()
-	            .filter(d -> !ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-") &&  d.getCode().equals(baseUnitLicence.getItemCode()))
-	            .map(DataDictionary::getName)
-	            .findFirst();
-	    // 设置项目代码名称
-	    itemCodeOptional.ifPresent(baseUnitLicence::setItemCodeName);
+        // 查询项目代码对应的名称
+        Optional<String> itemCodeOptional = dictionaries.stream()
+                .filter(d -> ((!ValidationUtil.isEmpty(d.getExtend()) && d.getExtend().startsWith("XK-")) || HZXM.equals(d.getType())) && d.getCode().equals(baseUnitLicence.getItemCode()))
+                .map(DataDictionary::getName)
+                .findFirst();
+        // 设置项目代码名称
+        itemCodeOptional.ifPresent(baseUnitLicence::setItemCodeName);
 
 	    // 查询子项目代码对应的名称
 	    Optional<String> subItemOptional = dictionaries.stream()