[医保代码]

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1946,7 +1946,7 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        }
    }
    public MixEnvelop findYktCardCharge(String startTime, String endTime, String orderNo, String yktOrderNo, String patientName
                                                    , String idCard, String medicard , Integer status, Integer page, Integer pageSize){
                                                    , String idCard, String medicard,Integer status, Integer page, Integer pageSize,String orderType,String orderCategory){
        String sql = " select t.id as \"id\"," +
                " t.patient as \"patient\","+
                " t.patient_name as \"patientName\","+
@@ -1965,9 +1965,11 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
                " t.yk_order_no as \"ykOrderNo\","+
                " t.yk_order_id as \"ykOrderId\","+
                " b.idcard as \"idcard\", "+
                " b.mobile as \"mobile\" "+
                " b.mobile as \"mobile\", "+
                " t.order_type as \"orderType\", "+
                " case t.order_category when '2' then '2' when '3' then '2' else t.order_category end  as \"orderCategory\" "+
                " from base_business_order_pay t" +
                " left join base_patient b on t.patient = b.id  where 1=1 and t.relation_name = '就诊卡充值' ";
                " left join base_patient b on t.patient = b.id  where 1=1  ";
        if (StringUtils.isNoneBlank(startTime)){
            if("xm_ykyy_wx".equals(wechatId)){
                if (flag){
@@ -2008,6 +2010,18 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
        if (status!=null){
            sql+=" and t.status ="+status+"";
        }
        if (StringUtils.isNoneBlank(orderType)){
            sql+=" and t.order_type ="+orderType+"";
        }
        if (StringUtils.isNoneBlank(orderCategory)){
            if (orderCategory.equalsIgnoreCase("2")){
                sql+=" and t.order_category IN ('2','3') ";
            }
            sql+=" and t.order_category = '"+orderCategory+"'  ";
        }
        sql+=" order by t.create_time desc ";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql,page,pageSize);
        /*for (Map<String,Object> map:list){

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -2053,29 +2053,33 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.Prescription.findYkCardCharge)
    @ApiOperation(value = "查询眼科通充值记录", notes = "")
    public MixEnvelop findYkCardCharge(@ApiParam(name = "startTime", value = "")
    public MixEnvelop findYkCardCharge(@ApiParam(name = "startTime", value = "开始时间")
                             @RequestParam(value = "startTime", required = false)String startTime,
                             @ApiParam(name = "endTime", value = "")
                             @ApiParam(name = "endTime", value = "结束时间")
                             @RequestParam(value = "endTime", required = false)String endTime,
                             @ApiParam(name = "orderNo", value = "")
                             @ApiParam(name = "orderNo", value = "订单号")
                             @RequestParam(value = "orderNo", required = false)String orderNo,
                             @ApiParam(name = "yktOrderNo", value = "")
                             @ApiParam(name = "yktOrderNo", value = "眼科订单号")
                             @RequestParam(value = "yktOrderNo", required = false)String yktOrderNo,
                             @ApiParam(name = "patientName", value = "")
                             @ApiParam(name = "patientName", value = "患者姓名")
                             @RequestParam(value = "patientName", required = false)String patientName,
                             @ApiParam(name = "idCard", value = "")
                             @ApiParam(name = "idCard", value = "身份证")
                             @RequestParam(value = "idCard", required = false)String idCard,
                                       @ApiParam(name = "medicard", value = "")
                                           @RequestParam(value = "medicard", required = false)String medicard,
                                       @ApiParam(name = "status", value = "")
                                           @RequestParam(value = "status", required = false)Integer status,
                                       @ApiParam(name = "page", value = "")
                                           @RequestParam(value = "page", required = false)Integer page,
                                       @ApiParam(name = "pageSize", value = "")
                                           @RequestParam(value = "pageSize", required = false)Integer pageSize) {
        try {
            return businessOrderService.findYktCardCharge(startTime,endTime,orderNo,yktOrderNo,patientName,idCard,medicard,status,page,pageSize);
                             @ApiParam(name = "medicard", value = "就诊卡")
                             @RequestParam(value = "medicard", required = false)String medicard,
                             @ApiParam(name = "status", value = "状态（0:未支付|1：已支付| 9退款完成）")
                             @RequestParam(value = "status", required = false)Integer status,
                             @ApiParam(name = "page", value = "页数")
                             @RequestParam(value = "page", required = false)Integer page,
                             @ApiParam(name = "pageSize", value = "页吗")
                             @RequestParam(value = "pageSize", required = false)Integer pageSize,
                             @ApiParam(name = "orderType", value = "咨询方式(1、图文、3、视频)")
                             @RequestParam(value = "orderType", required = false)String orderType,
                             @ApiParam(name = "orderCategory", value = "业务列表(1，专家咨询，2、复诊，4处方、5、就诊卡充值)")
                             @RequestParam(value = "orderCategory", required = false)String orderCategory) {
        try {
            return businessOrderService.findYktCardCharge(startTime,endTime,orderNo,yktOrderNo,patientName,idCard,medicard,status,page,pageSize, orderType, orderCategory);
        }catch (Exception e) {
            return failedMixEnvelopException(e);
        }