Ver código fonte

跟新相关bug

wangzhinan 3 anos atrás
pai
commit
e19114590b

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

@ -103,12 +103,9 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
     */
    private String dosForm;
    @Transient
    private String useWay;
    @Transient
    private String useRate;
    @Transient
    private String userDose;
    private String useDose;
    public MedicineShipmentLog() {
    }
@ -290,11 +287,11 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
        this.useRate = useRate;
    }
    public String getUserDose() {
        return userDose;
    public String getUseDose() {
        return useDose;
    }
    public void setUserDose(String userDose) {
        this.userDose = userDose;
    public void setUseDose(String useDose) {
        this.useDose = useDose;
    }
}

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

@ -1925,10 +1925,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            shipmentLog.setEquName(mediicinedevice.getEquName());
                            shipmentLog.setEquNum(mediicinedevice.getEquNum());
                            shipmentLog.setDosForm(mediicinedrugs.getDosForm());
                            shipmentLog = shipmentLogDao.save(shipmentLog);
                            shipmentLog.setUseRate(mediicinedrugs.getUseRate());
                            shipmentLog.setUserDose(mediicinedrugs.getUseDose());
                            shipmentLog.setUseWay(mediicinedrugs.getUseWay());
                            shipmentLog.setUseRate(mediicineorderdetail.getUseRate());
                            shipmentLog.setUseDose(mediicineorderdetail.getUseDose());
                            shipmentLog.setUseWay(mediicineorderdetail.getUseWay());
                            shipmentLogDao.save(shipmentLog);
                            shipmentLogs.add(shipmentLog);
                        }
                    }