svr/svr-base/src/main/java/com/yihu/jw/base/dao/a2dao/MediicineDeviceDao.java

@@ -28,4 +28,12 @@ public interface MediicineDeviceDao extends PagingAndSortingRepository<Mediicine
    @Query(value = "select * from t_mediicine_device as a where 1=1 limit ?1,?2 ",nativeQuery = true)
    Iterable<Mediicinedevice> findDeviceAll(int page, int size);
    @Query(value = "select * from t_mediicine_device as t where t.belong_community like concat(%,?1,%)",nativeQuery = true)
    Mediicinedevice findByBelongCommunity(String belongCommunity);
    @Query(value = "select * from t_mediicine_device as t where t.equ_num like concat(%,?1,%)",nativeQuery = true)
    Mediicinedevice findMediicinedeviceByEquNumLike(String equNum);
    @Query(value = "select * from t_mediicine_device as t where t.belong_community like concat(%,?1,%) and t.equ_num like concat(%,?2,%)",nativeQuery = true)
    Mediicinedevice findByBelongCommunityAndEquNum(String belongCommunity,String equNum);
}

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

@@ -45,7 +45,7 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  HttpServletResponse response){
        MixEnvelop expressages = null;
        try {
            expressages = medicineOrderService.getSumAmountExcel(belongCommunity,equNum,startTime,endTime,page,size);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            List<Map<String, Object>> list = expressages.getDetailModelList();
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("pushDataList.xls".getBytes("utf-8"), "iso8859-1"));
@@ -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/endpoint/user/UserEndpoint.java

@@ -211,6 +211,8 @@ public class UserEndpoint extends EnvelopRestEndpoint {
    public PageEnvelop userInfoList(
            @ApiParam(name = "realName", value = "realName")
            @RequestParam(value = "realName", required = false) String realName,
            @ApiParam(name = "username", value = "username")
            @RequestParam(value = "username", required = false) String username,
            @ApiParam(name = "saasid", value = "saasid")
            @RequestParam(value = "saasid", required = false) String saasid,
            @ApiParam(name = "roleId", value = "roleId")
@@ -219,7 +221,7 @@ public class UserEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = userService.userInfoList(realName,saasid, roleId,page,size,wechatId);
        JSONObject result = userService.userInfoList(realName,username,saasid, roleId,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

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;
@@ -31,6 +32,7 @@ import java.awt.print.Pageable;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.Boolean;
import java.math.BigDecimal;
import java.util.*;
import java.util.logging.Logger;
import java.util.stream.Collectors;
@@ -1502,107 +1504,145 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        return result;
    }
    public MixEnvelop getSumAmountExcel(String belongCommunity, String equNum, String startTime, String endTime,int page,int size) {
//    public MixEnvelop getSumAmountExcel(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);
//        String countSql = " select " +
//                "     COUNT(DISTINCT (t.id)) as count " +
//                "   from " +
//                "     t_mediicine_device as t " +
//                "  where " +
//                "  1=1   " ;
//        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
//        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<>();
//            map.put("community",mediicinedevice.getCommunity());
//            map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
//            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
//                    "                COUNT(*) AS count,\n" +
//                    "                t.shipping_equ AS equNum\n" +
//                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum()+"'";
//            String conditionSql="";
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
//                conditionSql += "AND t.belong_community ='"+belongCommunity+"'";
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
//                conditionSql += "AND t.shipping_equ = '" + equNum + "'";
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
//                conditionSql += "AND t.shipping_time >= "+ startTime  ;
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
//                conditionSql += "AND t.shipping_time <= "+ endTime ;
//            }
//            oneSql=oneSql+conditionSql;
//            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
//            for (Map<String,Object> oneMap:list){
//                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
//                String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
//                map.put("ordercount",count);
//                map.put("sumAmount",sumAmount);
//            }
//            mapList.add(map);
//        }
//
//        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
//    }
    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);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device as t " +
                "  where " +
                "  1=1   " ;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        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<>();
            map.put("community",mediicinedevice.getCommunity());
            map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
                    "                COUNT(*) AS count,\n" +
                    "                t.shipping_equ AS equNum\n" +
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum()+"'";
            String conditionSql="";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
                conditionSql += "AND t.belong_community ='"+belongCommunity+"'";
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                conditionSql += "AND t.shipping_equ = '" + equNum + "'";
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
                conditionSql += "AND t.shipping_time >= "+ startTime  ;
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
                conditionSql += "AND t.shipping_time <= "+ endTime ;
            }
            oneSql=oneSql+conditionSql;
            List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                map.put("ordercount",count);
                map.put("sumAmount",sumAmount);
        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)
        &&!org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)) {
            page=(page-1)*size;
            Iterable<Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page, size);
            for (Mediicinedevice mediicinedevice : mediicinedevices) {
                Map<String, Object> map = new HashMap<>();
                map.put("community", mediicinedevice.getCommunity());
                map.put("equName", mediicinedevice.getEquNum() + (mediicinedevice.getEquName() == null ? "" : "/" + mediicinedevice.getEquName()));
                String oneSql = "SELECT SUM(t.amount) AS sumAmount,\n" +
                        "                COUNT(*) AS count,\n" +
                        "                t.shipping_equ AS equNum\n" +
                        "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum() + "'";
                List<Map<String,Object>> list = hibenateUtils.createSQLQuery(oneSql);
                for (Map<String,Object> oneMap:list){
                    String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                    String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                    float price = Float.parseFloat(sumAmount);
                    BigDecimal b  =   new  BigDecimal(price);
                    float   m_price   =  b.setScale(2,  BigDecimal.ROUND_HALF_UP).floatValue();
                    map.put("ordercount",count);
                    map.put("sumAmount",m_price);
                }
                mapList.add(map);
            }
            mapList.add(map);
            String countSql = " select " +
                    "     COUNT(DISTINCT (t.id)) as count " +
                    "   from " +
                    "     t_mediicine_device as t " +
                    "  where " +
                    "  1=1   " ;
            Logger.getAnonymousLogger().info("finalCountSql="+countSql);
            int decCount = jdbcTemplate.queryForObject(countSql,Integer.class);
            //总页数
            int total=decCount/size+(decCount%size>0?1:0);
            MixEnvelop mixEnvelop = MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
            mixEnvelop.setTotalCount(decCount);
            mixEnvelop.setTotalPage(total);
            return mixEnvelop;
        }
        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) {
        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);
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device as t " +
                "  where " +
                "  1=1   " ;
        Logger.getAnonymousLogger().info("finalCountSql="+countSql);
        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<>();
            map.put("community",mediicinedevice.getCommunity());
            map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
            String oneSql="SELECT SUM(t.amount) AS sumAmount,\n" +
                    "                COUNT(*) AS count,\n" +
                    "                t.shipping_equ AS equNum\n" +
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 AND t.shipping_equ = '" + mediicinedevice.getEquNum()+"'";
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 ";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
                oneSql += "AND t.belong_community ='"+belongCommunity+"'";
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                oneSql += "AND t.shipping_equ = '" + equNum + "'";
                oneSql += "AND t.belong_community = '"+belongCommunity+"' ";
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
                    map.put("community",device.getCommunity());
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
            }else {
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
//                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
//                    map.put("community",device.getCommunity());
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
//                oneSql += "AND t.shipping_equ = '" + equNum + "'";
//                Mediicinedevice daoByEquNum=deviceDao.findMediicinedeviceByEquNum(equNum);
//                map.put("equName",daoByEquNum.getEquNum()+(daoByEquNum.getEquName()==null?"":"/"+daoByEquNum.getEquName()));
//            }else {
//                map.put("equName",mediicinedevice.getEquNum()+(mediicinedevice.getEquName()==null?"":"/"+mediicinedevice.getEquName()));
//            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
                oneSql += "AND t.shipping_time >= "+ startTime  ;
            }
@@ -1613,12 +1653,17 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            for (Map<String,Object> oneMap:list){
                String count = oneMap.get("count")==null?"0":oneMap.get("count").toString();
                String sumAmount=oneMap.get("sumAmount")==null?"0":oneMap.get("sumAmount").toString();
                float price = Float.parseFloat(sumAmount);
                BigDecimal b  =   new  BigDecimal(price);
                float   m_price   =  b.setScale(2,  BigDecimal.ROUND_HALF_UP).floatValue();
                map.put("ordercount",count);
                map.put("sumAmount",sumAmount);
                map.put("sumAmount",m_price);
            }
            mapList.add(map);
        }
        return mapList;
        MixEnvelop mixEnvelop = MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
        mixEnvelop.setTotalPage(mapList.size()/size+(mapList.size()%size==0?0:1));
        mixEnvelop.setTotalCount(mapList.size());
        return mixEnvelop;
    }
    public void pushListWrite(OutputStream os, List<Map<String, Object>> list)throws Exception {
@@ -1669,10 +1714,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "WHERE " +
                "t.shipping_equ='"+deviceId+"'";
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(prescribeNum)){
            sql += " AND t.prescribe_num='"+prescribeNum+"'";
            sql += " AND t.prescribe_num like '%"+prescribeNum+"%'";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(amount)){
            sql += " AND t.amount='"+amount+"'";
            sql += " AND t.amount like '%"+amount+"%'";
        }
        if(org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
            sql += " AND t.prescribe_time>='"+startTime+"'";
@@ -1695,10 +1740,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "WHERE " +
                "t.shipping_equ='"+deviceId+"'";
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(prescribeNum)){
            sql += " AND t.prescribe_num='"+prescribeNum+"'";
            sql += " AND t.prescribe_num like '%"+prescribeNum+"%'";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(amount)){
            sql += " AND t.amount='"+amount+"'";
            sql += " AND t.amount like '%"+amount+"%'";
        }
        if(org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
            sql += " AND t.prescribe_time>='"+startTime+"'";
@@ -1748,6 +1793,13 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                "a.equ_num=t.shipping_equ " +
                "and t.sell_state='1' ";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        for (Map<String,Object> map:list){
            String sumAmount=map.get("sumAmount")==null?"0":map.get("sumAmount").toString();
            float price = Float.parseFloat(sumAmount);
            BigDecimal b  =  new  BigDecimal(price);
            float   m_price  =  b.setScale(2,  BigDecimal.ROUND_HALF_UP).floatValue();
            map.put("sumAmount",m_price);
        }
        return list;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -938,7 +938,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
     * @return
     * @throws Exception
     */
    public JSONObject userInfoList(String name,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
    public JSONObject userInfoList(String name,String username,String saasid,String roleId,int page,int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        List<String>roleList=new ArrayList();
   /*     int start = 0 == page ? page++ : (page - 1) * size;
@@ -1023,6 +1023,9 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                if(!realName.equals(null) && !realName.equals("")){
                    finalSql = finalSql + " and usr . name LIKE '%"+realName+"%'";
                }
                if(StringUtils.isNoneBlank(username)){
                    finalSql = finalSql + " and usr .username LIKE '%"+username+"%'";
                }
                if(!saasidValue.equals(null) && !saasidValue.equals("")){
                    finalSql = finalSql + " and saas. id = '"+saasidValue+"'";
                }
@@ -1033,6 +1036,7 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
        Logger.getAnonymousLogger().info("finalSql="+finalSql);
        String sql = finalSql
                .replace("{realName}","%" + realName + "%")
                .replace("{username}","%" + username + "%")
                .replace("{saasid}",saasidValue)
                .replace("{roleId}",roleIdValue);