代码修改

business/base-service/src/main/java/com/yihu/jw/wlyy/service/WlyyBusinessService.java

@@ -1098,4 +1098,13 @@ public class WlyyBusinessService {
        JSONObject re = wlyyHttpService.sendWlyyMesGet("calendarPlanDetailBypatient_IJK", param);
        return re;
    }
    /**
     * 门诊病例
     */
    public JSONObject getOutpatientRecords_IJK(String planId, String idcard, String eventNo, String findType) {
        String param = "?planId=" + nullToTransfor(planId) + "&idcard=" + nullToTransfor(idcard) + "&eventNo=" + nullToTransfor(eventNo)+ "&findType=" + nullToTransfor(findType);
        JSONObject re = wlyyHttpService.sendWlyyMesGet("getOutpatientRecords_IJK", param);
        return re;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/specialist/BaseDiseaseHospitalController.java

@@ -541,6 +541,26 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
    }
    /**
     * 获取门诊病例数据
     */
    @RequestMapping(value = "getOutpatientRecords_IJK", method = RequestMethod.GET)
    @ApiOperation(value = "获取门诊病例数据")
    public Envelop getOutpatientRecords_IJK(
            @ApiParam(name = "planId", value = "康复计划id", required = false) @RequestParam(value = "planId", required = false) String planId,
            @ApiParam(name = "idcard", value = "身份证", required = false) @RequestParam(value = "idcard", required = false) String idcard,
            @ApiParam(name = "eventNo", value = "就诊号", required = false) @RequestParam(value = "eventNo", required = false) String eventNo,
            @ApiParam(name = "findType", value = "查1条传1 ,查全部传2", required = false) @RequestParam(value = "findType", required = false) String findType
    ) {
        try {
            JSONObject result = wlyyBusinessService.getOutpatientRecords_IJK(planId,idcard,eventNo,findType);
            return success(result);
        } catch (Exception e) {
            return failedException(e);
        }
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeCategoryService.java

@@ -91,7 +91,7 @@ public class KnowledgeCategoryService extends BaseJpaService<KnowledgeCategoryDO
    }
    public MixEnvelop findCategoryByIdOrName(String id, String name) {
        String sql = " select b.* from wlyy_knowledge_category a INNER JOIN wlyy_knowledge_category b ON a.id=b.pid where 1=1 and a.del='1'  ";
        String sql = " select b.* from wlyy_knowledge_category a INNER JOIN wlyy_knowledge_category b ON a.id=b.pid where 1=1 and a.del='1'  and b.del='1'  ";
        if (StringUtils.isNotBlank(id)) {
            sql += " and a.id='" + id + "'";
        }