代码修改

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicineorder.java

@@ -242,7 +242,7 @@ public class Mediicineorder extends UuidIdentityEntityWithOperator implements Se
    private String applyNo;
    /**
     * 审方状态-1不通过0未审1审核通过
     * 审方状态-2取消审方不做审方操作，-1不通过，0未审，1审核通过
     */
    private Integer reviewerState;

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

@@ -112,8 +112,10 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = orderservice.queryOrderListFullInfo(content,orderNum, equNum, contact, startTime, endTime, sellState, orderState,reviewerState, dispensingWindow, community, town,userId,page,size,wechatId);
            @RequestParam(value = "size") int size,
            @ApiParam(name = "timeSort", value = "时间排序,1升序，-1倒序", required = false)
            @RequestParam(value = "timeSort",required = false) String timeSort) throws Exception {
        JSONObject result = orderservice.queryOrderListFullInfo(content,orderNum, equNum, contact, startTime, endTime, sellState, orderState,reviewerState, dispensingWindow, community, town,userId,page,size,wechatId,timeSort);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }
@@ -121,7 +123,7 @@ public class MedicineOrderEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "审方处方订单")
    public Envelop reviewerOrder(@ApiParam(name = "orderId",value = "处方订单id",required = true)
                                 @RequestParam(value = "orderId",required = true)String orderId,
                                 @ApiParam(name = "reviewerState",value = "审方状态-1不通过1审核通过",required = true)
                                 @ApiParam(name = "reviewerState",value = "审方状态-2取消审方，-1不通过，1审核通过",required = true)
                                 @RequestParam(value = "reviewerState",required = true)Integer reviewerState,
                                 @ApiParam(name = "reviewerContent",value = "审核描述内容",required = false)
                                 @RequestParam(value = "reviewerContent",required = false)String reviewerContent){

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

@@ -222,7 +222,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    public JSONObject queryOrderListFullInfo(String content,String orderNum, String equNum, String contact,
                                             String startTime, String endTime, String sellState,
                                             String orderState,String reviewerState, String dispensingWindow, String community,String town,
                                             String userId, int page, int size, String wechatId) throws Exception {
                                             String userId, int page, int size, String wechatId,String timeSort) throws Exception {
        JSONObject result = new JSONObject();
@@ -349,7 +349,8 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
            conditionSql += " and '," + belongCommunitys + ",' LIKE CONCAT('%,',t.belong_community,',%')\n";
        }
        if (!StringUtils.isEmpty(content)) {
            conditionSql += " and CONCAT(IFNULL(t.`prescribe_num`,''),IFNULL(t.`contact`,''),IFNULL(t.`shipping_equ`,'')) like '%" + content + "%'";
            conditionSql += " and CONCAT(IFNULL(t.`prescribe_num`,''),IFNULL(t.`contact`,''),IFNULL(t.`shipping_equ`,'')," +
                    " IFNULL(t.`community`,'')) like '%" + content + "%'";
        }
        if (!StringUtils.isEmpty(community)) {
            conditionSql += " and t.belong_community = '" + community + "'";
@@ -382,7 +383,15 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
        if (!StringUtils.isEmpty(dispensingWindow)) {
            conditionSql += " and t.dispensing_window = '" + dispensingWindow + "'";
        }
        sencodSql = sencodSql + conditionSql + " order by  t.sell_state asc,t.prescribe_time desc ";
        if (org.apache.commons.lang3.StringUtils.isNotBlank(timeSort)){
            if ("1".equals(timeSort)){
                sencodSql = sencodSql + conditionSql + " order by  t.prescribe_time asc ";
            }else {
                sencodSql = sencodSql + conditionSql + " order by  prescribe_time desc ";
            }
        }else {
            sencodSql = sencodSql + conditionSql + " order by  t.sell_state asc,t.prescribe_time desc ";
        }
        orderList = hibenateUtils.createSQLQuery(sencodSql, page, size);