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

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

@@ -61,14 +61,20 @@ public class PatientArchiveInfoService {
                " a.archive_time archiveTime, " +
                " c.name AS zoneName, " +
                " c.code AS zoneCode, " +
                " c.jw_code AS jwZoneCode " +
                " c.jw_code AS jwZoneCode, " +
                " f.idcard"+
                " FROM " +
                " wlyy_archive a " +
                " LEFT JOIN dm_country c ON a.jw_zone_code = c.jw_code " +
                " LEFT JOIN wlyy_sign_family f ON a.identity_card_no = f.idcard"+
                " WHERE " +
                " a.doctor_code ='"+doctorCode+"'";
        if (StringUtils.isNotBlank(signStatus)){
            sql += " AND a.sign_status = "+signStatus;
            if ("1".equals(signStatus)){
                sql += " AND f.idcard IS NOT NULL";
            }else {
                sql += " AND f.idcard IS NULL";
            }
        }
        if (StringUtils.isNotBlank(startTime) && StringUtils.isNotBlank(endTime)){
            startTime += " 00:00:00";
@@ -84,9 +90,9 @@ public class PatientArchiveInfoService {
        }
        int start = (pageNo-1)*pageSize;
        sql += " ORDER BY a.archive_time DESC limit ?,?";
        archiveInfoList = jdbcTemplate.queryForList(sql,new Object[]{start,pageSize});
        archiveInfoList = jdbcTemplate.queryForList(sql ,new Object[]{start,pageSize});
        for (Map<String,Object> map : archiveInfoList){
            if (signFamilyDao.hasSingStatus(String.valueOf(map.get("identityCardNo")))>0){
            if (map.get("idcard")!=null){
                map.put("signStatus",1);
            }else{
                map.put("signStatus",0);