Merge branch 'medicare' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into medicare

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

@@ -34,13 +34,14 @@ public interface MediicineorderDao extends PagingAndSortingRepository<Mediicineo
    Mediicineorder findMediicineorderByPickUpNum(String pickUpNum);
    Mediicineorder findMediicineorderByPickUpNumAndSellState(String pickUpNum, String sellState);
    Mediicineorder findMediicineorderByPickUpNumAndSellStateAndBelongCommunity(String pickUpNum, String sellState, String belongCommunity);
    Mediicineorder findMediicineorderBySocialSecurityCardNum(String cardNum);
    List<Mediicineorder> findMediicineordersBySocialSecurityCardNum(String cardNum);
    List<Mediicineorder> findMediicineordersBySocialSecurityCardNumAndSellState(String cardNum, String sellState);
    List<Mediicineorder> findMediicineordersBySocialSecurityCardNumAndSellStateAndBelongCommunity(String cardNum, String sellState, String belongCommunity);
}

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

@@ -1342,11 +1342,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        //订单列表
        List<Mediicineorder> orders = new ArrayList<>();
        if (!StringUtils.isEmpty(pickUpNum)) {
            mediicineorder = orderDao.findMediicineorderByPickUpNumAndSellState(pickUpNum, "0");
            mediicineorder = orderDao.findMediicineorderByPickUpNumAndSellStateAndBelongCommunity(pickUpNum, "0",mediicinedevice.getBelongCommunity());
            orders.add(mediicineorder);
        }
        if (!StringUtils.isEmpty(cardNum)) {
            orders.addAll(orderDao.findMediicineordersBySocialSecurityCardNumAndSellState(cardNum, "0"));
            orders.addAll(orderDao.findMediicineordersBySocialSecurityCardNumAndSellStateAndBelongCommunity(cardNum, "0",mediicinedevice.getBelongCommunity()));
        }
        orders = orders.stream().distinct().collect(Collectors.toList());
        if (orders == null && orders.size() == 0) {

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

@@ -332,6 +332,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
            }
        }
        String sql="SELECT\n" +
                "    tmd.name as replenishEquName,\n" +
                "    t.id as id,\n" +
                "    t.address as address,\n" +
                "    t.community as community,\n" +
@@ -355,7 +356,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
                "    t.update_user_name as updateUserName,\n" +
                "    t.up_num as upNum\n" +
                "FROM\n" +
                "    t_mediicine_stockout AS t LEFT JOIN base_user bu ON t.replenish_er = bu.id  where 1=1";
                "    t_mediicine_stockout AS t LEFT JOIN base_user bu ON t.replenish_er = bu.id LEFT JOIN t_mediicine_device tmd on t.replenish_equ = tmd.id  where 1=1";
        if (org.apache.commons.lang.StringUtils.isNotBlank(startTime)&& org.apache.commons.lang.StringUtils.isNotBlank(endTime)){
//            conditionSql += "  AND  t.prescribe_time BETWEEN to_date('" + startTime +"','yyyy-mm-dd hh24:mi:ss') " +
//                    " AND to_date('" + endTime + "','yyyy-mm-dd hh24:mi:ss')";
@@ -379,7 +380,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_stockout t " +
                "     t_mediicine_stockout t LEFT JOIN base_user bu ON t.replenish_er = bu.id LEFT JOIN t_mediicine_device tmd on t.replenish_equ = tmd.id" +
                "  where " +
                "  1=1   " +
                conditionSql;

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

@@ -145,7 +145,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                inventory.setEquNum(deviceId);
                //1标识单列货道，21表示合并货道主货道，20表示合并货道的次货道
                inventory.setState("1");
                inventory.setNum("0");
                inventory.setNum("3");
                inventory.setMerge(String.valueOf(i1+1));
                inventory.setCargoCapacity(mediicinedevice.getCargoCapacity());
                //默认下架
@@ -655,7 +655,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    inventory.setPrice(null);
                    inventory.setSku(null);
                    inventory.setDrugSku(null);
                    inventory.setNum("0");
                    inventory.setNum("3");
                    inventory.setLongtime(null);
                    inventory.setOrgCode(null);
                    inventoryDao.save(inventory);