设备与订单不相同不能取药

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

@@ -1239,6 +1239,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(deviceId);
        Mediicineorder mediicineorder = null;
        //订单列表
        List<Mediicineorder> orders = new ArrayList<>();
@@ -1261,6 +1262,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        for (Mediicineorder order : orders) {
            Map<String, Object> map = new HashMap<>();
            DmHospitalDO dmHospitalDO = hospitalDao.findByCode(order.getBelongCommunity());
            if (!mediicinedevice.getBelongCommunity().equals(order.getBelongCommunity())) {
                result.put("msg", "order doesn't exist");
                result.put("response", ConstantUtils.FAIL);
                return result;
            }
            map.put("orderId", order.getId());
            map.put("prescribeNum", order.getPrescribeNum());
            map.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());
@@ -1420,7 +1426,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                                    "AND ( t.state = '1' or t.state = '21')\n" +
                                    "and t.qty > 0"
                    );
                    Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(deviceId);
//                    Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(deviceId);
                    for (int i = 0; i < qty; i++) {
                        for (Map<String, Object> objectMap : tempList) {
                            if (Integer.parseInt(String.valueOf(objectMap.get("qty"))) > 0) {