diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java index 6ab392ac..46be17e6 100644 --- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java +++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/StatisticVo.java @@ -117,12 +117,16 @@ public class StatisticVo { private String hospitalization; @ApiModelProperty("任务") private String task; + @ApiModelProperty("研究编号") + private String code; } @Data @ApiModel("患者进度返回参数") public static class PatientProgressVo{ @ApiModelProperty("患者住院号") private String hospitalization; + @ApiModelProperty("研究编号") + private String code; @ApiModelProperty("患者id") private Long id; @ApiModelProperty("采集时间") diff --git a/tcm/src/main/resources/mapper_dao/PatientDao.xml b/tcm/src/main/resources/mapper_dao/PatientDao.xml index ad9d3bc5..7797c2f6 100644 --- a/tcm/src/main/resources/mapper_dao/PatientDao.xml +++ b/tcm/src/main/resources/mapper_dao/PatientDao.xml @@ -471,28 +471,28 @@ tpr.id, ( CASE - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 11 AND DATEDIFF( now( ), tpr.contents ) <= 17 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 9 AND DATEDIFF( now( ), tpr.contents ) <= 19 ) THEN DATE_FORMAT( FROM_UNIXTIME( UNIX_TIMESTAMP( tpr.contents ) + 14 * 24 * 60 * 60 ), '%Y-%m-%d' ) - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 87 AND DATEDIFF( now( ), tpr.contents ) <= 93 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 85 AND DATEDIFF( now( ), tpr.contents ) <= 95 ) THEN DATE_FORMAT( FROM_UNIXTIME( UNIX_TIMESTAMP( tpr.contents ) + 90 * 24 * 60 * 60 ), '%Y-%m-%d' ) - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 177 AND DATEDIFF( now( ), tpr.contents ) <= 183 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 175 AND DATEDIFF( now( ), tpr.contents ) <= 185 ) THEN DATE_FORMAT( FROM_UNIXTIME( UNIX_TIMESTAMP( tpr.contents ) + 180 * 24 * 60 * 60 ), '%Y-%m-%d' ) - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 362 AND DATEDIFF( now( ), tpr.contents ) <= 368 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 360 AND DATEDIFF( now( ), tpr.contents ) <= 370 ) THEN DATE_FORMAT( FROM_UNIXTIME( UNIX_TIMESTAMP( tpr.contents ) + 365 * 24 * 60 * 60 ), '%Y-%m-%d' ) - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 0 AND DATEDIFF( now( ), tpr.contents ) <= 3 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 0 AND DATEDIFF( now( ), tpr.contents ) <= 5 ) THEN DATE_FORMAT( FROM_UNIXTIME( UNIX_TIMESTAMP( tpr.contents ) + 1 * 24 * 60 * 60 ), '%Y-%m-%d' ) END - ) as shijian,tpi.hospitalization,( + ) as shijian,tpi.hospitalization, tpi.code, ( CASE - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 11 AND DATEDIFF( now( ), tpr.contents ) <= 17 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 9 AND DATEDIFF( now( ), tpr.contents ) <= 19 ) THEN '14天数据搜集' - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 87 AND DATEDIFF( now( ), tpr.contents ) <= 93 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 85 AND DATEDIFF( now( ), tpr.contents ) <= 95 ) THEN '90天数据搜集' - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 177 AND DATEDIFF( now( ), tpr.contents ) <= 183 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 175 AND DATEDIFF( now( ), tpr.contents ) <= 185 ) THEN '180天随访' - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 362 AND DATEDIFF( now( ), tpr.contents ) <= 368 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 360 AND DATEDIFF( now( ), tpr.contents ) <= 370 ) THEN '360天随访' - WHEN ( DATEDIFF( now( ), tpr.contents ) >= 0 AND DATEDIFF( now( ), tpr.contents ) <= 3 ) THEN + WHEN ( DATEDIFF( now( ), tpr.contents ) >= 0 AND DATEDIFF( now( ), tpr.contents ) <= 5 ) THEN '第一次数据收集' END ) as task from t_patient_record tpr @@ -500,17 +500,18 @@ where tpr.rec_status=0 and tpr.test_questions_id=#{param.testQuestionsId} and ( - ( DATEDIFF( now( ), tpr.contents ) >= 11 AND DATEDIFF( now( ), tpr.contents ) <= 17 ) - OR ( DATEDIFF( now( ), tpr.contents ) >= 87 AND DATEDIFF( now( ), tpr.contents ) <= 93 ) - OR ( DATEDIFF( now( ), tpr.contents ) >= 177 AND DATEDIFF( now( ), tpr.contents ) <= 183 ) - OR ( DATEDIFF( now( ), tpr.contents ) >= 362 AND DATEDIFF( now( ), tpr.contents ) <= 368 ) - OR ( DATEDIFF( now( ), tpr.contents ) >= 0 AND DATEDIFF( now( ), tpr.contents ) <= 3 ) + ( DATEDIFF( now( ), tpr.contents ) >= 9 AND DATEDIFF( now( ), tpr.contents ) <= 19 ) + OR ( DATEDIFF( now( ), tpr.contents ) >= 85 AND DATEDIFF( now( ), tpr.contents ) <= 95 ) + OR ( DATEDIFF( now( ), tpr.contents ) >= 175 AND DATEDIFF( now( ), tpr.contents ) <= 185 ) + OR ( DATEDIFF( now( ), tpr.contents ) >= 360 AND DATEDIFF( now( ), tpr.contents ) <= 370 ) + OR ( DATEDIFF( now( ), tpr.contents ) >= 0 AND DATEDIFF( now( ), tpr.contents ) <= 5 ) ) and tpr.user_id=#{userId} + @@ -519,6 +520,7 @@ SELECT tpi.id, tpi.hospitalization, + tpi.code, tpr.collect_time collectTime FROM t_patient_record tpr