Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicinecabinetInventoryDao.java

@@ -29,33 +29,33 @@ public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository
//    List<MediicinecabinetInventory> findMediicinecabinetInventoriesByIdDeviceAndStateInAndDrugCodeNotNullAndAndOrgCodeNotNull(String deviceId, String[] states);
    @Query("select sum(qty) as qty, drugId as drugId, drugCode as drugCode, orgCode as orgCode, sum(ratedInventory) as ratedInventory from MediicinecabinetInventory where idDevice = ?1 and state in (?2) and drugCode is not null and orgCode is not null group by drugCode,orgCode")
    List<Map<String, Object>> selectsomethingBysomeCondition(String deviceId, String states);
    @Query("select sum(qty) as qty, drugId as drugId, drugCode as drugCode, orgCode as orgCode, sum(ratedInventory) as ratedInventory from MediicinecabinetInventory where idDevice = ?1 and (state = ?2 or state = ?3) and drugCode is not null and orgCode is not null group by drugCode,orgCode")
    List<Map<String, Object>> selectsomethingBysomeCondition(String deviceId, String firstState, String secondState);
    @Query("select sum(qty) as qty, drugId as drugId, drugCode as drugCode, orgCode as orgCode, sum(ratedInventory) as ratedInventory from MediicinecabinetInventory where equNum = ?1 and state in (?2) and drugCode is not null and orgCode is not null group by drugCode,orgCode")
    List<Map<String, Object>> selectsomethingBysomeConditionWithEquNum(String equNum, String states);
    @Query("select sum(qty) as qty, drugId as drugId, drugCode as drugCode, orgCode as orgCode, sum(ratedInventory) as ratedInventory from MediicinecabinetInventory where equNum = ?1 and  (state = ?2 or state = ?3) and drugCode is not null and orgCode is not null group by drugCode,orgCode")
    List<Map<String, Object>> selectsomethingBysomeConditionWithEquNum(String equNum, String firstState, String secondState);
    @Query(" select sum(qty) as qty " +
            "from MediicinecabinetInventory " +
            "where orgCode = ?1 " +
            "and drugCode = ?2 " +
            "and idDevice = ?3 " +
            "and state in (?4) " +
            "and (state = ?4 or state = ?5) " +
            "and orgCode is not null and drugCode is not null ")
    Integer sumqty(String orgCode, String drugCode, String deviceId, String state);
    Integer sumqty(String orgCode, String drugCode, String deviceId, String firstState, String secondState);
    @Query(" select a " +
            "from MediicinecabinetInventory a " +
            "where a.orgCode = ?1 " +
            "and a.drugCode = ?2 " +
            "and a.idDevice = ?3 " +
            "and a.state in (?4) " +
            "and (a.state = ?4 or a.state = ?5) " +
            "and a.orgCode is not null and a.drugCode is not null ")
    List<MediicinecabinetInventory> getMediicinecabinetInventoriesByOrgCodeAndDurgCode(String orgCode, String drugCode, String deviceId, String state);
    List<MediicinecabinetInventory> getMediicinecabinetInventoriesByOrgCodeAndDurgCode(String orgCode, String drugCode, String deviceId, String firstState, String secondState);
    @Query("select sum(qty) as qty from MediicinecabinetInventory where equNum = ?1 and state in (?2) and drugCode is not null and orgCode is not null")
    Integer sumInventoryWithEquNum(String equNum, String states);
    @Query("select sum(qty) as qty from MediicinecabinetInventory where equNum = ?1 and (state = ?2 or state = ?3) and drugCode is not null and orgCode is not null")
    Integer sumInventoryWithEquNum(String equNum, String firstState, String secondState);
}

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

@@ -905,7 +905,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    public void updateDeviceState(MedicineShipmentLog medicineShipmentLog) {
        //包含原来药品信息
//        MediicinecabinetInventory inventory =  inventoryDao.findOne(cargoId);
        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeConditionWithEquNum(medicineShipmentLog.getDeviceId(),"1,21");
        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeConditionWithEquNum(medicineShipmentLog.getDeviceId(),"1,", "21");
        Iterator<Map<String, Object>> it = collect.iterator();
        while (it.hasNext()) {
            Map<String, Object> stringObjectMap = it.next();

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

@@ -487,7 +487,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            Integer inventoryNum = mediicinecabinetInventoryDao.sumqty(mediicinestockoutdetail.getOrgCode(),
                    mediicinestockoutdetail.getDrugCode(),
                    deviceId,
                    "1,21");
                    "1", "21");
            if(inventoryNum == null) inventoryNum = 0;
            mediicineStockoutDetailVO.setInventoryNum(inventoryNum);
            Mediicinedrugs mediicinedrugs = drugsDao.findOne(mediicinestockoutdetail.getDrugId());

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

@@ -2357,7 +2357,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            //在架库存数
            stringObjectMap.put("shangPinKuCun", inStock);
            //商品庫存
            Integer inventoryNum = inventoryDao.sumInventoryWithEquNum(stringObjectMap.get("equNum")+"", "1,21");
            Integer inventoryNum = inventoryDao.sumInventoryWithEquNum(stringObjectMap.get("equNum")+"", "1", "21");
            if(inventoryNum == null) inventoryNum = 0;
            stringObjectMap.put("inventoryNum", inventoryNum);
            stringObjectMap.put("warningNum", getEarlyWaringNum(stringObjectMap.get("equNum") + ""));
@@ -2597,7 +2597,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        //
        List<Map<String, Integer>> drugIds = new ArrayList<>();
        //设备中所有药品列表
        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeConditionWithEquNum(equNum, "1,21");
        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeConditionWithEquNum(equNum, "1", "21");
        Integer number = 0;
        //获取了所有缺货的药品id
        for (MedicineWarrayRule rule : rules) {
@@ -3757,7 +3757,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        //包含原来药品信息
        MediicinecabinetInventory inventory =  inventoryDao.findOne(cargoId);
//        List<MediicinecabinetInventory> list = inventoryDao.findMediicinecabinetInventoriesByIdDeviceAndStateInAndDrugCodeNotNullAndAndOrgCodeNotNull(inventory.getIdDevice(), new String[]{"1", "21"});
        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeCondition(inventory.getIdDevice(), "1,21");
        List<Map<String, Object>> collect = inventoryDao.selectsomethingBysomeCondition(inventory.getIdDevice(), "1", "21");
//        //药品变更
//        if (drugChanged) {
//            //变更的目标药品
@@ -4605,7 +4605,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            stringObjectMap.put("detail", inventoryDao.getMediicinecabinetInventoriesByOrgCodeAndDurgCode(
                    stringObjectMap.get("orgCode") + "",
                    stringObjectMap.get("drugCode") + "",
                    deviceId, "1,21"));
                    deviceId, "1", "21"));
        }
        return collect;
    }