资金对接修改

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

@@ -29,7 +29,11 @@ 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/service/a3service/MedicineOrderService.java

@@ -32,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;
@@ -1584,8 +1585,11 @@ 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);
            }
@@ -1611,12 +1615,12 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    "                t.shipping_equ AS equNum\n" +
                    "                FROM t_mediicine_order  t WHERE t.sell_state = 1 ";
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(belongCommunity)){
                oneSql += "AND t.belong_community ='"+belongCommunity+"'";
                oneSql += "AND t.belong_community like'%"+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 + "'";
                    oneSql += "AND t.shipping_equ like '%" + equNum + "%'";
                    Mediicinedevice device=deviceDao.findByBelongCommunityAndEquNum(belongCommunity,equNum);
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
@@ -1626,7 +1630,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
//                    Mediicinedevice device=deviceDao.findByBelongCommunity(belongCommunity);
//                    map.put("community",device.getCommunity());
                }else {
                    oneSql += "AND t.shipping_equ = '" + equNum + "'";
                    oneSql += "AND t.shipping_equ like '%" + equNum + "%'";
                    Mediicinedevice device=deviceDao.findMediicinedeviceByEquNum(equNum);
                    map.put("community",device.getCommunity());
                    map.put("equName",device.getEquNum()+(device.getEquName()==null?"":"/"+device.getEquName()));
@@ -1649,8 +1653,11 @@ 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);
        MixEnvelop mixEnvelop = MixEnvelop.getSuccessListWithPage2(BaseHospitalRequestMapping.Prescription.api_success,mapList);
@@ -1707,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+"'";
@@ -1733,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+"'";
@@ -1786,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;
    }
}