Bläddra i källkod

跟新相关bug

wangzhinan 3 år sedan
förälder
incheckning
8d4a6ea8d8

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

@ -6,6 +6,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@ -102,6 +103,13 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
     */
    private String dosForm;
    @Transient
    private String useWay;
    @Transient
    private String useRate;
    @Transient
    private String userDose;
    public MedicineShipmentLog() {
    }
@ -265,4 +273,28 @@ public class MedicineShipmentLog extends UuidIdentityEntityWithOperator implemen
    public void setDosForm(String dosForm) {
        this.dosForm = dosForm;
    }
    public String getUseWay() {
        return useWay;
    }
    public void setUseWay(String useWay) {
        this.useWay = useWay;
    }
    public String getUseRate() {
        return useRate;
    }
    public void setUseRate(String useRate) {
        this.useRate = useRate;
    }
    public String getUserDose() {
        return userDose;
    }
    public void setUserDose(String userDose) {
        this.userDose = userDose;
    }
}

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

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