Merge branch 'medicare' of liubing/wlyy2.0 into medicare

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -149,6 +149,7 @@ public class BaseRequestMapping {
        public static final String CREATE  = "/create";
        public static final String getOrderDetailListById  = "/getOrderDetailListById";
        public static final String getOrderDetailById  = "/getOrderDetailById";
        public static final String updateOrderToWaitOut= "/updateOrderToWaitOut";
        public static final String checkOrder  = "/checkOrder";
        public static final String checkOrderComplete  = "/checkOrderComplete";
        public static final String checkOrderAndReturn  = "/checkOrderAndReturn";//弃用

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

@@ -245,6 +245,17 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
        return success(baseDoctors.getJSONObject("msg"));
    }
    @PostMapping(value = BaseRequestMapping.BaseOrder.updateOrderToWaitOut)
    @ApiOperation(value = "订单更新为待取药" , notes="订单更新为待取药")
    public Envelop updateOrderToWaitOut(
            @ApiParam(name = "orderId", value = "订单号", required = true)
            @RequestParam String orderId){
        JSONObject result = orderservice.updateOrderToWaitOut(orderId,getUID());
        if (result.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(result.getString("msg"));
        }
        return success(result.getString("msg"));
    }

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

@@ -421,6 +421,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                    if ("-2".equals(stringObjectMap.get("sellState").toString())) {
                        stringObjectMap.put("sellStateName", "药房已作废");
                    }
                    if ("-5".equals(stringObjectMap.get("sellState").toString())) {
                        stringObjectMap.put("sellStateName", "出药异常");
                    }
                }
            }
        }
@@ -489,6 +492,9 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            case "-2":
                sellStateName = "药房已作废";
                break;
            case "-5":
                sellStateName = "出药异常";
                break;
        }
        jsonObject.put("sellStateName", sellStateName);
        jsonObject.put("socialSecurityCardNum", mediicineorder.getSocialSecurityCardNum());
@@ -508,6 +514,35 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        return result;
    }
    public JSONObject updateOrderToWaitOut(String orderId,String userId){
        JSONObject result = new JSONObject();
        String sql = " select count(id) from wlyy_hospital_sys_dict where dict_name='updateOrderToWaitOut' " +
                " and dict_code='updateOrderToWaitOut' " +
                " and dict_value='"+userId+"' ";
        Integer total = jdbcTemplate.queryForObject(sql,Integer.class);
        if (total==0){
            result.put("msg", "当前操作无权限");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        if (StringUtils.isEmpty(orderId)) {
            result.put("msg", "orderId is empty");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        Mediicineorder mediicineorder = orderDao.findOne(orderId);
        if (mediicineorder == null) {
            result.put("msg", "无相关订单信息，请重新确认信息！");
            result.put("response", ConstantUtils.FAIL);
            return result;
        }
        mediicineorder.setSellState("0");
        orderDao.save(mediicineorder);
        result.put("msg", "操作成功");
        result.put("response", ConstantUtils.SUCCESS);
        return result;
    }
    /**
     * 获取时间范围内的订单销售额
     *