fix bug

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

@@ -448,7 +448,21 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        jsonObject.put("amount", mediicineorder.getAmount());
        jsonObject.put("socialinsurPayment", mediicineorder.getSocialinsurPayment());
        jsonObject.put("sellState", mediicineorder.getSellState());
        jsonObject.put("sellStateName", "0".equals(mediicineorder.getSellState()) ? "未取药" : "已取药");
        String sellStateName = "";
        switch (mediicineorder.getSellState()) {
            case "0":
                sellStateName = "未取药";
                break;
            case "1":
                sellStateName = "已取药";
                break;
            case "-1":
                sellStateName = "药房已取药";
                break;
            case "-2":
                sellStateName = "药房已作废";
        }
        jsonObject.put("sellStateName", sellStateName);
        jsonObject.put("infoAccess", mediicineorder.getInfoAccess());
        jsonObject.put("orderTypeName", orderTypeMap.get(mediicineorder.getOrderType()));
        //取药码

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

@@ -4424,15 +4424,18 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
//        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeCondition(inventory.getIdDevice(), "1", "21");
        List<Map<String, Object>> collect = hibenateUtils.createSQLQuery(sql);
//        //药品变更,true除当前货道还存在该药品
        boolean isExit = collect.stream().filter(m -> m.get("drugCode").toString().equals(inventoryDO.getDrugCode())).findAny().isPresent();
        if (collect == null || collect.size() == 0 || !isExit) {
            Map<String, Object> tempMap = new HashMap<>();
            tempMap.put("drugCode", inventoryDO.getDrugCode());
            tempMap.put("orgCode", inventoryDO.getOrgCode());
            tempMap.put("qty", inventoryDO.getQty());
            tempMap.put("ratedInventory", inventoryDO.getRatedInventory());
            tempMap.put("drugId", inventoryDO.getDrugId());
            collect.add(tempMap);
        boolean isExit = false;
        if (inventoryDO != null) {
            isExit = collect.stream().filter(m -> m.get("drugCode").toString().equals(inventoryDO.getDrugCode())).findAny().isPresent();
            if (collect == null || collect.size() == 0 || !isExit) {
                Map<String, Object> tempMap = new HashMap<>();
                tempMap.put("drugCode", inventoryDO.getDrugCode());
                tempMap.put("orgCode", inventoryDO.getOrgCode());
                tempMap.put("qty", inventoryDO.getQty());
                tempMap.put("ratedInventory", inventoryDO.getRatedInventory());
                tempMap.put("drugId", inventoryDO.getDrugId());
                collect.add(tempMap);
            }
        }
@@ -4718,7 +4721,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                //默认false,通过规则判断是否缺货
                if (!refreshStatus) {
                    //更改设备缺货状态
                    updateDeviceState(inventory.getId(), inventoryDO);
                    if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
                        updateDeviceState(inventory.getId(), null);
                    } else {
                        updateDeviceState(inventory.getId(), inventoryDO);
                    }
                }
                mediicinecabinetInventory = inventoryDao.save(inventory);
@@ -4861,7 +4868,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            //默认false,通过规则判断是否缺货
            if (!refreshStatus) {
                //更改设备缺货状态
                updateDeviceState(inventory.getId(), inventoryDO);
                if (org.apache.commons.lang3.StringUtils.isNoneBlank(status)){
                    updateDeviceState(inventory.getId(), null);
                } else {
                    updateDeviceState(inventory.getId(), inventoryDO);
                }
            }
            inventoryDao.save(inventory);