|  | @ -2369,11 +2369,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
 | 
												
													
														
															|  |                             shipmentLog.setPrice(mediicinedrugs.getPrice());
 |  |                             shipmentLog.setPrice(mediicinedrugs.getPrice());
 | 
												
													
														
															|  |                             shipmentLog.setSpecif(mediicinedrugs.getSpecif());
 |  |                             shipmentLog.setSpecif(mediicinedrugs.getSpecif());
 | 
												
													
														
															|  |                             shipmentLog.setUnit(mediicinedrugs.getUnit());
 |  |                             shipmentLog.setUnit(mediicinedrugs.getUnit());
 | 
												
													
														
															|  | 
 |  |                             shipmentLog.setQuantityUnit(mediicineorderdetail.getUnit());
 | 
												
													
														
															|  |                             String drugSql = " select quantity_unit,pack_unit from t_mediicine_drugs where org_code='"+mediicinedrugs.getOrgCode()+"' and drug_code='"+mediicinedrugs.getDrugCode()+"' ";
 |  |                             String drugSql = " select quantity_unit,pack_unit from t_mediicine_drugs where org_code='"+mediicinedrugs.getOrgCode()+"' and drug_code='"+mediicinedrugs.getDrugCode()+"' ";
 | 
												
													
														
															|  |                             List<Map<String,Object>> drugTmps = jdbcTemplate.queryForList(drugSql);
 |  |                             List<Map<String,Object>> drugTmps = jdbcTemplate.queryForList(drugSql);
 | 
												
													
														
															|  |                             if (drugTmps.size()>0){
 |  |                             if (drugTmps.size()>0){
 | 
												
													
														
															|  |                                 shipmentLog.setPackUnit(drugTmps.get(0).get("pack_unit")==null?"":drugTmps.get(0).get("pack_unit").toString());
 |  |                                 shipmentLog.setPackUnit(drugTmps.get(0).get("pack_unit")==null?"":drugTmps.get(0).get("pack_unit").toString());
 | 
												
													
														
															|  |                                 shipmentLog.setQuantityUnit(drugTmps.get(0).get("quantity_unit")==null?"":drugTmps.get(0).get("quantity_unit").toString());
 |  | 
 | 
												
													
														
															|  |                             }
 |  |                             }
 | 
												
													
														
															|  |                             shipmentLog.setEquName(mediicinedevice.getEquName());
 |  |                             shipmentLog.setEquName(mediicinedevice.getEquName());
 | 
												
													
														
															|  |                             shipmentLog.setEquNum(mediicinedevice.getEquNum());
 |  |                             shipmentLog.setEquNum(mediicinedevice.getEquNum());
 |