健康文库相关接口修改，管理端长处方报表问题修改

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_list.jsp

@@ -36,11 +36,6 @@
                <div class="m-form-control f-ml15">
                    <input type="text" id="inp_end_date" placeholder="结束日期" class="f-ml10" data-attr-scan="endDate"/>
                </div>
            </div>
        </div>
        <div class="m-form-group f-mt10">
            <div class="m-form-group f-mt10">
                <div class="m-form-control f-ml15">
                    <input type="text" id="inp_disease" placeholder="请选择病种" class="f-ml10" data-attr-scan="disease"/>
                </div>
@@ -58,6 +53,12 @@
                </div>
            </div>
        </div>
        <div class="m-form-group f-mt10">
            <div class="m-form-group f-mt10">
            </div>
        </div>
    </div>
    <!-- 列表 -->
    <div id="div_prescription_list">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_list_js.jsp

@@ -138,10 +138,6 @@
                        valueField: 'statusId',
                    });
                    //查询
                    me.$btnSearch.on('click',function () {
                        me.reloadGrid(me);
                    });
                },
                //初始化市区下拉框

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/HealthEduArticlePatientService.java

@@ -96,7 +96,7 @@ public class HealthEduArticlePatientService extends BaseService {
     * @param pagesize 分页大小
     * @return
     */
    public List<HealthEduArticlePatient> findByPatient(String patient,int wheaType, long id, int pagesize) {
    public List<HealthEduArticlePatient> findByPatient(String patient,int wheaType, int pageIndex, int pagesize) {
        if (pagesize <= 0) {
            pagesize = 10;
        }
@@ -120,17 +120,11 @@ public class HealthEduArticlePatientService extends BaseService {
                "      a.article = b.code" +
                " and ( a.send_type =1 or a.send_type is null or a.send_type = '') "+  //添加类型判断是集美的推送还是三师原来的推送
                " and a.patient = ?" +
                (id > 0 ? " and a.id < ? " : "") +
                (wheaType > 0 ? " and a.wheaType = ? " : "") +
                " order by a.id desc limit 0," + pagesize;
                " order by a.id desc limit "+pageIndex+"," + pagesize;
        Object params[] = null;
        if(wheaType>-1&&id>0){
            params = new Object[]{patient,id,wheaType};
        }else if(wheaType>-1&&id<0){
        if(wheaType>-1){
            params = new Object[]{patient,wheaType};
        }
        else if(wheaType<0&&id>0){
            params = new Object[]{patient,id};
        }else{
            params = new Object[]{patient};
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -64,11 +64,11 @@ public class HealthEduArticleController extends BaseController {
    @RequestMapping(value = "list")
    @ResponseBody
    @ApiOperation("查询文章列表")
    public String list(@RequestParam("id") long id, @RequestParam("pagesize") int pagesize, @RequestParam(required = true, value = "wheaType") int wheaType) {
    public String list(@RequestParam("page") int pageIndex, @RequestParam("pagesize") int pagesize, @RequestParam(required = true, value = "wheaType") int wheaType) {
        try {
//            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getUID(), wheaType, id, pagesize);
//            增加判断是当前居民还是被代理人的文章列表
            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getRepUID(), wheaType, id, pagesize);
            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getRepUID(), wheaType, pageIndex, pagesize);
            JSONArray jsonArray = new JSONArray();
            Map<String, Doctor> docMap = new HashMap<>();
            if (list != null) {