资金对接修改

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

@@ -70,10 +70,10 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                      @RequestParam(value = "page",defaultValue = "1",required = false)int page,
                                  @ApiParam(name = "size",value = "页码",required = false)
                                      @RequestParam(value = "size",defaultValue = "15",required = false)int size){
        List<Map<String,Object>> list = null;
        MixEnvelop expressages=null;
        try {
            list = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            return success(list);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            return success(expressages);
        } catch (Exception e) {
            return failedException(e);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/adv/AdvertisementPuttingAdminEndPoint.java

@@ -112,7 +112,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = AdvsementMapping.AdvsementReusetMapping.SEL)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<AdvertisementPuttingAdminVO> page (
    public PageEnvelop<AdvertisementPuttingAdminDO> page (
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -125,7 +125,7 @@ public class AdvertisementPuttingAdminEndPoint extends EnvelopRestEndpoint {
            @RequestParam(value = "size") int size) throws Exception {
        List<AdvertisementPuttingAdminDO> list = advrtisementService.search(fields, filters, sorts, page, size);
        int count = (int)advrtisementService.getCount(filters);
        return success(list, count, page, size, AdvertisementPuttingAdminVO.class);
        return success(list, count, page, size, AdvertisementPuttingAdminDO.class);
    }

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

@@ -15,6 +15,7 @@ import com.yihu.jw.entity.hospital.DmHospitalDO;
import com.yihu.jw.hospital.HospitalDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
@@ -1563,14 +1564,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
    }
    public List<Map<String,Object>> getSumAmount(String belongCommunity, String equNum, String startTime, String endTime,int page,int size) {
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, String startTime, String endTime, int page, int size) {
        List<Map<String,Object>> mapList=new ArrayList<>();
        Map<String,Object> countMap = new HashMap<>();
        //第几页
        countMap.put("page",page);
        //多少条
        countMap.put("size",size);
        page = (page - 1) * size;
        //查询出所有的设备
        Iterable <Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page,size);
        List<Mediicinedevice> mediicinedeviceList= IterableUtils.toList(mediicinedevices);
@@ -1584,10 +1579,6 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        int decCount = jdbcTemplate.queryForObject(countSql,Integer.class);
        //总页数
        int total=decCount/size+(decCount%size>0?1:0);
        countMap.put("total",total);
        countMap.put("count",decCount);
        mapList.add(countMap);
        //将同一个设备的社区/名称/设备编码/历史记录/总金额放到一个Map中,并将这些Map放到同一个list中返回
        for (Mediicinedevice mediicinedevice:mediicinedeviceList){
            Map<String,Object> map=new HashMap<>();
@@ -1618,7 +1609,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            }
            mapList.add(map);
        }
        return mapList;
        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
    }
    public void pushListWrite(OutputStream os, List<Map<String, Object>> list)throws Exception {