修改接口适配分厂报告

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustSampleItemServiceImpl.java

@@ -510,7 +510,9 @@ public class EntrustSampleItemServiceImpl extends BaseServiceImpl<EntrustSampleI
         // itemVoList中的所有项目名 --> 通过检测项目名拿到对应的采集仪器项目名
         Set<String> itemNames = voList.stream().map(vo -> vo.getName()).distinct().collect(Collectors.toSet());
         List<Qualification> qualifications = qualificationService.list(Condition.create().in("name", itemNames));
-        Map<String, String> itemNameMap = qualifications.stream().collect(Collectors.toMap(Qualification::getName, Qualification::getInstrumentItemName));
+        Map<String, String> itemNameMap = qualifications.stream()
+                .filter(q -> StringUtils.isNotEmpty(q.getInstrumentItemName()))
+                .collect(Collectors.toMap(Qualification::getName, Qualification::getInstrumentItemName));
 
         if (null != template.getMoreItem() && 1 == template.getMoreItem()) {
             Set<Long> sampleIdsList = new HashSet<>();

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -799,6 +799,9 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         }
 
         entrust.setIdsList(ids);
+        if (null != entrust.getIsSelf() && entrust.getIsSelf()) {
+            entrust.setUid(LoginHelper.getAccount().getUserId());
+        }
         return page.setRecords(baseMapper.selectVOList(page, entrust));
     }
 

src/main/resources/mapper/hmhj/EntrustMapper.xml

@@ -55,6 +55,9 @@
                 #{groupName}
             </foreach>
         </if>
+        <if test="null != vo.uid">
+            AND uid = #{vo.uid}
+        </if>
         order by entrust_time desc
     </select>