11

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MedicineShipmentLog.java

@@ -107,6 +107,8 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    private String useRate;
    private String useRateCode;
    private String useDose;
    private String quantityUnit;//每次用量单位
    private String packUnit;//包装数量单位
    public MedicineShipmentLog() {
    }
@@ -303,4 +305,20 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    public void setUseDose(String useDose) {
        this.useDose = useDose;
    }
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -2363,6 +2363,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            shipmentLog.setPrice(mediicinedrugs.getPrice());
                            shipmentLog.setSpecif(mediicinedrugs.getSpecif());
                            shipmentLog.setUnit(mediicinedrugs.getUnit());
                            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);
                            if (drugTmps.size()>0){
                                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.setEquNum(mediicinedevice.getEquNum());
                            shipmentLog.setDosForm(mediicinedrugs.getDosForm());