|
@@ -125,7 +125,7 @@ public class YpCodgMatchService {
|
|
|
}
|
|
|
// 未匹配企业追溯下载的追溯码并且走淘宝接口获取药品信息
|
|
|
List<String> unMatchCodgList;
|
|
|
- if(!lines.isEmpty() && lines.size() != strArr.size()) {
|
|
|
+ if(!lines.isEmpty()) {
|
|
|
unMatchCodgList = strArr.stream().filter(s ->
|
|
|
lines.stream().noneMatch(line -> s.equals(line.getSmlPacTracCodg()))).collect(Collectors.toList());
|
|
|
} else {
|
|
@@ -350,9 +350,9 @@ public class YpCodgMatchService {
|
|
|
codg.setDrugName(line.getDrugProdname());
|
|
|
codg.setSpecification(line.getDrugSpec());
|
|
|
codg.setManuNo(line.getManuBchno());
|
|
|
- codg.setManuDate(line.getManuDate());
|
|
|
+ codg.setManuDate(DateUtil.format(DateUtil.parse(line.getManuDate()), "yyyy-MM-dd"));
|
|
|
codg.setAbbrName(line.getProdentpName());
|
|
|
- codg.setExpyEnd(line.getExpyEnd());
|
|
|
+ codg.setExpyEnd(DateUtil.format(DateUtil.parse(line.getExpyEnd()), "yyyy-MM-dd"));
|
|
|
codg.setMatchMessage("未匹配到处方药品信息: 扫码药品是【" + line.getDrugProdname() + "】,请核对!");
|
|
|
}
|
|
|
}
|