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

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

@@ -29,11 +29,7 @@ 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

@@ -34,10 +34,6 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  @RequestParam(value = "belongCommunity" ,required = false)String belongCommunity,
                                  @ApiParam(name = "equNum" ,value = "设备编码" ,required = false)
                                  @RequestParam(value = "equNum",required = false)String equNum,
                                  @ApiParam(name = "startTime" ,value = "开始时间",required = false)
                                  @RequestParam(value = "startTime" ,required = false)String startTime,
                                  @ApiParam(name = "endTime",value = "截止时间",required = false)
                                  @RequestParam(value = "endTime",required = false)String endTime,
                                  @ApiParam(name = "page",value = "页码",required = false)
                                  @RequestParam(value = "page",defaultValue = "1",required = false)int page,
                                  @ApiParam(name = "size",value = "页码",required = false)
@@ -45,7 +41,7 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  HttpServletResponse response){
        MixEnvelop expressages = null;
        try {
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,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"));
@@ -62,17 +58,13 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                                  @RequestParam(value = "belongCommunity" ,required = false)String belongCommunity,
                                  @ApiParam(name = "equNum" ,value = "设备编码" ,required = false)
                                  @RequestParam(value = "equNum",required = false)String equNum,
                                  @ApiParam(name = "startTime" ,value = "开始时间",required = false)
                                  @RequestParam(value = "startTime" ,required = false)String startTime,
                                  @ApiParam(name = "endTime",value = "截止时间",required = false)
                                  @RequestParam(value = "endTime",required = false)String endTime,
                                  @ApiParam(name = "page",value = "页码",required = false)
                                      @RequestParam(value = "page",defaultValue = "1",required = false)int page,
                                  @ApiParam(name = "size",value = "页码",required = false)
                                      @RequestParam(value = "size",defaultValue = "15",required = false)int size){
        MixEnvelop expressages=null;
        try {
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,startTime,endTime,page,size);
            expressages = medicineOrderService.getSumAmount(belongCommunity,equNum,page,size);
            return success(expressages);
        } catch (Exception e) {
            return failedException(e);
@@ -80,10 +72,8 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
    }
    @ApiOperation(value = "查看设备订单详情")
    @GetMapping("/deviceInfo")
    public Envelop deviceInfo(@ApiParam(name = "prescribeNum",value = "处方号",required = false)
    public Envelop deviceInfo(@ApiParam(name = "prescribeNum",value = "处方号或金额",required = false)
                              @RequestParam(value = "prescribeNum",required = false)String prescribeNum,
                              @ApiParam(name = "amount",value = "金额",required = false)
                              @RequestParam(value = "amount",required = false)String amount,
                              @ApiParam(name = "startTime" ,value = "开始时间",required = false)
                              @RequestParam(value = "startTime" ,required = false)String startTime,
                              @ApiParam(name = "endTime",value = "截止时间",required = false)
@@ -94,15 +84,13 @@ 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 = medicineOrderService.getDeviceInfo(prescribeNum,amount,startTime,endTime,deviceId,page,size);
        List<Map<String,Object>> list = medicineOrderService.getDeviceInfo(prescribeNum,startTime,endTime,deviceId,page,size);
        return success(list);
    }
    @ApiOperation(value = "导出设备订单详情")
    @GetMapping("/deviceInfoExcel")
    public Envelop deviceInfoExcel(@ApiParam(name = "prescribeNum",value = "处方号",required = false)
                              @RequestParam(value = "prescribeNum",required = false)String prescribeNum,
                              @ApiParam(name = "amount",value = "金额",required = false)
                              @RequestParam(value = "amount",required = false)String amount,
                              @ApiParam(name = "startTime" ,value = "开始时间",required = false)
                              @RequestParam(value = "startTime" ,required = false)String startTime,
                              @ApiParam(name = "endTime",value = "截止时间",required = false)
@@ -115,7 +103,7 @@ public class FundsManagementEndpoint extends EnvelopRestEndpoint {
                              @RequestParam(value = "size",defaultValue = "15",required = false)int size,
                                   HttpServletResponse response){
        try {
            MixEnvelop expressages = medicineOrderService.getDeviceInfoExcel(prescribeNum,amount,startTime,endTime,deviceId,page,size);
            MixEnvelop expressages = medicineOrderService.getDeviceInfoExcel(prescribeNum,startTime,endTime,deviceId,page,size);
            List<Map<String, Object>> list = expressages.getDetailModelList();
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=" + new String("deviceInfoExcel.xls".getBytes("utf-8"), "iso8859-1"));

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

@@ -1566,11 +1566,10 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
//        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
//    }
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, String startTime, String endTime, int page, int size) {
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, int page, int size) {
        List<Map<String,Object>> mapList=new ArrayList<>();
        //查询出所有的设备
        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)) {
        if (!org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)&&!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)) {
            page=(page-1)*size;
            Iterable<Mediicinedevice> mediicinedevices = deviceDao.findDeviceAll(page, size);
            for (Mediicinedevice mediicinedevice : mediicinedevices) {
@@ -1618,10 +1617,17 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                oneSql += "AND t.belong_community = '"+belongCommunity+"' ";
                if (!org.apache.commons.lang3.StringUtils.isNoneBlank(equNum)){
                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
                    if (device==null){
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    if (device==null){
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
@@ -1632,6 +1638,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    if (device==null){
                        return MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,new ArrayList());
                    }
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
                }
@@ -1643,12 +1652,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
//            }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  ;
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
                oneSql += "AND t.shipping_time <= "+ endTime ;
            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
//                oneSql += "AND t.shipping_time >= "+ startTime  ;
//            }
//            if (org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
//                oneSql += "AND t.shipping_time <= "+ endTime ;
//            }
            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();
@@ -1703,7 +1712,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        ws.addCell(label);
    }
    public List<Map<String,Object>> getDeviceInfo(String prescribeNum, String amount, String startTime, String endTime, String deviceId,int page,int size) {
    public List<Map<String,Object>> getDeviceInfo(String prescribeNum, String startTime, String endTime, String deviceId,int page,int size) {
        String sql="SELECT\n" +
                "       t.prescribe_time AS 'prescribeTime',\n" +
                "       t.prescribe_num AS 'prescribeNum',\n" +
@@ -1714,10 +1723,7 @@ 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 like '%"+prescribeNum+"%'";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(amount)){
            sql += " AND t.amount like '%"+amount+"%'";
            sql += " AND (t.prescribe_num like '%"+prescribeNum+"%' or t.amount like '%"+prescribeNum+"%')";
        }
        if(org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
            sql += " AND t.prescribe_time>='"+startTime+"'";
@@ -1729,7 +1735,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        return list;
    }
    public MixEnvelop getDeviceInfoExcel(String prescribeNum, String amount, String startTime, String endTime, String deviceId,int page,int size) {
    public MixEnvelop getDeviceInfoExcel(String prescribeNum, String startTime, String endTime, String deviceId,int page,int size) {
        String sql="SELECT\n" +
                "       t.prescribe_time AS 'prescribeTime',\n" +
                "       t.prescribe_num AS 'prescribeNum',\n" +
@@ -1740,10 +1746,7 @@ 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 like '%"+prescribeNum+"%'";
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(amount)){
            sql += " AND t.amount like '%"+amount+"%'";
            sql += " AND (t.prescribe_num like '%"+prescribeNum+"%' or t.amount like '%"+prescribeNum+"%')";
        }
        if(org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)){
            sql += " AND t.prescribe_time>='"+startTime+"'";