Merge branch 'medicare' of liubing/wlyy2.0 into medicare

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -717,14 +717,14 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.BaseDevice.findMediicinecabinetInventoryByDeviceIdPage)
    @ApiOperation(value = "根据设备id查询设备轨道数据", notes = "根据设备id查询设备轨道数据")
    public PageEnvelop findMediicinecabinetInventoryByDeviceIdPage(
    public ListEnvelop findMediicinecabinetInventoryByDeviceIdPage(
            @ApiParam(name = "deviceId", value = "设备id", required = true)
            @RequestParam(value = "deviceId", required = true) String deviceId,
            @ApiParam(name = "page", value = "设备id", required = true)
            @RequestParam(value = "page", required = true) Integer page,
            @ApiParam(name = "pageSize", value = "设备id", required = true)
            @RequestParam(value = "pageSize", required = true) Integer pageSize) throws Exception {
            return deviceService.selectByIdPage(deviceId,page,pageSize);
            @RequestParam(value = "start", required = true) Integer start,
            @ApiParam(name = "end", value = "层", required = true)
            @RequestParam(value = "end", required = true) Integer end) throws Exception {
            return success(deviceService.selectByIdPage(deviceId,start,end));
    }
    @PostMapping(value = BaseRequestMapping.BaseDevice.updateMediicinecabineInventory)

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

@@ -228,7 +228,7 @@ public class JwService {
                    JSONObject setlinfoEexpContent = JSONObject.parseObject(setlinfo.getString("exp_content"));
                    insurResultTmp.put("fm_acct_balc",setlinfoEexpContent.get("fm_acct_balc").toString()); //家庭共济账户余额
                    insurResultTmp.put("fm_acct_balc",null==setlinfoEexpContent.get("fm_acct_balc")?"":setlinfoEexpContent.get("fm_acct_balc").toString()); //家庭共济账户余额
                    insurResultTmp.put("hl_acct_balc",setlinfoEexpContent.get("hl_acct_balc").toString()); //健康账户余额
                    insurResultTmp.put("cvl_acct_balc",setlinfoEexpContent.get("cvl_acct_balc").toString()); //公务员账户余额
                    insurResultTmp.put("acct_used_flag","1"); //个人账户使用标志【窗口目前默认固定1，后续可开放前端选择传入】

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

@@ -4648,8 +4648,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     * @param deviceId
     * @return
     */
    public PageEnvelop selectByIdPage(String deviceId,Integer page,Integer pageSize){
        page = page>0?page-1:0;
    public JSONArray selectByIdPage(String deviceId, Integer start, Integer end){
        String layerSql = " and t.layer_no BETWEEN "+start+" and "+end+"  ";
        String sql = "  SELECT\n" +
                "t.id AS id,\n" +
                "t.id_device AS idDevice,\n" +
@@ -4685,20 +4686,20 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory t left join t_mediicine_drugs d on d.id = t.drug_id  \n" +
                    "WHERE\n" +
                    "\tt.id_device = '" +deviceId + "'\n" +
                    "\tt.id_device = '" +deviceId + "'\n" +layerSql+
                    "ORDER BY\n" +
                    "cast(t.layer_no AS UNSIGNED),cast(t.wayer_no AS UNSIGNED)\n";
        sql = sql+sqlTab+" limit "+page*pageSize+","+pageSize;
        sql = sql+sqlTab;
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);
        Long total = jdbcTemplate.queryForObject(sqlCount+sqlTab,Long.class);
//        Long total = jdbcTemplate.queryForObject(sqlCount+sqlTab,Long.class);
        {
            sql = "SELECT\n" +
                    "\tlayer_no AS layerNo\n" +
                    "FROM\n" +
                    "\tt_mediicinecabinet_inventory\n" +
                    "\tt_mediicinecabinet_inventory t\n" +
                    "WHERE\n" +
                    "\tid_device = '" + deviceId +"'\n" +
                    "\tid_device = '" + deviceId +"'\n" +layerSql+
                    "GROUP BY\n" +
                    "\tlayer_no\n" +
                    "ORDER BY\n" +
@@ -4740,7 +4741,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            object.put(id,jsonArray);
            array.add(object);
        }
        return PageEnvelop.getSuccessListWithPage("success",array,page,pageSize,total);
        return array;
    }