1、选入药品层级查询bug

dev_unify
qiuyt 6 months ago
parent 3a108a0419
commit 62602a7ce4

@ -83,12 +83,14 @@ public class ThirdAliDrugController extends BaseController {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setUuid(thirdAliDrug.getUuid()); filterUdiRelRequest.setUuid(thirdAliDrug.getUuid());
List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(filterUdiRelRequest); List<UdiProductEntity> udiInfoEntities = udiProductService.filterAllUdiInfo(filterUdiRelRequest);
List<String> nameCodeIn = null; List<String> nameCodeIn = new ArrayList<>();
if(udiInfoEntities!=null && udiInfoEntities.size() >0){ if(udiInfoEntities!=null && udiInfoEntities.size() >0){
nameCodeIn = new ArrayList<>();
for (UdiProductEntity udiInfoEntity : udiInfoEntities) { for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
nameCodeIn.add(udiInfoEntity.getNameCode()); if(StringUtils.isNotEmpty(udiInfoEntity.getNameCode())){
nameCodeIn.add(udiInfoEntity.getNameCode());
}
} }
} }
thirdAliDrug.setNameCodeIn(nameCodeIn); thirdAliDrug.setNameCodeIn(nameCodeIn);
List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug); List<ThirdAliDrug> list = thirdAliDrugService.filterList(thirdAliDrug);

@ -85,7 +85,7 @@
<if test="approvalNum != '' and approvalNum != null"> <if test="approvalNum != '' and approvalNum != null">
AND approvalNum = #{approvalNum} AND approvalNum = #{approvalNum}
</if> </if>
<if test="nameCodeIn != null"> <if test="nameCodeIn!=null and nameCodeIn.size()>0">
AND nameCode NOT IN AND nameCode NOT IN
<foreach collection="nameCodeIn" item="id" open="(" close=")" separator=","> <foreach collection="nameCodeIn" item="id" open="(" close=")" separator=",">
#{id} #{id}

Loading…
Cancel
Save