瀏覽代碼

分页列表查询是否lis同步过

陈长荣 1 月之前
父節點
當前提交
12b8efaad4

+ 1 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/mapper/SampleCheckOrderMapper.java

@@ -19,5 +19,5 @@ public interface SampleCheckOrderMapper extends JfcloudBaseMapper<SampleCheckOrd
      * @param sampleId 样本id
      * @return
      */
-    String getExtData(@Param("sampleId") Long sampleId);
+    String getExtData(@Param("sampleId") Long sampleId, @Param("applyType") String applyType);
 }

+ 1 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/biz/SampleAnimalServiceImpl.java

@@ -324,7 +324,7 @@ public class SampleAnimalServiceImpl extends ServiceImpl<SampleAnimalMapper, Sam
         sampleInfoObj.put("expireDate", WordUtil.padString(sampleInfo.getExpireDate(), 8));
 
         //样本规则
-        String extData = checkOrderMapper.getExtData(sampleId);
+        String extData = checkOrderMapper.getExtData(sampleId, ScientificSampleTypeEnum.SERUM.name().toLowerCase());
         if (StrUtil.isNotBlank(extData)) {
             JSONObject object = JSON.parseObject(extData);
             HtScienceApply scienceApply = object.getObject("scienceApply", HtScienceApply.class);

+ 1 - 1
jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleCheckOrderServiceImpl.java

@@ -33,7 +33,7 @@ public class SampleCheckOrderServiceImpl extends ServiceImpl<SampleCheckOrderMap
             return 1L;
         }
 
-        String extData = baseMapper.getExtData(sampleId);
+        String extData = baseMapper.getExtData(sampleId, ScientificSampleTypeEnum.SERUM.name().toLowerCase());
         if (StrUtil.isBlank(extData)) {
             return null;
         }

+ 1 - 1
jfcloud-gene-biz/src/main/resources/mapper/SampleCheckOrderMapper.xml

@@ -19,7 +19,7 @@
     left join sample_animal sa on sco.sample_animal_id = sa.id
     left join sample_info si on sa.sample_id = si.id
     where sco.deleted = '0' and sa.deleted = '0' and si.deleted = '0'
-    and si.id = #{sampleId}
+    and si.id = #{sampleId} and sco.apply_type =#{applyType}
   </select>
 
 </mapper>