111

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -3192,7 +3192,7 @@ public class StatisticsService {
    /**
     * 获取照护老人+幼儿基本信息
     * 签约老人+未签约有设备的
     *
     * type=3街道老人（街道老人/需照护老人/已照护老人）
     */
    public JSONObject  findTendOld(Integer type,Integer page,Integer size,String idcard,String name,String orgName){
@@ -3271,7 +3271,9 @@ public class StatisticsService {
                        " WHERE p.archive_type = 2 and p.del = 1 "+nameSql+idcardSql+" <testUserSql>";
                break;
            case 3:
                sql =" SELECT p.id as id,p.name,CASE WHEN p.sex = 1 THEN '男' WHEN p.sex =2 THEN '女' END ,TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) as  age,p.idcard,p.mobile,p.address FROM base_patient p WHERE  p.del =1 AND p.register = 2"+nameSql+idcardSql;
                sql =" SELECT p.id as id,p.name,CASE WHEN p.sex = 1 THEN '男' WHEN p.sex =2 THEN '女' END sex,TIMESTAMPDIFF(YEAR, p.birthday, CURDATE()) as  age" +
                        ",p.idcard,p.mobile,p.address,CASE WHEN p.register = '1' THEN '需照护老人' WHEN p.register ='2' THEN '街道老人' WHEN p.register ='3' THEN '已照护老人' END register" +
                        " FROM base_patient p WHERE  p.del =1 AND p.register in ('1','2','3') "+nameSql+idcardSql;
        }
@@ -3326,7 +3328,7 @@ public class StatisticsService {
                sql += "  ORDER BY id ";
                break;
            case 3:
                sql =" SELECT count(DISTINCT p.id) as total FROM base_patient p WHERE  p.del =1 AND p.register = 2"+nameSql+idcardSql;
                sql =" SELECT count(DISTINCT p.id) as total FROM base_patient p WHERE  p.del =1 AND p.register in ('1','2','3') "+nameSql+idcardSql;
                sql += "  ORDER BY id ";
                break;
        }