Merge branch 'dev' of huangzhanpeng/wlyy_management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/archives/PatientRecordService.java

@@ -59,7 +59,7 @@ public class PatientRecordService {
    /**
     * 获取门/急诊记录 + 住院记录
     */
    public List<Map<String,String>> getAllEvent(String patientCode, String type, String page, String pageSize) throws Exception
    public List<Map<String,String>> getAllEvent(String patientCode, String type, String page, String pageSize,String lastTime) throws Exception
    {
        List<Map<String,String>> re = new ArrayList<>();
@@ -103,6 +103,7 @@ public class PatientRecordService {
            //过滤
            for(PatientEvent item:eventList)
            {
                String  eventDate = DateUtil.dateToStrLong(item.getEventDate());
                int maxCompare = eventDate.compareTo(max);
                int minCompare = eventDate.compareTo(min);
@@ -118,10 +119,14 @@ public class PatientRecordService {
                    contain = true;
                }
                //最后一页特殊处理*********
                if(!"1".equals(page) && minCompare<0 &&array.length()==0)
                //最后一页特殊处理
                if(!"1".equals(page) && (array.length()==0||"[{}]".equals(response)) && !StringUtils.isEmpty(lastTime))
                {
                    contain = true;
                    int lastTimeCompare = eventDate.compareTo(lastTime);
                    if(lastTimeCompare<0)
                    {
                        contain = true;
                    }
                }
                if(contain) {

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/archives/PatientArchivesController.java

@@ -41,9 +41,11 @@ public class PatientArchivesController extends BaseController {
                              @ApiParam(name="page",value="第几页",defaultValue = "1")
                              @RequestParam(value="page",required = true) String page,
                              @ApiParam(name="pageSize",value="每页几行",defaultValue = "10")
                              @RequestParam(value="pageSize",required = true) String pageSize) {
                              @RequestParam(value="pageSize",required = true) String pageSize,
                              @ApiParam(name="lastTime",value="最后一条时间",defaultValue = "2010-10-10 00:00:00")
                              @RequestParam(value="lastTime",required = false) String lastTime) {
        try {
            List<Map<String,String>> result = patientRecordService.getAllEvent(getUID(),type,page,pageSize);
            List<Map<String,String>> result = patientRecordService.getAllEvent(getUID(),type,page,pageSize,lastTime);
            return write(200, "获取就诊记录成功！", "data", result);
        } catch (Exception e) {