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/endpoint/a4endpoint/MedicineDrugsEndpoint.java

@@ -107,9 +107,9 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "heightPrice", required = false) String heightPrice,
            @ApiParam(name = "userId", value = "用户id", required = true)
            @RequestParam(value = "userId") String userId,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @ApiParam(name = "page", value = "页码", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = drugsService.queryDrugListFullInfo(state, content, drugClass, drugType, lowVolume, heightVolume, lowPrice, heightPrice, userId,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
@@ -121,8 +121,13 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "content", value = "搜索内容")
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "deviceId", value = "设备id", required = true)
            @RequestParam(value = "deviceId") String deviceId) throws Exception {
        JSONObject jsonObject = drugsService.getDrugListByDevice(content, deviceId);
            @RequestParam(value = "deviceId") String deviceId,
            @ApiParam(name = "page", value = "页码", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size
            ) throws Exception {
        JSONObject jsonObject = drugsService.getDrugListByDevice(content, deviceId,page,size);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));
        }

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

@@ -359,7 +359,7 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
    }
    public JSONObject getDrugListByDevice(String content, String deviceId) {
    public JSONObject getDrugListByDevice(String content, String deviceId, int page, int size) {
        JSONObject result = new JSONObject();
        if (deviceId == null || StringUtils.isEmpty(deviceId)) {
@@ -417,8 +417,8 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
        if (!StringUtils.isEmpty(content)) {
            conditionSql += " AND CONCAT(IFNULL(t.drug_name,''),IFNULL(t.drug_code,''),IFNULL(t.drug_name_alies,''),IFNULL(lower(t.spell_code),'')) LIKE '%" + content.toLowerCase() + "%'";
        }
//        List<Mediicinedrugs> mediicinedrugs = drugsDao.findMediicinedrugsByOrgCode(mediicinedevice.getBelongCommunity());
        result.put("msg", hibenateUtils.createSQLQuery(sql + conditionSql));
//      List<Mediicinedrugs> mediicinedrugs = drugsDao.findMediicinedrugsByOrgCode(mediicinedevice.getBelongCommunity());
        result.put("msg", hibenateUtils.createSQLQuery((sql+conditionSql),page,size));
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }