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

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

@@ -12,13 +12,15 @@ import java.util.Map;
public interface MediicinecabinetInventoryDao extends PagingAndSortingRepository<MediicinecabinetInventory, String>, JpaSpecificationExecutor<MediicinecabinetInventory> {
        MediicinecabinetInventory findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(String deviceId, String layerNo, String wayerNo);
    MediicinecabinetInventory findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(String deviceId, String layerNo, String wayerNo);
        @Query("from MediicinecabinetInventory t where  t.idDevice=?1")
        List<MediicinecabinetInventory> findMediicinecabinetInventoryByDeviceId(String deviceId);
    MediicinecabinetInventory findMediicinecabinetInventoryByEquNumAndLayerNoAndWayerNo(String equNum, String layerNo, String wayerNo);
    @Query("from MediicinecabinetInventory t where  t.idDevice=?1")
    List<MediicinecabinetInventory> findMediicinecabinetInventoryByDeviceId(String deviceId);
    @Query("select layerNo as layerNo from MediicinecabinetInventory where idDevice=?1 group by layerNo")
    List<Map<String,Object>> selectByDeviceIdGroup(String  deviceId);
    List<Map<String, Object>> selectByDeviceIdGroup(String deviceId);
}

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

@@ -742,10 +742,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        //表示已出货
        if ("2".equals(status)) {
            //更新药柜库存
            MediicinecabinetInventory inventory = inventoryDao.findMediicinecabinetInventoryByIdDeviceAndLayerNoAndWayerNo(
                    medicineShipmentLog.getDeviceId(),
            MediicinecabinetInventory inventory = inventoryDao.findMediicinecabinetInventoryByEquNumAndLayerNoAndWayerNo(
                    medicineShipmentLog.getDeviceId(),              //equNum
                    medicineShipmentLog.getLayerNo(),
                    medicineShipmentLog.getWayerNo());
                    medicineShipmentLog.getWayerNo().split(",")[0]);
            inventory.setQty(String.valueOf(Integer.parseInt(inventory.getQty()) - 1));
            if (Integer.parseInt(inventory.getQty()) < Integer.parseInt(inventory.getNum())) {
                Mediicinedevice mediicinedevice = deviceDao.findOne(inventory.getIdDevice());
@@ -861,6 +861,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        }
        //生成出货单
        DmHospitalDO dmHospitalDO = hospitalDao.findOne(Integer.parseInt(mediicineorder.getBelongCommunity()));
        int count = jdbcTemplate.queryForObject(
                "SELECT\n" +
                        "\tcount(DISTINCT(id))\n" +
@@ -900,6 +901,13 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    "WHERE \n" +
                    "\tt.order_id = '" + mediicineorder.getId()+"'";
            List<Map<String, Object>> tempList = hibenateUtils.createSQLQuery(tempSql);
            jsonObject.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());
            jsonObject.put("phone", "123456");
            jsonObject.put("num", mediicineorder.getPrescribeNum());
            jsonObject.put("date", DateUtil.dateToStr(new Date(), "yyyy-MM-dd"));
            jsonObject.put("time", DateUtil.dateToStr(new Date(), "HH:mm:ss"));
            jsonObject.put("remark", "若未取到货物，请您扫描小票二维码申请退款。\n谢谢慢走，祝您生活愉快！");
            jsonObject.put("qrCodeContent", "谢谢慢走，祝您生活愉快！");
            jsonObject.put("list", tempList);
            jsonObject.put("status", 1);
            result.put("response", ConstantUtils.SUCCESS);
@@ -957,7 +965,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                }
            }
        }
        DmHospitalDO dmHospitalDO = hospitalDao.findOne(Integer.parseInt(mediicineorder.getBelongCommunity()));
        jsonObject.put("community", dmHospitalDO == null ? "" : dmHospitalDO.getName());
        jsonObject.put("phone", "123456");
        jsonObject.put("num", mediicineorder.getPrescribeNum());