导出优化

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreHealthOrderScrmController.java

@@ -496,8 +496,8 @@ public class FsStoreHealthOrderScrmController extends BaseController {
                     FsStoreProductScrm fsStoreProductScrm = fsStoreProductService.selectFsStoreProductById(cartInfo.getProductId());
                     setCellValue(sheet, 10, startCol + i, fsStoreProductScrm != null && fsStoreProductScrm.getManufacturer()!= null ?fsStoreProductScrm.getManufacturer(): "");//生产企业名称
                     setCellValue(sheet, 8, startCol + i, cartInfo.getProductName() == null ? fsStoreProductScrm != null && fsStoreProductScrm.getCommonName()!= null ?fsStoreProductScrm.getCommonName() : cartInfo.getProductName():"");//商品名称
-                    setCellValue(sheet, 11, 1, fsStoreOrderScrm.getBatchNumber());//生产批号(药品) / 序列号(器械)
-                    setCellValue(sheet, 12, 1, fsStoreOrderScrm.getVerifyCode());//有效期/追溯码
+                    setCellValue(sheet, 11, 1, orderItems.get(i).getBatchNumber());//生产批号(药品) / 序列号(器械)
+                    setCellValue(sheet, 12, 1, orderItems.get(i).getVerifyCode());//有效期/追溯码
                 }
                 String payTimeStr = null;
                 Date payTime = fsStoreOrderScrm.getPayTime();

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreOrderItemVO.java

@@ -47,5 +47,10 @@ public class FsStoreOrderItemVO  implements Serializable
     private Integer isPrescribe;
 
     private Integer isDrug; //是否为药品
+    //溯源码
+    private String verifyCode;
+    //批次号
+    private String batchNumber;
+
 
 }