跟新相关bug

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

@@ -243,6 +243,9 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    @Transient
    private List<Mediicineorderdetail> mediicineorderdetails;
    @Transient
    private List<MedicineShipmentLog> shipmentLogs;
    public Mediicineorder() {
    }
@@ -611,4 +614,13 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    public void setMediicineorderdetails(List<Mediicineorderdetail> mediicineorderdetails) {
        this.mediicineorderdetails = mediicineorderdetails;
    }
    @Transient
    public List<MedicineShipmentLog> getShipmentLogs() {
        return shipmentLogs;
    }
    public void setShipmentLogs(List<MedicineShipmentLog> shipmentLogs) {
        this.shipmentLogs = shipmentLogs;
    }
}

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

@@ -362,7 +362,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        if (!StringUtils.isEmpty(dispensingWindow)) {
            conditionSql += " and t.dispensing_window = '" + dispensingWindow + "'";
        }
        sencodSql = sencodSql + conditionSql + " order by  t.prescribe_time desc,t.sell_state asc ";
        sencodSql = sencodSql + conditionSql + " order by  t.sell_state asc,t.prescribe_time desc ";
        orderList = hibenateUtils.createSQLQuery(sencodSql, page, size);

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

@@ -4035,7 +4035,6 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     * @return
     */
    public List<Mediicineorder> getDeviceOrderInfoPage(String deviceId,String startTime,String endTime,Integer page,Integer size) throws ParseException {
        JSONObject jsonObject = new JSONObject();
        Mediicinedevice mediicinedevice = deviceDao.findOne(deviceId);
        Sort sort = new Sort(Sort.Direction.DESC, "shippingTime");
        PageRequest pageRequest = new PageRequest(page, size, sort);
@@ -4048,8 +4047,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            mediicineorderList = mediicineorderDao.findByEquNumAndPage(mediicinedevice.getEquNum(),pageRequest);
        }
        for (Mediicineorder mediicineorder:mediicineorderList){
            List<Mediicineorderdetail> mediicineorderdetails = mediicineorderdetailDao.findMediicineorderdetailsByIdOrder(mediicineorder.getId());
            mediicineorder.setMediicineorderdetails(mediicineorderdetails);
            List<MedicineShipmentLog> shipmentLogs = medicineShipmentLogDao.findMedicineShipmentLogsByOrderId(mediicineorder.getId());
            mediicineorder.setShipmentLogs(shipmentLogs);
        }
        return mediicineorderList;
    }