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

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/MediicinecabinetInventory.java

@@ -110,7 +110,7 @@ public class MediicinecabinetInventory extends UuidIdentityEntityWithOperator im
    private String merge;
    /**
     * 货道状态，1开启，0关闭，只针对出货的问题，初始化，默认关闭，1、解绑设备，2、设备初始化两位置涉及到
     * 货道状态，1开启，0关闭，只针对出货的问题，初始化，默认开启，1、解绑设备，2、设备初始化两位置涉及到
     */
    private String cargoState;

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());
@@ -1303,7 +1309,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                        "FROM\n" +
                        "\tt_medicine_shipment_log AS t\n" +
                        "WHERE \n" +
                        "\tt.order_id = '" + mediicineorder.getId() + "'";
                        "\tt.order_id = '" + order.getId() + "'";
                List<Map<String, Object>> tempList = hibenateUtils.createSQLQuery(tempSql);
                map.put("drugList", tempList);
                orderList.add(map);
@@ -1389,7 +1395,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            "FROM\n" +
                            "\tt_medicine_shipment_log AS t\n" +
                            "WHERE \n" +
                            "\tt.order_id = '" + mediicineorder.getId() + "'";
                            "\tt.order_id = '" + order.getId() + "'";
                    List<Map<String, Object>> tempList = hibenateUtils.createSQLQuery(tempSql);
                    map.put("drugList", tempList);
                    orderList.add(map);
@@ -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) {

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

@@ -272,22 +272,23 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
            }
        }
        String sql = "SELECT\n" +
                "    t.id as id,\n" +
                "    t.community as community,\n" +
                "    t.doc_time as docTime,\n" +
                "    t.remark as remark,\n" +
                "    t.replenish_cate as replenishCate,\n" +
                "    t.replenish_equ as replenishEqu,\n" +
                "    t.replenish_er as replenishEr,\n" +
                "    t.replenish_inventory as replenishInventory,\n" +
                "    t.state as state,\n" +
                "    t.track_num as trackNum,\n" +
                "    t.create_time as createTime,\n" +
                "    t.create_user as createUser,\n" +
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "t.id AS id,\n" +
                "t.community AS community,\n" +
                "t.doc_time AS docTime,\n" +
                "t.doc_num AS docNum,\n" +
                "t.remark AS remark,\n" +
                "t.replenish_cate AS replenishCate,\n" +
                "t.replenish_equ AS replenishEqu,\n" +
                "t.replenish_er AS replenishEr,\n" +
                "t.replenish_inventory AS replenishInventory,\n" +
                "t.state AS state,\n" +
                "t.track_num AS trackNum,\n" +
                "t.create_time AS createTime,\n" +
                "t.create_user AS createUser,\n" +
                "t.create_user_name AS createUserName,\n" +
                "t.update_time AS updateTime,\n" +
                "t.update_user AS updateUser,\n" +
                "t.update_user_name AS updateUserName\n" +
                "FROM\n" +
                "    t_mediicine_stockup AS t where 1=1";

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

@@ -104,20 +104,22 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                        "t.user_id = '" + userId + "'\n" +
                        "AND t.del = 1";
            }
            List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql);
            for (Map<String, Object> stringObjectMap : list) {
                if (stringObjectMap.get("community") != null && !StringUtils.isEmpty(stringObjectMap.get("community").toString())) {
                    if (StringUtils.isEmpty(belongCommunitys)) {
                        belongCommunitys += stringObjectMap.get("community").toString();
                    } else {
                        belongCommunitys += "," +  stringObjectMap.get("community").toString();
            if (!StringUtils.isEmpty(sql)) {
                List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql);
                for (Map<String, Object> stringObjectMap : list) {
                    if (stringObjectMap.get("community") != null && !StringUtils.isEmpty(stringObjectMap.get("community").toString())) {
                        if (StringUtils.isEmpty(belongCommunitys)) {
                            belongCommunitys += stringObjectMap.get("community").toString();
                        } else {
                            belongCommunitys += "," +  stringObjectMap.get("community").toString();
                        }
                    }
                }
            }
        }
        if (!StringUtils.isEmpty(belongCommunitys)) {
            conditionSql += "\tAND ',"+ belongCommunitys +",' LIKE CONCAT('%,',wua.hospital,',%')\n";
            conditionSql += "\tAND  b.id IN ( SELECT wua.user_id FROM wlyy_user_area wua WHERE wua.del = 1 AND ',"+ belongCommunitys +",' LIKE CONCAT('%,',wua.hospital,',%'))\n";
        }
        sql = "SELECT\n" +
                "\tb.id AS id,\n" +
@@ -145,7 +147,7 @@ public class MedicineUserService extends BaseJpaService<Mediicineuser, Mediicine
                "\tb.last_login_failure_time AS lastLoginFailureTime,\n" +
                "\tb.role_id AS roleId\n" +
                "FROM\n" +
                "\tbase_user b LEFT JOIN wlyy_user_area wua on b.id = wua.user_id\n" +
                "\tbase_user b \n" +
                "WHERE\n" +
                "\tb.role_id IN (\n" +
                "\t\tSELECT\n" +

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

@@ -144,7 +144,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                //默认下架
                inventory.setShelfStatus("0");
                //默认货道关闭
                inventory.setCargoState("0");
                inventory.setCargoState("1");
                inventoryDao.save(inventory);
            }
        }
@@ -614,8 +614,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                for (MediicinecabinetInventory inventory : list) {
                    inventory.setPic(null);
                    inventory.setShelfStatus("0");
                    //关闭货道
                    inventory.setCargoState("0");
                    //关闭货道,默认开启货道
                    inventory.setCargoState("1");
                    inventory.setQty("0");
                    inventory.setDrugCode(null);
                    inventory.setDrugId(null);