Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/physicalExamination/PhysicalExaminationRemindService.java

@@ -167,9 +167,7 @@ public class PhysicalExaminationRemindService extends BaseService {
        sql = "SELECT " +
                "    DISTINCT t1.* " +
                " FROM " +
                "    wlyy_sign_family t1 " +
                "  LEFT JOIN wlyy_patient p on p.code = t1.patient  "+
                "  LEFT JOIN wlyy_sign_patient_label_info t2 on t2.patient = t1.patient "+
                "    wlyy_sign_family t1 "+
                " WHERE " +
                "     t1.status > 0 " +
                "    AND t1.admin_team_code = ? " +
@@ -181,7 +179,7 @@ public class PhysicalExaminationRemindService extends BaseService {
                "                wlyy_old_people_physical_examination o" +
                "           WHERE s.admin_team_code=? and s.`status`>0 and s.idcard = o.id_card " +
                "                 and o.medical_time>?)" +
                " order by p.standard_status DESC ,p.disease_condition DESC,t2.label DESC,t1.openid DESC";
                " order by t1.openid DESC";
        args = new Object[]{teamCode,doctor,doctor, teamCode, DateUtil.getLastYear()};

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -315,7 +315,7 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
        }
    }
    
    @RequestMapping(value = "fetchPatientArticlePushedList", method = RequestMethod.GET)
    @RequestMapping(value = "fetchPatientArticlePushedList", method = RequestMethod.POST)
    @ApiOperation("获取居民被团队下的医生推送的文章列表 ")
    public String pushArticleLogs(
            @ApiParam(name = "patientCode", value = "居民CODE", required = true) @RequestParam(value = "patientCode", required = true) String patientCode,