Merge branch 'medicare' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into medicare

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

@@ -2550,6 +2550,21 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            }
            //在架库存数
            stringObjectMap.put("shangPinKuCun", inStock);
            //未设置商品货道
            tempSql = "SELECT\n" +
                    "\tcount(DISTINCT(t.id))\n" +
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory t\n" +
                    "WHERE\n" +
                    "\tt.id_device = '" + stringObjectMap.get("id").toString() + "'\n" +
                    "AND t.org_code IS NULL\n" +
                    "AND t.drug_code IS NULL\n" +
                    "AND (t.state = '1' OR t.state = '21')";
            int number = jdbcTemplate.queryForObject(tempSql, Integer.class);
            stringObjectMap.put("weishezhishangpinhuodao", number);
            //空置率
            stringObjectMap.put("kongzhilv",
                    new BigDecimal((number * 1.0) / Integer.parseInt(stringObjectMap.get("aisles").toString())).setScale(2, BigDecimal.ROUND_HALF_UP));
            //商品庫存
//            Integer inventoryNum = inventoryDao.sumInventoryWithEquNum(stringObjectMap.get("equNum")+"", "1", "21");
            String tempSqlTwo = "SELECT\n" +