fix: token有效期修改为，90天。

intc-common/intc-common-core/src/main/java/com/intc/common/core/constant/CacheConstants.java

@@ -8,14 +8,14 @@ package com.intc.common.core.constant;
 public class CacheConstants
 {
     /**
-     * 缓存有效期，默认720（分钟）
+     * 缓存有效期，默认129600（分钟，90天）
      */
-    public final static long EXPIRATION = 720;
+    public final static long EXPIRATION = 129600;
 
     /**
-     * 缓存刷新时间，默认120（分钟）
+     * 缓存刷新时间，默认10080（分钟，7天）
      */
-    public final static long REFRESH_TIME = 120;
+    public final static long REFRESH_TIME = 10080;
 
     /**
      * 密码最大错误次数

intc-common/intc-common-message/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>com.intc</groupId>
+        <artifactId>intc-common</artifactId>
+        <version>3.6.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>intc-common-message</artifactId>
+
+    <description>
+        intc-common-message 消息通知服务（短信、语音等）
+    </description>
+
+    <dependencies>
+        <!-- 阿里云短信 SDK -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>2.0.24</version>
+        </dependency>
+
+        <!-- 阿里云语音 SDK -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dyvmsapi20170525</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+
+        <!-- 阿里云核心 SDK -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-openapi</artifactId>
+            <version>0.3.4</version>
+        </dependency>
+
+        <!-- Spring Boot Starter -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- Fastjson -->
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+        </dependency>
+
+        <!-- intc-common-core -->
+        <dependency>
+            <groupId>com.intc</groupId>
+            <artifactId>intc-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

intc-common/intc-common-message/src/main/java/com/intc/common/message/config/AliyunMessageProperties.java

@@ -0,0 +1,77 @@
+package com.intc.common.message.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 阿里云消息服务配置
+ *
+ * @author bot5
+ * @date 2026-03-29
+ */
+@Data
+@ConfigurationProperties(prefix = "aliyun.message")
+public class AliyunMessageProperties {
+
+    /**
+     * 阿里云 AccessKey ID
+     */
+    private String accessKeyId;
+
+    /**
+     * 阿里云 AccessKey Secret
+     */
+    private String accessKeySecret;
+
+    /**
+     * 短信服务配置
+     */
+    private SmsConfig sms = new SmsConfig();
+
+    /**
+     * 语音服务配置
+     */
+    private VoiceConfig voice = new VoiceConfig();
+
+    @Data
+    public static class SmsConfig {
+        /**
+         * 短信签名名称
+         */
+        private String signName;
+
+        /**
+         * 短信模板CODE（用药提醒）
+         */
+        private String medicationRemindTemplateCode;
+
+        /**
+         * 短信模板CODE（漏服提醒）
+         */
+        private String missedRemindTemplateCode;
+
+        /**
+         * 短信模板CODE（家属通知）
+         */
+        private String familyNotifyTemplateCode;
+    }
+
+    @Data
+    public static class VoiceConfig {
+        /**
+         * 语音通知模板CODE（用药提醒）
+         */
+        private String medicationRemindTtsCode;
+
+        /**
+         * 语音通知模板CODE（漏服提醒）
+         */
+        private String missedRemindTtsCode;
+
+        /**
+         * 被叫号码显示的呼入号码
+         */
+        private String calledShowNumber;
+    }
+}

intc-common/intc-common-security/src/main/java/com/intc/common/security/auth/AuthLogic.java

@@ -94,7 +94,7 @@ public class AuthLogic
     }
 
     /**
-     * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存
+     * 验证当前用户有效期, 如果相差不足配置的刷新时间，自动刷新缓存
      * 
      * @param loginUser 当前用户信息
      */

intc-common/intc-common-security/src/main/java/com/intc/common/security/service/TokenService.java

@@ -36,7 +36,7 @@ public class TokenService
 
     private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;
 
-    private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;
+    private final static Long MILLIS_REFRESH_TIME = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;
 
     /**
      * 创建令牌
@@ -134,7 +134,7 @@ public class TokenService
     }
 
     /**
-     * 验证令牌有效期，相差不足120分钟，自动刷新缓存
+     * 验证令牌有效期，相差不足配置的刷新时间，自动刷新缓存
      *
      * @param loginUser
      */
@@ -142,7 +142,7 @@ public class TokenService
     {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
+        if (expireTime - currentTime <= MILLIS_REFRESH_TIME)
         {
             refreshToken(loginUser);
         }

intc-modules/intc-health/src/main/java/com/intc/health/controller/ChronicDiseaseManageController.java

@@ -0,0 +1,116 @@
+package com.intc.health.controller;
+
+import com.intc.common.core.web.controller.BaseController;
+import com.intc.common.core.web.domain.AjaxResult;
+import com.intc.common.core.web.page.TableDataInfo;
+import com.intc.common.log.annotation.Log;
+import com.intc.common.log.enums.BusinessType;
+import com.intc.common.security.annotation.RequiresPermissions;
+import com.intc.health.domain.ChronicDiseaseFollowUpRecord;
+import com.intc.health.domain.ChronicDiseaseIndicatorRecord;
+import com.intc.health.domain.ChronicDiseaseStatusHistory;
+import com.intc.health.service.IChronicDiseaseManageService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Api(tags = "慢性疾病管理扩展")
+@RestController
+@RequestMapping("/chronicDiseaseManage")
+public class ChronicDiseaseManageController extends BaseController {
+    @Resource
+    private IChronicDiseaseManageService chronicDiseaseManageService;
+
+    @ApiOperation("查询慢病指标记录")
+    @RequiresPermissions("health:chronicDisease:list")
+    @GetMapping("/indicator/list")
+    public TableDataInfo indicatorList(ChronicDiseaseIndicatorRecord query) {
+        startPage();
+        List<ChronicDiseaseIndicatorRecord> list = chronicDiseaseManageService.selectIndicatorList(query);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("查询慢病指标详情")
+    @RequiresPermissions("health:chronicDisease:query")
+    @GetMapping("/indicator/{id}")
+    public AjaxResult indicatorInfo(@PathVariable Long id) {
+        return success(chronicDiseaseManageService.selectIndicatorById(id));
+    }
+
+    @ApiOperation("新增慢病指标记录")
+    @RequiresPermissions("health:chronicDisease:add")
+    @Log(title = "慢性疾病指标记录", businessType = BusinessType.INSERT)
+    @PostMapping("/indicator")
+    public AjaxResult indicatorAdd(@RequestBody ChronicDiseaseIndicatorRecord record) {
+        return toAjax(chronicDiseaseManageService.insertIndicator(record));
+    }
+
+    @ApiOperation("修改慢病指标记录")
+    @RequiresPermissions("health:chronicDisease:edit")
+    @Log(title = "慢性疾病指标记录", businessType = BusinessType.UPDATE)
+    @PutMapping("/indicator")
+    public AjaxResult indicatorEdit(@RequestBody ChronicDiseaseIndicatorRecord record) {
+        return toAjax(chronicDiseaseManageService.updateIndicator(record));
+    }
+
+    @ApiOperation("删除慢病指标记录")
+    @RequiresPermissions("health:chronicDisease:remove")
+    @Log(title = "慢性疾病指标记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/indicator/{ids}")
+    public AjaxResult indicatorRemove(@PathVariable Long[] ids) {
+        return toAjax(chronicDiseaseManageService.deleteIndicatorByIds(ids));
+    }
+
+    @ApiOperation("查询复诊随访记录")
+    @RequiresPermissions("health:chronicDisease:list")
+    @GetMapping("/followUp/list")
+    public TableDataInfo followUpList(ChronicDiseaseFollowUpRecord query) {
+        startPage();
+        List<ChronicDiseaseFollowUpRecord> list = chronicDiseaseManageService.selectFollowUpList(query);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("新增复诊随访记录")
+    @RequiresPermissions("health:chronicDisease:add")
+    @Log(title = "慢性疾病复诊随访", businessType = BusinessType.INSERT)
+    @PostMapping("/followUp")
+    public AjaxResult followUpAdd(@RequestBody ChronicDiseaseFollowUpRecord record) {
+        return toAjax(chronicDiseaseManageService.insertFollowUp(record));
+    }
+
+    @ApiOperation("修改复诊随访记录")
+    @RequiresPermissions("health:chronicDisease:edit")
+    @Log(title = "慢性疾病复诊随访", businessType = BusinessType.UPDATE)
+    @PutMapping("/followUp")
+    public AjaxResult followUpEdit(@RequestBody ChronicDiseaseFollowUpRecord record) {
+        return toAjax(chronicDiseaseManageService.updateFollowUp(record));
+    }
+
+    @ApiOperation("删除复诊随访记录")
+    @RequiresPermissions("health:chronicDisease:remove")
+    @Log(title = "慢性疾病复诊随访", businessType = BusinessType.DELETE)
+    @DeleteMapping("/followUp/{ids}")
+    public AjaxResult followUpRemove(@PathVariable Long[] ids) {
+        return toAjax(chronicDiseaseManageService.deleteFollowUpByIds(ids));
+    }
+
+    @ApiOperation("查询状态变更历史")
+    @RequiresPermissions("health:chronicDisease:list")
+    @GetMapping("/statusHistory/list")
+    public TableDataInfo statusHistoryList(ChronicDiseaseStatusHistory query) {
+        startPage();
+        List<ChronicDiseaseStatusHistory> list = chronicDiseaseManageService.selectStatusHistoryList(query);
+        return getDataTable(list);
+    }
+
+    @ApiOperation("新增状态变更历史")
+    @RequiresPermissions("health:chronicDisease:edit")
+    @Log(title = "慢性疾病状态变更", businessType = BusinessType.INSERT)
+    @PostMapping("/statusHistory")
+    public AjaxResult statusHistoryAdd(@RequestBody ChronicDiseaseStatusHistory record) {
+        return toAjax(chronicDiseaseManageService.insertStatusHistory(record));
+    }
+}

intc-modules/intc-health/src/main/java/com/intc/health/controller/StatisticAnalysisController.java

@@ -8,9 +8,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -46,6 +49,20 @@ public class StatisticAnalysisController extends BaseController {
         return AjaxResult.success(resultMap);
     }
 
+    @ApiOperation("活动统计分析")
+    @GetMapping("/activityAnalysis")
+    public Map<String,Object> getActivityAnalysis(AnalysisDto analysisDto){
+        Map<String, Object> resultMap = iStatisticAnalysisService.getActivityAnalysis(analysisDto);
+        return AjaxResult.success(resultMap);
+    }
+
+    @ApiOperation("健康总览大屏")
+    @GetMapping("/healthScreen")
+    public Map<String,Object> getHealthScreen(AnalysisDto analysisDto){
+        Map<String, Object> resultMap = iStatisticAnalysisService.getHealthScreen(analysisDto);
+        return AjaxResult.success(resultMap);
+    }
+
     @ApiOperation("档案统计分析")
     @GetMapping("/recordAnalysis")
     public Map<String,Object> getRecordAnalysis(AnalysisDto analysisDto){
@@ -53,6 +70,19 @@ public class StatisticAnalysisController extends BaseController {
         return AjaxResult.success(resultMap);
     }
 
+    @ApiOperation("健康档案大屏")
+    @GetMapping("/recordScreen")
+    public Map<String,Object> getRecordScreen(AnalysisDto analysisDto){
+        Map<String, Object> resultMap = iStatisticAnalysisService.getRecordScreen(analysisDto);
+        return AjaxResult.success(resultMap);
+    }
+
+    @ApiOperation("导出健康档案完整信息")
+    @PostMapping("/recordFullExport")
+    public void exportRecordFull(HttpServletResponse response, AnalysisDto analysisDto) throws IOException {
+        iStatisticAnalysisService.exportRecordFull(response, analysisDto);
+    }
+
     @ApiOperation("就医统计分析")
     @GetMapping("/doctorAnalysis")
     public Map<String,Object> getDoctorAnalysis(AnalysisDto analysisDto){

intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseFollowUpRecord.java

@@ -0,0 +1,58 @@
+package com.intc.health.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.intc.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("慢性疾病复诊随访记录")
+public class ChronicDiseaseFollowUpRecord extends BaseEntity {
+    private Long id;
+
+    @ApiModelProperty("慢性疾病档案ID")
+    private Long chronicDiseaseId;
+
+    @ApiModelProperty("成员ID")
+    private Long personId;
+
+    @ApiModelProperty("类型：1-复诊 2-复查 3-随访")
+    private Integer followUpType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("复诊/随访日期")
+    private Date followUpDate;
+
+    private String hospital;
+
+    private String department;
+
+    private String doctor;
+
+    @ApiModelProperty("复查项目")
+    private String checkItems;
+
+    @ApiModelProperty("结果")
+    private String result;
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty("下次复诊日期")
+    private Date nextFollowUpDate;
+
+    @ApiModelProperty("状态：1-待完成 2-已完成 3-已过期")
+    private Integer status;
+
+    @ApiModelProperty("说明")
+    private String notes;
+
+    private Integer delFlag;
+
+    private String startTime;
+
+    private String endTime;
+}

intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseIndicatorRecord.java

@@ -0,0 +1,58 @@
+package com.intc.health.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.intc.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("慢性疾病指标记录")
+public class ChronicDiseaseIndicatorRecord extends BaseEntity {
+    private Long id;
+
+    @ApiModelProperty("慢性疾病档案ID")
+    private Long chronicDiseaseId;
+
+    @ApiModelProperty("成员ID")
+    private Long personId;
+
+    @ApiModelProperty("指标类型")
+    private String indicatorType;
+
+    @ApiModelProperty("指标名称")
+    private String indicatorName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("测量时间")
+    private Date measureTime;
+
+    @ApiModelProperty("指标值")
+    private BigDecimal indicatorValue;
+
+    @ApiModelProperty("指标单位")
+    private String indicatorUnit;
+
+    @ApiModelProperty("目标下限")
+    private BigDecimal targetMin;
+
+    @ApiModelProperty("目标上限")
+    private BigDecimal targetMax;
+
+    @ApiModelProperty("状态：1-正常 2-偏高 3-偏低 4-需关注")
+    private Integer status;
+
+    @ApiModelProperty("记录说明")
+    private String notes;
+
+    private Integer delFlag;
+
+    private String startTime;
+
+    private String endTime;
+}

intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseStatusHistory.java

@@ -0,0 +1,41 @@
+package com.intc.health.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.intc.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("慢性疾病状态变更历史")
+public class ChronicDiseaseStatusHistory extends BaseEntity {
+    private Long id;
+
+    @ApiModelProperty("慢性疾病档案ID")
+    private Long chronicDiseaseId;
+
+    @ApiModelProperty("成员ID")
+    private Long personId;
+
+    @ApiModelProperty("原状态")
+    private Integer oldStatus;
+
+    @ApiModelProperty("新状态")
+    private Integer newStatus;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("变更时间")
+    private Date changeTime;
+
+    @ApiModelProperty("变更原因")
+    private String reason;
+
+    @ApiModelProperty("处理建议")
+    private String treatmentAdvice;
+
+    private Integer delFlag;
+}

intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthActivity.java

@@ -80,6 +80,11 @@ public class HealthActivity extends BaseEntity
     /** 费用明细 */
     private String costDetail;
 
+    /** 附件 */
+    @ApiModelProperty(value="附件")
+    @Excel(name = "附件")
+    private String attachment;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -102,6 +107,7 @@ public class HealthActivity extends BaseEntity
             .append("totalCost", getTotalCost())
             .append("partner", getPartner())
             .append("costDetail", getCostDetail())
+            .append("attachment", getAttachment())
             .toString();
     }
 }

intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthDoctorRecord.java

@@ -92,6 +92,11 @@ public class HealthDoctorRecord extends BaseEntity
     @Excel(name = "就诊类型")
     private String type;
 
+    /** 附件 */
+    @ApiModelProperty(value="附件")
+    @Excel(name = "附件")
+    private String attachment;
+
 
     @Override
     public String toString() {
@@ -114,6 +119,7 @@ public class HealthDoctorRecord extends BaseEntity
                 .append("partner", getPartner())
                 .append("costDetail", getCostDetail())
                 .append("type", getType())
+                .append("attachment", getAttachment())
                 .append("diagnosis", getDiagnosis())
             .toString();
     }

intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMedicineBasic.java

@@ -129,6 +129,11 @@ public class HealthMedicineBasic extends BaseEntity
     @Excel(name = "包装单位")
     private String packageUnit;
 
+    /** 附件 */
+    @ApiModelProperty(value="附件")
+    @Excel(name = "附件")
+    private String attachment;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -162,6 +167,7 @@ public class HealthMedicineBasic extends BaseEntity
                 .append("indications", getIndications())
                 .append("shortName", getShortName())
                 .append("packageUnit", getPackageUnit())
+                .append("attachment", getAttachment())
             .toString();
     }
 }

intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/AnalysisDto.java

@@ -43,5 +43,20 @@ public class AnalysisDto extends BaseEntity implements Serializable
     @ApiModelProperty(value="档案id")
     private Long recordId;
 
+    /** 活动名称 */
+    @ApiModelProperty(value="活动名称")
+    private String name;
+
+    /** 活动类型 */
+    @ApiModelProperty(value="活动类型")
+    private String activityType;
+
+    /** 活动地点 */
+    @ApiModelProperty(value="活动地点")
+    private String place;
+
+    /** 活动量 */
+    @ApiModelProperty(value="活动量")
+    private String activityVolume;
 
 }

intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/ChronicDiseaseRecordDto.java

@@ -1,5 +1,6 @@
 package com.intc.health.domain.dto;
 
+import com.intc.common.core.web.domain.BaseEntity;
 import lombok.Data;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -15,7 +16,7 @@ import java.util.Date;
  */
 @ApiModel("慢性疾病档案Dto对象")
 @Data
-public class ChronicDiseaseRecordDto implements Serializable
+public class ChronicDiseaseRecordDto  extends BaseEntity implements Serializable
 {
     private static final long serialVersionUID = 1L;
 

intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationPlanDto.java

@@ -1,10 +1,12 @@
 package com.intc.health.domain.dto;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.intc.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
@@ -16,7 +18,7 @@ import java.time.LocalDate;
  */
 @Data
 @ApiModel("用药计划查询DTO")
-public class MedicationPlanDto {
+public class MedicationPlanDto  extends BaseEntity implements Serializable {
 
     @ApiModelProperty("主键ID")
     private Long id;

intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationTaskDto.java

@@ -1,9 +1,11 @@
 package com.intc.health.domain.dto;
 
+import com.intc.common.core.web.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 
 /**
@@ -14,7 +16,7 @@ import java.time.LocalDate;
  */
 @Data
 @ApiModel("服药任务查询DTO")
-public class MedicationTaskDto {
+public class MedicationTaskDto extends BaseEntity implements Serializable {
 
     @ApiModelProperty("关联用药计划ID")
     private Long planId;

intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationPlanVo.java

@@ -90,6 +90,9 @@ public class MedicationPlanVo {
     @ApiModelProperty("今日已完成")
     private Integer todayCompleted;
 
+    @ApiModelProperty("创建人")
+    private String createBy;
+
     @ApiModelProperty("创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;

intc-modules/intc-health/src/main/java/com/intc/health/mapper/ChronicDiseaseManageMapper.java

@@ -0,0 +1,37 @@
+package com.intc.health.mapper;
+
+import com.intc.common.datascope.annotation.DataScope;
+import com.intc.health.domain.ChronicDiseaseFollowUpRecord;
+import com.intc.health.domain.ChronicDiseaseIndicatorRecord;
+import com.intc.health.domain.ChronicDiseaseStatusHistory;
+
+import java.util.List;
+
+public interface ChronicDiseaseManageMapper {
+    @DataScope(businessAlias = "a")
+    List<ChronicDiseaseIndicatorRecord> selectIndicatorList(ChronicDiseaseIndicatorRecord query);
+
+    ChronicDiseaseIndicatorRecord selectIndicatorById(Long id);
+
+    int insertIndicator(ChronicDiseaseIndicatorRecord record);
+
+    int updateIndicator(ChronicDiseaseIndicatorRecord record);
+
+    int removeIndicatorByIds(Long[] ids);
+
+    @DataScope(businessAlias = "a")
+    List<ChronicDiseaseFollowUpRecord> selectFollowUpList(ChronicDiseaseFollowUpRecord query);
+
+    ChronicDiseaseFollowUpRecord selectFollowUpById(Long id);
+
+    int insertFollowUp(ChronicDiseaseFollowUpRecord record);
+
+    int updateFollowUp(ChronicDiseaseFollowUpRecord record);
+
+    int removeFollowUpByIds(Long[] ids);
+
+    @DataScope(businessAlias = "a")
+    List<ChronicDiseaseStatusHistory> selectStatusHistoryList(ChronicDiseaseStatusHistory query);
+
+    int insertStatusHistory(ChronicDiseaseStatusHistory record);
+}

intc-modules/intc-health/src/main/java/com/intc/health/mapper/StatisticAnalysisMapper.java

@@ -2,13 +2,16 @@ package com.intc.health.mapper;
 
 import com.intc.common.datascope.annotation.DataScope;
 import com.intc.health.domain.dto.HealthDoctorRecordDto;
+import com.intc.health.domain.dto.HealthActivityDto;
 import com.intc.health.domain.dto.HealthMarRecordDto;
 import com.intc.health.domain.dto.HealthMilkPowderRecordDto;
 import com.intc.health.domain.dto.HealthRecordDto;
+import com.intc.health.domain.dto.HealthTemperatureRecordDto;
 import com.intc.health.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface StatisticAnalysisMapper {
@@ -98,6 +101,60 @@ public interface StatisticAnalysisMapper {
     @DataScope(businessAlias = "hp")
     public List<HealthStaticPersonVo>  selectStaticPersonList (HealthRecordDto dto);
 
+    /**
+     * 查询健康总览大屏成员风险排行
+     */
+    @DataScope(businessAlias = "hp")
+    public List<HealthStaticPersonVo> selectHealthScreenPersonRankList(HealthRecordDto dto);
+
+    /**
+     * 查询健康总览大屏就医汇总
+     */
+    @DataScope(businessAlias = "a")
+    public Map<String, Object> selectHealthScreenDoctorSummary(HealthDoctorRecordDto dto);
+
+    /**
+     * 查询健康总览大屏用药汇总
+     */
+    @DataScope(businessAlias = "a")
+    public Map<String, Object> selectHealthScreenMedicineSummary(HealthMarRecordDto dto);
+
+    /**
+     * 查询健康总览大屏体温汇总
+     */
+    @DataScope(businessAlias = "a")
+    public Map<String, Object> selectHealthScreenTemperatureSummary(HealthTemperatureRecordDto dto);
+
+    /**
+     * 查询健康总览大屏活动汇总
+     */
+    @DataScope(businessAlias = "a")
+    public Map<String, Object> selectHealthScreenActivitySummary(HealthActivityDto dto);
+
+    /**
+     * 查询健康总览大屏近期活动明细
+     */
+    @DataScope(businessAlias = "a")
+    public List<HealthActivityVo> selectHealthScreenActivityList(HealthActivityDto dto);
+
+    /**
+     * 查询健康总览大屏近期就医明细
+     */
+    @DataScope(businessAlias = "a")
+    public List<HealthDoctorRecordVo> selectHealthScreenDoctorList(HealthDoctorRecordDto dto);
+
+    /**
+     * 查询健康总览大屏近期用药明细
+     */
+    @DataScope(businessAlias = "a")
+    public List<HealthMarRecordVo> selectHealthScreenMedicineList(HealthMarRecordDto dto);
+
+    /**
+     * 查询健康总览大屏近期体温明细
+     */
+    @DataScope(businessAlias = "a")
+    public List<HealthTemperatureRecordVo> selectHealthScreenTemperatureList(HealthTemperatureRecordDto dto);
+
 
     /**
      * 查询用药记录

intc-modules/intc-health/src/main/java/com/intc/health/service/IChronicDiseaseManageService.java

@@ -0,0 +1,33 @@
+package com.intc.health.service;
+
+import com.intc.health.domain.ChronicDiseaseFollowUpRecord;
+import com.intc.health.domain.ChronicDiseaseIndicatorRecord;
+import com.intc.health.domain.ChronicDiseaseStatusHistory;
+
+import java.util.List;
+
+public interface IChronicDiseaseManageService {
+    List<ChronicDiseaseIndicatorRecord> selectIndicatorList(ChronicDiseaseIndicatorRecord query);
+
+    ChronicDiseaseIndicatorRecord selectIndicatorById(Long id);
+
+    int insertIndicator(ChronicDiseaseIndicatorRecord record);
+
+    int updateIndicator(ChronicDiseaseIndicatorRecord record);
+
+    int deleteIndicatorByIds(Long[] ids);
+
+    List<ChronicDiseaseFollowUpRecord> selectFollowUpList(ChronicDiseaseFollowUpRecord query);
+
+    ChronicDiseaseFollowUpRecord selectFollowUpById(Long id);
+
+    int insertFollowUp(ChronicDiseaseFollowUpRecord record);
+
+    int updateFollowUp(ChronicDiseaseFollowUpRecord record);
+
+    int deleteFollowUpByIds(Long[] ids);
+
+    List<ChronicDiseaseStatusHistory> selectStatusHistoryList(ChronicDiseaseStatusHistory query);
+
+    int insertStatusHistory(ChronicDiseaseStatusHistory record);
+}

intc-modules/intc-health/src/main/java/com/intc/health/service/IStatisticAnalysisService.java

@@ -2,6 +2,8 @@ package com.intc.health.service;
 
 import com.intc.health.domain.dto.AnalysisDto;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -17,9 +19,17 @@ public interface IStatisticAnalysisService {
 
     public Map<String, Object> getHealthAnalysisInfo();
 
+    public Map<String, Object> getActivityAnalysis(AnalysisDto analysisDto);
+
+    public Map<String, Object> getHealthScreen(AnalysisDto analysisDto);
+
 
     public Map<String, Object> getRecordAnalysis(AnalysisDto analysisDto);
 
+    public Map<String, Object> getRecordScreen(AnalysisDto analysisDto);
+
+    public void exportRecordFull(HttpServletResponse response, AnalysisDto analysisDto) throws IOException;
+
     public Map<String, Object> getDoctorAnalysis(AnalysisDto analysisDto);
 
 

intc-modules/intc-health/src/main/java/com/intc/health/service/impl/ChronicDiseaseManageServiceImpl.java

@@ -0,0 +1,109 @@
+package com.intc.health.service.impl;
+
+import com.intc.common.core.utils.DateUtils;
+import com.intc.common.core.utils.IdWorker;
+import com.intc.common.security.utils.SecurityUtils;
+import com.intc.health.domain.ChronicDiseaseFollowUpRecord;
+import com.intc.health.domain.ChronicDiseaseIndicatorRecord;
+import com.intc.health.domain.ChronicDiseaseStatusHistory;
+import com.intc.health.mapper.ChronicDiseaseManageMapper;
+import com.intc.health.service.IChronicDiseaseManageService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class ChronicDiseaseManageServiceImpl implements IChronicDiseaseManageService {
+    @Resource
+    private ChronicDiseaseManageMapper chronicDiseaseManageMapper;
+
+    @Override
+    public List<ChronicDiseaseIndicatorRecord> selectIndicatorList(ChronicDiseaseIndicatorRecord query) {
+        return chronicDiseaseManageMapper.selectIndicatorList(query);
+    }
+
+    @Override
+    public ChronicDiseaseIndicatorRecord selectIndicatorById(Long id) {
+        return chronicDiseaseManageMapper.selectIndicatorById(id);
+    }
+
+    @Override
+    public int insertIndicator(ChronicDiseaseIndicatorRecord record) {
+        record.setId(IdWorker.getId());
+        record.setCreateBy(SecurityUtils.getUsername());
+        record.setCreateTime(DateUtils.getNowDate());
+        if (record.getMeasureTime() == null) {
+            record.setMeasureTime(new Date());
+        }
+        if (record.getStatus() == null) {
+            record.setStatus(1);
+        }
+        return chronicDiseaseManageMapper.insertIndicator(record);
+    }
+
+    @Override
+    public int updateIndicator(ChronicDiseaseIndicatorRecord record) {
+        record.setUpdateBy(SecurityUtils.getUsername());
+        record.setUpdateTime(DateUtils.getNowDate());
+        return chronicDiseaseManageMapper.updateIndicator(record);
+    }
+
+    @Override
+    public int deleteIndicatorByIds(Long[] ids) {
+        return chronicDiseaseManageMapper.removeIndicatorByIds(ids);
+    }
+
+    @Override
+    public List<ChronicDiseaseFollowUpRecord> selectFollowUpList(ChronicDiseaseFollowUpRecord query) {
+        return chronicDiseaseManageMapper.selectFollowUpList(query);
+    }
+
+    @Override
+    public ChronicDiseaseFollowUpRecord selectFollowUpById(Long id) {
+        return chronicDiseaseManageMapper.selectFollowUpById(id);
+    }
+
+    @Override
+    public int insertFollowUp(ChronicDiseaseFollowUpRecord record) {
+        record.setId(IdWorker.getId());
+        record.setCreateBy(SecurityUtils.getUsername());
+        record.setCreateTime(DateUtils.getNowDate());
+        if (record.getFollowUpType() == null) {
+            record.setFollowUpType(1);
+        }
+        if (record.getStatus() == null) {
+            record.setStatus(1);
+        }
+        return chronicDiseaseManageMapper.insertFollowUp(record);
+    }
+
+    @Override
+    public int updateFollowUp(ChronicDiseaseFollowUpRecord record) {
+        record.setUpdateBy(SecurityUtils.getUsername());
+        record.setUpdateTime(DateUtils.getNowDate());
+        return chronicDiseaseManageMapper.updateFollowUp(record);
+    }
+
+    @Override
+    public int deleteFollowUpByIds(Long[] ids) {
+        return chronicDiseaseManageMapper.removeFollowUpByIds(ids);
+    }
+
+    @Override
+    public List<ChronicDiseaseStatusHistory> selectStatusHistoryList(ChronicDiseaseStatusHistory query) {
+        return chronicDiseaseManageMapper.selectStatusHistoryList(query);
+    }
+
+    @Override
+    public int insertStatusHistory(ChronicDiseaseStatusHistory record) {
+        record.setId(IdWorker.getId());
+        record.setCreateBy(SecurityUtils.getUsername());
+        record.setCreateTime(DateUtils.getNowDate());
+        if (record.getChangeTime() == null) {
+            record.setChangeTime(new Date());
+        }
+        return chronicDiseaseManageMapper.insertStatusHistory(record);
+    }
+}

intc-modules/intc-health/src/main/java/com/intc/health/service/impl/ChronicDiseaseRecordServiceImpl.java

@@ -4,8 +4,10 @@ import com.intc.common.core.utils.DateUtils;
 import com.intc.common.core.utils.IdWorker;
 import com.intc.common.security.utils.SecurityUtils;
 import com.intc.health.domain.ChronicDiseaseRecord;
+import com.intc.health.domain.ChronicDiseaseStatusHistory;
 import com.intc.health.domain.dto.ChronicDiseaseRecordDto;
 import com.intc.health.domain.vo.ChronicDiseaseRecordVo;
+import com.intc.health.mapper.ChronicDiseaseManageMapper;
 import com.intc.health.mapper.ChronicDiseaseRecordMapper;
 import com.intc.health.service.IChronicDiseaseRecordService;
 import org.springframework.stereotype.Service;
@@ -25,6 +27,9 @@ public class ChronicDiseaseRecordServiceImpl implements IChronicDiseaseRecordSer
     @Resource
     private ChronicDiseaseRecordMapper chronicDiseaseRecordMapper;
 
+    @Resource
+    private ChronicDiseaseManageMapper chronicDiseaseManageMapper;
+
     /**
      * 查询慢性疾病档案
      *
@@ -93,9 +98,29 @@ public class ChronicDiseaseRecordServiceImpl implements IChronicDiseaseRecordSer
     @Override
     public int updateChronicDiseaseRecord(ChronicDiseaseRecord chronicDiseaseRecord)
     {
+        ChronicDiseaseRecordVo oldRecord = null;
+        if (chronicDiseaseRecord.getId() != null && chronicDiseaseRecord.getDiseaseStatus() != null) {
+            oldRecord = chronicDiseaseRecordMapper.selectChronicDiseaseRecordById(chronicDiseaseRecord.getId());
+        }
         chronicDiseaseRecord.setUpdateBy(SecurityUtils.getUsername());
         chronicDiseaseRecord.setUpdateTime(DateUtils.getNowDate());
-        return chronicDiseaseRecordMapper.updateChronicDiseaseRecord(chronicDiseaseRecord);
+        int rows = chronicDiseaseRecordMapper.updateChronicDiseaseRecord(chronicDiseaseRecord);
+        if (rows > 0 && oldRecord != null && oldRecord.getDiseaseStatus() != null
+                && !oldRecord.getDiseaseStatus().equals(chronicDiseaseRecord.getDiseaseStatus())) {
+            ChronicDiseaseStatusHistory history = new ChronicDiseaseStatusHistory();
+            history.setId(IdWorker.getId());
+            history.setChronicDiseaseId(chronicDiseaseRecord.getId());
+            history.setPersonId(oldRecord.getPersonId());
+            history.setOldStatus(oldRecord.getDiseaseStatus());
+            history.setNewStatus(chronicDiseaseRecord.getDiseaseStatus());
+            history.setChangeTime(DateUtils.getNowDate());
+            history.setReason(chronicDiseaseRecord.getRemark() != null ? chronicDiseaseRecord.getRemark() : "档案状态调整");
+            history.setTreatmentAdvice(chronicDiseaseRecord.getNotes());
+            history.setCreateBy(SecurityUtils.getUsername());
+            history.setCreateTime(DateUtils.getNowDate());
+            chronicDiseaseManageMapper.insertStatusHistory(history);
+        }
+        return rows;
     }
 
     /**
@@ -121,4 +146,4 @@ public class ChronicDiseaseRecordServiceImpl implements IChronicDiseaseRecordSer
     {
         return chronicDiseaseRecordMapper.removeChronicDiseaseRecordById(id);
     }
-}
+}

intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationTaskJob.java

@@ -220,6 +220,7 @@ public class MedicationTaskJob {
             task.setPlannedDosage(dosage);
             task.setStatus(0); // 待服药
             task.setRemindStatus(0); // 未提醒
+            task.setCreateBy(plan.getCreateBy());
             task.setCreateTime(DateUtils.getNowDate());
 
             tasks.add(task);

intc-modules/intc-health/src/main/resources/mapper/health/ChronicDiseaseManageMapper.xml

@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.intc.health.mapper.ChronicDiseaseManageMapper">
+
+    <resultMap type="ChronicDiseaseIndicatorRecord" id="ChronicDiseaseIndicatorResult">
+        <id property="id" column="id"/>
+        <result property="chronicDiseaseId" column="chronic_disease_id"/>
+        <result property="personId" column="person_id"/>
+        <result property="indicatorType" column="indicator_type"/>
+        <result property="indicatorName" column="indicator_name"/>
+        <result property="measureTime" column="measure_time"/>
+        <result property="indicatorValue" column="indicator_value"/>
+        <result property="indicatorUnit" column="indicator_unit"/>
+        <result property="targetMin" column="target_min"/>
+        <result property="targetMax" column="target_max"/>
+        <result property="status" column="status"/>
+        <result property="notes" column="notes"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <resultMap type="ChronicDiseaseFollowUpRecord" id="ChronicDiseaseFollowUpResult">
+        <id property="id" column="id"/>
+        <result property="chronicDiseaseId" column="chronic_disease_id"/>
+        <result property="personId" column="person_id"/>
+        <result property="followUpType" column="follow_up_type"/>
+        <result property="followUpDate" column="follow_up_date"/>
+        <result property="hospital" column="hospital"/>
+        <result property="department" column="department"/>
+        <result property="doctor" column="doctor"/>
+        <result property="checkItems" column="check_items"/>
+        <result property="result" column="result"/>
+        <result property="nextFollowUpDate" column="next_follow_up_date"/>
+        <result property="status" column="status"/>
+        <result property="notes" column="notes"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <resultMap type="ChronicDiseaseStatusHistory" id="ChronicDiseaseStatusHistoryResult">
+        <id property="id" column="id"/>
+        <result property="chronicDiseaseId" column="chronic_disease_id"/>
+        <result property="personId" column="person_id"/>
+        <result property="oldStatus" column="old_status"/>
+        <result property="newStatus" column="new_status"/>
+        <result property="changeTime" column="change_time"/>
+        <result property="reason" column="reason"/>
+        <result property="treatmentAdvice" column="treatment_advice"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <sql id="selectIndicatorVo">
+        select a.id, a.chronic_disease_id, a.person_id, a.indicator_type, a.indicator_name,
+               a.measure_time, a.indicator_value, a.indicator_unit, a.target_min, a.target_max,
+               a.status, a.notes, a.create_by, a.create_time, a.update_by, a.update_time,
+               a.remark, a.del_flag
+        from chronic_disease_indicator_record a
+        inner join health_person p on a.person_id = p.id and p.del_flag = '0'
+    </sql>
+
+    <select id="selectIndicatorList" parameterType="ChronicDiseaseIndicatorRecord" resultMap="ChronicDiseaseIndicatorResult">
+        <include refid="selectIndicatorVo"/>
+        <where>
+            a.del_flag = 0
+            <if test="chronicDiseaseId != null">and a.chronic_disease_id = #{chronicDiseaseId}</if>
+            <if test="personId != null">and a.person_id = #{personId}</if>
+            <if test="indicatorType != null and indicatorType != ''">and a.indicator_type = #{indicatorType}</if>
+            <if test="indicatorName != null and indicatorName != ''">and a.indicator_name like '%' || #{indicatorName} || '%'</if>
+            <if test="status != null">and a.status = #{status}</if>
+            <if test="startTime != null and startTime != ''">and a.measure_time &gt;= to_timestamp(#{startTime}, 'YYYY-MM-DD HH24:MI:SS')</if>
+            <if test="endTime != null and endTime != ''">and a.measure_time &lt;= to_timestamp(#{endTime}, 'YYYY-MM-DD HH24:MI:SS')</if>
+        </where>
+        ${params.dataScope}
+        order by a.measure_time desc, a.create_time desc
+    </select>
+
+    <select id="selectIndicatorById" parameterType="Long" resultMap="ChronicDiseaseIndicatorResult">
+        <include refid="selectIndicatorVo"/>
+        where a.id = #{id} and a.del_flag = 0
+    </select>
+
+    <insert id="insertIndicator" parameterType="ChronicDiseaseIndicatorRecord">
+        insert into chronic_disease_indicator_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="chronicDiseaseId != null">chronic_disease_id,</if>
+            <if test="personId != null">person_id,</if>
+            <if test="indicatorType != null">indicator_type,</if>
+            <if test="indicatorName != null">indicator_name,</if>
+            <if test="measureTime != null">measure_time,</if>
+            <if test="indicatorValue != null">indicator_value,</if>
+            <if test="indicatorUnit != null">indicator_unit,</if>
+            <if test="targetMin != null">target_min,</if>
+            <if test="targetMax != null">target_max,</if>
+            <if test="status != null">status,</if>
+            <if test="notes != null">notes,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="remark != null">remark,</if>
+            del_flag,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="chronicDiseaseId != null">#{chronicDiseaseId},</if>
+            <if test="personId != null">#{personId},</if>
+            <if test="indicatorType != null">#{indicatorType},</if>
+            <if test="indicatorName != null">#{indicatorName},</if>
+            <if test="measureTime != null">#{measureTime},</if>
+            <if test="indicatorValue != null">#{indicatorValue},</if>
+            <if test="indicatorUnit != null">#{indicatorUnit},</if>
+            <if test="targetMin != null">#{targetMin},</if>
+            <if test="targetMax != null">#{targetMax},</if>
+            <if test="status != null">#{status},</if>
+            <if test="notes != null">#{notes},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="remark != null">#{remark},</if>
+            0,
+        </trim>
+    </insert>
+
+    <update id="updateIndicator" parameterType="ChronicDiseaseIndicatorRecord">
+        update chronic_disease_indicator_record
+        <set>
+            <if test="chronicDiseaseId != null">chronic_disease_id = #{chronicDiseaseId},</if>
+            <if test="personId != null">person_id = #{personId},</if>
+            <if test="indicatorType != null">indicator_type = #{indicatorType},</if>
+            <if test="indicatorName != null">indicator_name = #{indicatorName},</if>
+            <if test="measureTime != null">measure_time = #{measureTime},</if>
+            <if test="indicatorValue != null">indicator_value = #{indicatorValue},</if>
+            <if test="indicatorUnit != null">indicator_unit = #{indicatorUnit},</if>
+            <if test="targetMin != null">target_min = #{targetMin},</if>
+            <if test="targetMax != null">target_max = #{targetMax},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="notes != null">notes = #{notes},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <update id="removeIndicatorByIds" parameterType="Long">
+        update chronic_disease_indicator_record set del_flag = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">#{id}</foreach>
+    </update>
+
+    <sql id="selectFollowUpVo">
+        select a.id, a.chronic_disease_id, a.person_id, a.follow_up_type, a.follow_up_date,
+               a.hospital, a.department, a.doctor, a.check_items, a.result, a.next_follow_up_date,
+               a.status, a.notes, a.create_by, a.create_time, a.update_by, a.update_time,
+               a.remark, a.del_flag
+        from chronic_disease_follow_up_record a
+        inner join health_person p on a.person_id = p.id and p.del_flag = '0'
+    </sql>
+
+    <select id="selectFollowUpList" parameterType="ChronicDiseaseFollowUpRecord" resultMap="ChronicDiseaseFollowUpResult">
+        <include refid="selectFollowUpVo"/>
+        <where>
+            a.del_flag = 0
+            <if test="chronicDiseaseId != null">and a.chronic_disease_id = #{chronicDiseaseId}</if>
+            <if test="personId != null">and a.person_id = #{personId}</if>
+            <if test="followUpType != null">and a.follow_up_type = #{followUpType}</if>
+            <if test="status != null">and a.status = #{status}</if>
+            <if test="hospital != null and hospital != ''">and a.hospital like '%' || #{hospital} || '%'</if>
+            <if test="startTime != null and startTime != ''">and a.follow_up_date &gt;= to_date(#{startTime}, 'YYYY-MM-DD')</if>
+            <if test="endTime != null and endTime != ''">and a.follow_up_date &lt;= to_date(#{endTime}, 'YYYY-MM-DD')</if>
+        </where>
+        ${params.dataScope}
+        order by a.follow_up_date desc, a.create_time desc
+    </select>
+
+    <select id="selectFollowUpById" parameterType="Long" resultMap="ChronicDiseaseFollowUpResult">
+        <include refid="selectFollowUpVo"/>
+        where a.id = #{id} and a.del_flag = 0
+    </select>
+
+    <insert id="insertFollowUp" parameterType="ChronicDiseaseFollowUpRecord">
+        insert into chronic_disease_follow_up_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="chronicDiseaseId != null">chronic_disease_id,</if>
+            <if test="personId != null">person_id,</if>
+            <if test="followUpType != null">follow_up_type,</if>
+            <if test="followUpDate != null">follow_up_date,</if>
+            <if test="hospital != null">hospital,</if>
+            <if test="department != null">department,</if>
+            <if test="doctor != null">doctor,</if>
+            <if test="checkItems != null">check_items,</if>
+            <if test="result != null">result,</if>
+            <if test="nextFollowUpDate != null">next_follow_up_date,</if>
+            <if test="status != null">status,</if>
+            <if test="notes != null">notes,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="remark != null">remark,</if>
+            del_flag,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="chronicDiseaseId != null">#{chronicDiseaseId},</if>
+            <if test="personId != null">#{personId},</if>
+            <if test="followUpType != null">#{followUpType},</if>
+            <if test="followUpDate != null">#{followUpDate},</if>
+            <if test="hospital != null">#{hospital},</if>
+            <if test="department != null">#{department},</if>
+            <if test="doctor != null">#{doctor},</if>
+            <if test="checkItems != null">#{checkItems},</if>
+            <if test="result != null">#{result},</if>
+            <if test="nextFollowUpDate != null">#{nextFollowUpDate},</if>
+            <if test="status != null">#{status},</if>
+            <if test="notes != null">#{notes},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="remark != null">#{remark},</if>
+            0,
+        </trim>
+    </insert>
+
+    <update id="updateFollowUp" parameterType="ChronicDiseaseFollowUpRecord">
+        update chronic_disease_follow_up_record
+        <set>
+            <if test="chronicDiseaseId != null">chronic_disease_id = #{chronicDiseaseId},</if>
+            <if test="personId != null">person_id = #{personId},</if>
+            <if test="followUpType != null">follow_up_type = #{followUpType},</if>
+            <if test="followUpDate != null">follow_up_date = #{followUpDate},</if>
+            <if test="hospital != null">hospital = #{hospital},</if>
+            <if test="department != null">department = #{department},</if>
+            <if test="doctor != null">doctor = #{doctor},</if>
+            <if test="checkItems != null">check_items = #{checkItems},</if>
+            <if test="result != null">result = #{result},</if>
+            <if test="nextFollowUpDate != null">next_follow_up_date = #{nextFollowUpDate},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="notes != null">notes = #{notes},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <update id="removeFollowUpByIds" parameterType="Long">
+        update chronic_disease_follow_up_record set del_flag = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">#{id}</foreach>
+    </update>
+
+    <sql id="selectStatusHistoryVo">
+        select a.id, a.chronic_disease_id, a.person_id, a.old_status, a.new_status,
+               a.change_time, a.reason, a.treatment_advice, a.create_by, a.create_time,
+               a.update_by, a.update_time, a.remark, a.del_flag
+        from chronic_disease_status_history a
+        inner join health_person p on a.person_id = p.id and p.del_flag = '0'
+    </sql>
+
+    <select id="selectStatusHistoryList" parameterType="ChronicDiseaseStatusHistory" resultMap="ChronicDiseaseStatusHistoryResult">
+        <include refid="selectStatusHistoryVo"/>
+        <where>
+            a.del_flag = 0
+            <if test="chronicDiseaseId != null">and a.chronic_disease_id = #{chronicDiseaseId}</if>
+            <if test="personId != null">and a.person_id = #{personId}</if>
+            <if test="oldStatus != null">and a.old_status = #{oldStatus}</if>
+            <if test="newStatus != null">and a.new_status = #{newStatus}</if>
+        </where>
+        ${params.dataScope}
+        order by a.change_time desc, a.create_time desc
+    </select>
+
+    <insert id="insertStatusHistory" parameterType="ChronicDiseaseStatusHistory">
+        insert into chronic_disease_status_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="chronicDiseaseId != null">chronic_disease_id,</if>
+            <if test="personId != null">person_id,</if>
+            <if test="oldStatus != null">old_status,</if>
+            <if test="newStatus != null">new_status,</if>
+            <if test="changeTime != null">change_time,</if>
+            <if test="reason != null">reason,</if>
+            <if test="treatmentAdvice != null">treatment_advice,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="remark != null">remark,</if>
+            del_flag,
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="chronicDiseaseId != null">#{chronicDiseaseId},</if>
+            <if test="personId != null">#{personId},</if>
+            <if test="oldStatus != null">#{oldStatus},</if>
+            <if test="newStatus != null">#{newStatus},</if>
+            <if test="changeTime != null">#{changeTime},</if>
+            <if test="reason != null">#{reason},</if>
+            <if test="treatmentAdvice != null">#{treatmentAdvice},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="remark != null">#{remark},</if>
+            0,
+        </trim>
+    </insert>
+</mapper>

intc-modules/intc-health/src/main/resources/mapper/health/ChronicDiseaseRecordMapper.xml

@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark,
                p.name as person_name
         from chronic_disease_record a
-        left join health_person p on a.person_id = p.id
+        inner join health_person p on a.person_id = p.id and p.del_flag = '0'
     </sql>
 
     <select id="selectChronicDiseaseRecordList" parameterType="ChronicDiseaseRecordDto" resultMap="ChronicDiseaseRecordResult">
@@ -164,4 +164,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-</mapper>
+</mapper>

intc-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="totalCost"    column="total_cost"    />
         <result property="partner"    column="partner"    />
         <result property="costDetail"    column="cost_detail"    />
+        <result property="attachment"    column="attachment"    />
     </resultMap>
 
     <sql id="selectHealthActivityVo">
-        select a.id, a.name, a.type, a.place, a.activity_volume, a.exercise_time, a.start_time, a.end_time, a.harvest, a.foods, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.total_cost, a.partner, a.cost_detail from health_activity a
+        select a.id, a.name, a.type, a.place, a.activity_volume, a.exercise_time, a.start_time, a.end_time, a.harvest, a.foods, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.total_cost, a.partner, a.cost_detail, a.attachment from health_activity a
     </sql>
 
     <select id="selectHealthActivityList" parameterType="HealthActivityDto" resultMap="HealthActivityResult">
@@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalCost != null">total_cost,</if>
             <if test="partner != null">partner,</if>
             <if test="costDetail != null">cost_detail,</if>
+            <if test="attachment != null">attachment,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -94,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalCost != null">#{totalCost},</if>
             <if test="partner != null">#{partner},</if>
             <if test="costDetail != null">#{costDetail},</if>
+            <if test="attachment != null">#{attachment},</if>
          </trim>
     </insert>
 
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="totalCost != null">total_cost = #{totalCost},</if>
             <if test="partner != null">partner = #{partner},</if>
             <if test="costDetail != null">cost_detail = #{costDetail},</if>
+            <if test="attachment != null">attachment = #{attachment},</if>
         </trim>
         where id = #{id}
     </update>

intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordCostMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectHealthDoctorRecordCostVo"/>
         <where>
             a.del_flag='0'
+            and exists (select 1 from health_person hp where hp.id = a.person_id and hp.del_flag = '0')
             <if test="doctorRecordId != null "> and a.doctor_record_id = #{doctorRecordId}</if>
             <if test="type != null  and type != ''"> and a.type = #{type}</if>
             <if test="healthRecordId != null "> and a.health_record_id = #{healthRecordId}</if>
@@ -47,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectHealthDoctorRecordCostById" parameterType="Long" resultMap="HealthDoctorRecordCostResult">
         <include refid="selectHealthDoctorRecordCostVo"/>
         where a.id = #{id}
+        and exists (select 1 from health_person hp where hp.id = a.person_id and hp.del_flag = '0')
     </select>
 
     <insert id="insertHealthDoctorRecordCost" parameterType="HealthDoctorRecordCost">

intc-modules/intc-health/src/main/resources/mapper/health/HealthDoctorRecordMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="partner"    column="partner"    />
         <result property="costDetail"    column="cost_detail"    />
         <result property="type"    column="type"    />
+        <result property="attachment"    column="attachment"    />
         <result property="diagnosis"    column="diagnosis"    />
     </resultMap>
 
@@ -48,13 +49,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.total_cost,
         a.partner,
         a.cost_detail,
+        a.attachment,
         a.diagnosis,
         hp."name" as person_name ,
         hr."name" as health_record_name
         from
         health_doctor_record a
-        left join health_person hp on
-        hp.id = a.person_id
+        inner join health_person hp on
+        hp.id = a.person_id and hp.del_flag = '0'
         left join health_record hr on
         hr.id = a.health_record_id
     </sql>
@@ -108,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="partner != null">partner,</if>
             <if test="costDetail != null">cost_detail,</if>
             <if test="type != null and type != ''">type,</if>
+            <if test="attachment != null">attachment,</if>
             <if test="diagnosis != null and diagnosis != ''">diagnosis,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -129,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="partner != null">#{partner},</if>
             <if test="costDetail != null">#{costDetail},</if>
             <if test="type != null and type != ''">#{type},</if>
+            <if test="attachment != null">#{attachment},</if>
             <if test="diagnosis != null and diagnosis != ''">#{diagnosis},</if>
          </trim>
     </insert>
@@ -153,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="partner != null">partner = #{partner},</if>
             <if test="costDetail != null">cost_detail = #{costDetail},</if>
             <if test="type != null and type != ''">type = #{type},</if>
+            <if test="attachment != null">attachment = #{attachment},</if>
             <if test="diagnosis != null and diagnosis != ''">diagnosis = #{diagnosis},</if>
         </trim>
         where id = #{id}

intc-modules/intc-health/src/main/resources/mapper/health/HealthHeightWeightRecordMapper.xml

@@ -35,8 +35,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         hp."name" as person_name
         from
         health_height_weight_record a
-        left join health_person hp on
-        hp.id = a.person_id
+        inner join health_person hp on
+        hp.id = a.person_id and hp.del_flag = '0'
     </sql>
 
     <select id="selectHealthHeightWeightRecordList" parameterType="HealthHeightWeightRecordDto" resultMap="HealthHeightWeightRecordResult">

intc-modules/intc-health/src/main/resources/mapper/health/HealthMarRecordMapper.xml

@@ -56,8 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             hmb.short_name || '-' || hmb.brand || '(' || hmb.packaging || ')' as name
         from
             health_mar_record a
-                left join health_person hp on
-                hp.id = a.person_id
+                inner join health_person hp on
+                hp.id = a.person_id and hp.del_flag = '0'
                 left join health_record hr on
                 hr.id = a.health_record_id
                 left join health_medicine_basic hmb on

intc-modules/intc-health/src/main/resources/mapper/health/HealthMedicineBasicMapper.xml

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="indications"    column="indications"    />
         <result property="shortName"    column="short_name"    />
         <result property="packageUnit"    column="package_unit"    />
+        <result property="attachment"    column="attachment"    />
     </resultMap>
 
     <sql id="selectHealthMedicineBasicVo">
@@ -68,7 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.storage,
             a.indications,
             a.short_name,
-            a.package_unit
+            a.package_unit,
+            a.attachment
         from
             health_medicine_basic a
 
@@ -134,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="indications != null">indications,</if>
             <if test="shortName != null">short_name,</if>
             <if test="packageUnit != null">package_unit,</if>
+            <if test="attachment != null">attachment,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -166,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="indications != null">#{indications},</if>
             <if test="shortName != null">#{shortName},</if>
             <if test="packageUnit != null">#{packageUnit},</if>
+            <if test="attachment != null">#{attachment},</if>
          </trim>
     </insert>
 
@@ -201,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="indications != null">indications = #{indications},</if>
             <if test="shortName != null">short_name = #{shortName},</if>
             <if test="packageUnit != null">package_unit = #{packageUnit},</if>
+            <if test="attachment != null">attachment = #{attachment},</if>
         </trim>
         where id = #{id}
     </update>

intc-modules/intc-health/src/main/resources/mapper/health/HealthMilkPowderRecordMapper.xml

@@ -37,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             hp."name" as person_name
         from
             health_milk_powder_record a
-                left join health_person hp on
-                hp.id = a.person_id
+                inner join health_person hp on
+                hp.id = a.person_id and hp.del_flag = '0'
 
     </sql>
 

intc-modules/intc-health/src/main/resources/mapper/health/HealthPersonMapper.xml

@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ranking"    column="ranking"    />
         <result property="sex"    column="sex"    />
         <result property="identityCard"    column="identity_card"    />
+        <result property="phone"    column="phone"    />
     </resultMap>
 
     <sql id="selectHealthPersonVo">
-        select a.id, a.name,a.sex,a.identity_card, a.type, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.birthday, a.nick_name, a.height, a.weight, a.ranking from health_person a
+        select a.id, a.name, a.sex, a.identity_card, a.phone, a.type, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, a.birthday, a.nick_name, a.height, a.weight, a.ranking from health_person a
     </sql>
 
     <select id="selectHealthPersonList" parameterType="HealthPersonDto" resultMap="HealthPersonResult">
@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectHealthPersonById" parameterType="Long" resultMap="HealthPersonResult">
         <include refid="selectHealthPersonVo"/>
-        where a.id = #{id}
+        where a.id = #{id} and a.del_flag = '0'
     </select>
 
     <insert id="insertHealthPerson" parameterType="HealthPerson">
@@ -64,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ranking != null">ranking,</if>
             <if test="sex != null and sex != ''">sex,</if>
             <if test="identityCard != null and identityCard != ''">identity_card,</if>
+            <if test="phone != null and phone != ''">phone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -82,6 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ranking != null">#{ranking},</if>
             <if test="sex != null and sex != ''">#{sex},</if>
             <if test="identityCard != null and identityCard != ''">#{identityCard},</if>
+            <if test="phone != null and phone != ''">#{phone},</if>
          </trim>
     </insert>
 
@@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="ranking != null">ranking = #{ranking},</if>
             <if test="sex != null and sex != ''">sex = #{sex},</if>
             <if test="identityCard != null and identityCard != ''">identity_card = #{identityCard},</if>
+            <if test="phone != null and phone != ''">phone = #{phone},</if>
         </trim>
         where id = #{id}
     </update>

intc-modules/intc-health/src/main/resources/mapper/health/HealthProcessRecordMapper.xml

@@ -38,8 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             hr."name" as health_record_name
         from
             health_process_record a
-                left join health_person hp on
-                hp.id = a.person_id
+                inner join health_person hp on
+                hp.id = a.person_id and hp.del_flag = '0'
                 left join health_record hr on
                 hr.id = a.health_record_id</sql>
 

intc-modules/intc-health/src/main/resources/mapper/health/HealthRecordMapper.xml

@@ -47,8 +47,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         hp."name" as person_name
         from
         health_record a
-        left join health_person hp on
-        hp.id = a.person_id
+        inner join health_person hp on
+        hp.id = a.person_id and hp.del_flag = '0'
     </sql>
 
     <select id="selectHealthRecordList" parameterType="HealthRecordDto" resultMap="HealthRecordResult">

intc-modules/intc-health/src/main/resources/mapper/health/HealthTemperatureRecordMapper.xml

@@ -37,8 +37,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         hr."name" as health_record_name
         from
         health_temperature_record a
-        left join health_person hp on
-        hp.id = a.person_id
+        inner join health_person hp on
+        hp.id = a.person_id and hp.del_flag = '0'
         left join health_record hr on
         hr.id = a.health_record_id
     </sql>

intc-modules/intc-health/src/main/resources/mapper/health/MedicationPlanMapper.xml

@@ -26,6 +26,7 @@
         <result property="status" column="status"/>
         <result property="todayTotal" column="today_total"/>
         <result property="todayCompleted" column="today_completed"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
 
@@ -35,11 +36,11 @@
                a.medicine_name, a.specification, a.dosage_per_time, a.dosage_unit,
                a.frequency_type, a.frequency_config, a.time_slots, a.start_date, a.end_date,
                a.remind_enabled, a.remind_advance_min, a.notify_family, a.family_member_ids,
-               a.status, a.create_time,
+               a.status, a.create_by, a.create_time,
                (select count(1) from medication_task t where t.plan_id = a.id and t.del_flag = 0 and t.planned_date = current_date) as today_total,
                (select count(1) from medication_task t where t.plan_id = a.id and t.del_flag = 0 and t.planned_date = current_date and t.status = 1) as today_completed
         from medication_plan a
-        left join health_person p on a.person_id = p.id
+        inner join health_person p on a.person_id = p.id and p.del_flag = '0'
         left join chronic_disease_record c on a.chronic_disease_id = c.id
     </sql>
 
@@ -173,4 +174,4 @@
         update medication_plan set del_flag = 1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">#{id}</foreach>
     </update>
-</mapper>
+</mapper>

intc-modules/intc-health/src/main/resources/mapper/health/MedicationTaskMapper.xml

@@ -29,7 +29,7 @@
                a.remind_status, a.remind_time, a.create_time
         from medication_task a
         left join medication_plan p on a.plan_id = p.id
-        left join health_person m on a.person_id = m.id
+        inner join health_person m on a.person_id = m.id and m.del_flag = '0'
     </sql>
 
     <select id="selectById" parameterType="Long" resultMap="MedicationTaskResult">
@@ -118,6 +118,7 @@
     <select id="countByPlanAndDate" resultType="int">
         select count(1) from medication_task
         where del_flag = 0 and plan_id = #{planId} and planned_date = #{date}
+        and exists (select 1 from health_person hp where hp.id = person_id and hp.del_flag = '0')
     </select>
 
     <delete id="deleteByPlanAndDate">
@@ -128,12 +129,14 @@
     <select id="countCompletedByPlanAndDate" resultType="int">
         select count(1) from medication_task
         where del_flag = 0 and plan_id = #{planId} and planned_date = #{date} and status = 1
+        and exists (select 1 from health_person hp where hp.id = person_id and hp.del_flag = '0')
     </select>
 
     <update id="markExpired">
         update medication_task
         set status = 2, update_time = current_timestamp
         where del_flag = 0 and status = 0
+        and exists (select 1 from health_person hp where hp.id = person_id and hp.del_flag = '0')
         and (planned_date || ' ' || planned_time)::timestamp &lt; #{expireThreshold}
     </update>
 
@@ -159,6 +162,7 @@
                 then 1 else 0 end) as ontime_tasks
         from medication_task
         where del_flag = 0
+        and exists (select 1 from health_person hp where hp.id = person_id and hp.del_flag = '0')
         <if test="personId != null"> and person_id = #{personId}</if>
         <if test="startDate != null"> and planned_date &gt;= #{startDate}</if>
         <if test="endDate != null"> and planned_date &lt;= #{endDate}</if>
@@ -176,6 +180,7 @@
                 then 1 else 0 end) as ontime_tasks
         from medication_task
         where del_flag = 0
+        and exists (select 1 from health_person hp where hp.id = person_id and hp.del_flag = '0')
         <if test="personId != null"> and person_id = #{personId}</if>
         <if test="startDate != null"> and planned_date &gt;= #{startDate}</if>
         <if test="endDate != null"> and planned_date &lt;= #{endDate}</if>
@@ -194,10 +199,11 @@
                 then 1 else 0 end) as ontime_tasks
         from medication_task
         where del_flag = 0
+        and exists (select 1 from health_person hp where hp.id = person_id and hp.del_flag = '0')
         <if test="personId != null"> and person_id = #{personId}</if>
         <if test="startDate != null"> and planned_date &gt;= #{startDate}</if>
         <if test="endDate != null"> and planned_date &lt;= #{endDate}</if>
         group by extract(hour from planned_time)
         order by hour
     </select>
-</mapper>
+</mapper>

intc-modules/intc-health/src/main/resources/mapper/health/StatisticAnalysisMapper.xml

@@ -54,12 +54,13 @@
         health_mar_record hmr
         left join health_medicine_basic hmb on
         hmb.id = hmr.medicine_id
-        left join health_person hp on
-        hp.id = hmr.person_id
+        inner join health_person hp on
+        hp.id = hmr.person_id and hp.del_flag = '0'
         left join health_record hr on
         hr.id = hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hmr.dosing_time, 'yyyy-MM-dd')
             </if>
@@ -92,6 +93,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -112,6 +114,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -133,6 +136,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -155,6 +159,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -180,6 +185,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -204,6 +210,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -225,6 +232,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0' and hmr.temperature>=37
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -241,89 +249,340 @@
     <select id="selectStaticPersonList" parameterType="HealthRecordDto" resultType="com.intc.health.domain.vo.HealthStaticPersonVo">
         select
         hp."name" as personName,
-        (
-        select
-        count(*)
-        from
-        health_record hr
-        where
-        hr.person_id = hp.id
-        and hr.del_flag = '0') as healthRecordCount,
-        (
-        select
-        count(distinct hdr.hospital_name)
-        from
-        health_doctor_record hdr
-        where
-        hdr.person_id = hp.id
-        and hdr.del_flag = '0') as hospitalCount,
-        (
-        select
-        count(distinct hdr.doctor)
-        from
-        health_doctor_record hdr
-        where
-        hdr.person_id = hp.id
-        and hdr.del_flag = '0') as doctorTotalCount,
-        (
-        select
-        count(*)
-        from
-        health_doctor_record hdr
-        where
-        hdr.person_id = hp.id
-        and hdr.del_flag = '0') as doctorCount,
-        (
-        select
-        case when  sum(hdr.total_cost) is null then 0
-        else sum(hdr.total_cost)
-        end
-        from
-        health_doctor_record hdr
-        where
-        hdr.person_id = hp.id
-        and hdr.del_flag = '0') as doctorCost,
-        (
-        select
-        count(distinct to_char(hmr.dosing_time, 'yyyy-MM-dd') )
-        from
-        health_mar_record hmr
-        where
-        hmr.person_id = hp.id
-        and hmr.del_flag = '0') as marDayCount,
-        (
-        select
-        count(*)
-        from
-        health_mar_record hmr
-        where
-        hmr.person_id = hp.id
-        and hmr.del_flag = '0') as marCount,
-        (
-        select
-        count(distinct hmr."medicine_id")
-        from
-        health_mar_record hmr
-        where
-        hmr.person_id = hp.id
-        and hmr.del_flag = '0') as marTypeCount,
-
-        (
-        select
-        count(distinct to_char(hmr.measure_time, 'yyyy-MM-dd') )
-        from
-        health_temperature_record hmr
-        where
-        hmr.person_id = hp.id
-        and hmr.temperature >= 37) as feverDayCount
+        coalesce(hr.healthRecordCount, 0) as healthRecordCount,
+        coalesce(hdr.hospitalCount, 0) as hospitalCount,
+        coalesce(hdr.doctorTotalCount, 0) as doctorTotalCount,
+        coalesce(hdr.doctorCount, 0) as doctorCount,
+        coalesce(hdr.doctorCost, 0) as doctorCost,
+        coalesce(hmr.marDayCount, 0) as marDayCount,
+        coalesce(hmr.marCount, 0) as marCount,
+        coalesce(hmr.marTypeCount, 0) as marTypeCount,
+        coalesce(htr.feverDayCount, 0) as feverDayCount
         from
         health_person hp
-        where 1=1
+        left join (
+            select
+            person_id,
+            count(*) as healthRecordCount
+            from health_record
+            where del_flag = '0'
+            group by person_id
+        ) hr on hr.person_id = hp.id
+        left join (
+            select
+            person_id,
+            count(distinct hospital_name) as hospitalCount,
+            count(distinct doctor) as doctorTotalCount,
+            count(*) as doctorCount,
+            coalesce(sum(total_cost), 0) as doctorCost
+            from health_doctor_record
+            where del_flag = '0'
+            group by person_id
+        ) hdr on hdr.person_id = hp.id
+        left join (
+            select
+            person_id,
+            count(distinct to_char(dosing_time, 'yyyy-MM-dd')) as marDayCount,
+            count(*) as marCount,
+            count(distinct medicine_id) as marTypeCount
+            from health_mar_record
+            where del_flag = '0'
+            group by person_id
+        ) hmr on hmr.person_id = hp.id
+        left join (
+            select
+            person_id,
+            count(distinct to_char(measure_time, 'yyyy-MM-dd')) as feverDayCount
+            from health_temperature_record
+            where del_flag = '0'
+            and temperature >= 37
+            group by person_id
+        ) htr on htr.person_id = hp.id
+        where hp.del_flag = '0'
+        <if test="personId != null "> and hp.id = #{personId}</if>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
         order by hp.ranking
     </select>
 
+    <select id="selectHealthScreenDoctorSummary" parameterType="HealthDoctorRecordDto" resultType="java.util.HashMap">
+        select
+        count(*) as "doctorCount",
+        coalesce(sum(a.total_cost), 0) as "doctorCost",
+        count(distinct a.hospital_name) as "hospitalCount",
+        count(distinct a.doctor) as "doctorTotalCount"
+        from health_doctor_record a
+        inner join health_person hp on hp.id = a.person_id and hp.del_flag = '0'
+        <where>
+            a.del_flag = '0'
+            <if test="endTime!=null and endTime !=''">
+                and a.visiting_time &lt;= to_date(#{endTime}, 'yyyy-MM-dd') + interval '1 day' - interval '1 second'
+            </if>
+            <if test="startTime!=null and startTime !=''">
+                and a.visiting_time &gt;= to_date(#{startTime}, 'yyyy-MM-dd')
+            </if>
+            <if test="healthRecordId != null"> and a.health_record_id = #{healthRecordId}</if>
+            <if test="personId != null "> and a.person_id = #{personId}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectHealthScreenPersonRankList" parameterType="HealthRecordDto" resultType="com.intc.health.domain.vo.HealthStaticPersonVo">
+        select
+        hp."name" as personName,
+        coalesce(hr.healthRecordCount, 0) as healthRecordCount,
+        coalesce(hdr.hospitalCount, 0) as hospitalCount,
+        coalesce(hdr.doctorTotalCount, 0) as doctorTotalCount,
+        coalesce(hdr.doctorCount, 0) as doctorCount,
+        coalesce(hdr.doctorCost, 0) as doctorCost,
+        coalesce(hmr.marDayCount, 0) as marDayCount,
+        coalesce(hmr.marCount, 0) as marCount,
+        coalesce(hmr.marTypeCount, 0) as marTypeCount,
+        coalesce(htr.feverDayCount, 0) as feverDayCount
+        from health_person hp
+        left join (
+            select person_id, count(*) as healthRecordCount
+            from health_record
+            where del_flag = '0'
+            group by person_id
+        ) hr on hr.person_id = hp.id
+        left join (
+            select
+            person_id,
+            count(distinct hospital_name) as hospitalCount,
+            count(distinct doctor) as doctorTotalCount,
+            count(*) as doctorCount,
+            coalesce(sum(total_cost), 0) as doctorCost
+            from health_doctor_record
+            where del_flag = '0'
+            group by person_id
+        ) hdr on hdr.person_id = hp.id
+        left join (
+            select
+            person_id,
+            count(distinct to_char(dosing_time, 'yyyy-MM-dd')) as marDayCount,
+            count(*) as marCount,
+            count(distinct medicine_id) as marTypeCount
+            from health_mar_record
+            where del_flag = '0'
+            group by person_id
+        ) hmr on hmr.person_id = hp.id
+        left join (
+            select
+            person_id,
+            count(distinct to_char(measure_time, 'yyyy-MM-dd')) as feverDayCount
+            from health_temperature_record
+            where del_flag = '0'
+            and temperature >= 37
+            group by person_id
+        ) htr on htr.person_id = hp.id
+        where hp.del_flag = '0'
+        <if test="personId != null "> and hp.id = #{personId}</if>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by
+        (
+            least(round(coalesce(htr.feverDayCount, 0) * 1.2), 35)
+            + least(round(coalesce(hdr.doctorCount, 0) * 2.5), 30)
+            + least(round(coalesce(hmr.marCount, 0) * 0.15), 12)
+            + least(coalesce(hr.healthRecordCount, 0) * 2, 10)
+            + least(round(coalesce(hdr.doctorCost, 0) / 1000), 13)
+        ) desc,
+        hp.ranking
+        limit 12
+    </select>
+
+    <select id="selectHealthScreenMedicineSummary" parameterType="HealthMarRecordDto" resultType="java.util.HashMap">
+        select
+        count(*) as "marCount",
+        count(distinct a.medicine_id) as "medicalTypeCount",
+        count(distinct to_char(a.dosing_time, 'yyyy-MM-dd')) as "marDayCount"
+        from health_mar_record a
+        inner join health_person hp on hp.id = a.person_id and hp.del_flag = '0'
+        <where>
+            a.del_flag = '0'
+            <if test="endTime!=null and endTime !=''">
+                and a.dosing_time &lt;= to_date(#{endTime}, 'yyyy-MM-dd') + interval '1 day' - interval '1 second'
+            </if>
+            <if test="startTime!=null and startTime !=''">
+                and a.dosing_time &gt;= to_date(#{startTime}, 'yyyy-MM-dd')
+            </if>
+            <if test="healthRecordId != null  and healthRecordId != ''"> and a.health_record_id = #{healthRecordId}</if>
+            <if test="personId != null "> and a.person_id = #{personId}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectHealthScreenTemperatureSummary" parameterType="HealthTemperatureRecordDto" resultType="java.util.HashMap">
+        select
+        count(*) as "temperatureTotalCount",
+        count(case when a.temperature &lt; 36.9 then 1 end) as "normalTempCount",
+        count(case when a.temperature &gt;= 36.9 and a.temperature &lt;= 37.5 then 1 end) as "lowerTempCount",
+        count(case when a.temperature &gt; 37.5 and a.temperature &lt; 38.5 then 1 end) as "middleTempCount",
+        count(case when a.temperature &gt;= 38.5 then 1 end) as "higherTempCount",
+        count(distinct case when a.temperature &gt;= 37 then to_char(a.measure_time, 'yyyy-MM-dd') end) as "feverDayCount"
+        from health_temperature_record a
+        inner join health_person hp on hp.id = a.person_id and hp.del_flag = '0'
+        <where>
+            a.del_flag = '0'
+            <if test="endTime!=null and endTime !=''">
+                and a.measure_time &lt;= to_date(#{endTime}, 'yyyy-MM-dd') + interval '1 day' - interval '1 second'
+            </if>
+            <if test="startTime!=null and startTime !=''">
+                and a.measure_time &gt;= to_date(#{startTime}, 'yyyy-MM-dd')
+            </if>
+            <if test="healthRecordId != null "> and a.health_record_id = #{healthRecordId}</if>
+            <if test="personId != null "> and a.person_id = #{personId}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectHealthScreenActivitySummary" parameterType="HealthActivityDto" resultType="java.util.HashMap">
+        select
+        count(*) as "activityCount",
+        coalesce(sum(a.total_cost), 0) as "activityCost"
+        from health_activity a
+        <where>
+            a.del_flag = '0'
+            <if test="endTime != null "> and a.start_time &lt;= #{endTime}</if>
+            <if test="startTime != null "> and a.start_time &gt;= #{startTime}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+
+    <select id="selectHealthScreenActivityList" parameterType="HealthActivityDto" resultType="com.intc.health.domain.vo.HealthActivityVo">
+        select
+        a.id,
+        a.name,
+        a.type,
+        a.place,
+        a.activity_volume as activityVolume,
+        a.exercise_time as exerciseTime,
+        a.start_time as startTime,
+        a.end_time as endTime,
+        a.harvest,
+        a.foods,
+        a.total_cost as totalCost,
+        a.partner,
+        a.cost_detail as costDetail
+        from health_activity a
+        <where>
+            a.del_flag = '0'
+            <if test="endTime != null "> and a.start_time &lt;= #{endTime}</if>
+            <if test="startTime != null "> and a.start_time &gt;= #{startTime}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by a.start_time desc
+        limit 50
+    </select>
+
+    <select id="selectHealthScreenDoctorList" parameterType="HealthDoctorRecordDto" resultType="com.intc.health.domain.vo.HealthDoctorRecordVo">
+        select
+        a.id,
+        a.hospital_name as hospitalName,
+        a.departments,
+        a.doctor,
+        a.type,
+        a.health_record_id as healthRecordId,
+        a.visiting_time as visitingTime,
+        a.prescribe,
+        a.diagnosis,
+        a.person_id as personId,
+        a.total_cost as totalCost,
+        hp."name" as personName,
+        hr."name" as healthRecordName
+        from health_doctor_record a
+        inner join health_person hp on hp.id = a.person_id and hp.del_flag = '0'
+        left join health_record hr on hr.id = a.health_record_id
+        <where>
+            a.del_flag = '0'
+            <if test="endTime!=null and endTime !=''">
+                and a.visiting_time &lt;= to_date(#{endTime}, 'yyyy-MM-dd') + interval '1 day' - interval '1 second'
+            </if>
+            <if test="startTime!=null and startTime !=''">
+                and a.visiting_time &gt;= to_date(#{startTime}, 'yyyy-MM-dd')
+            </if>
+            <if test="healthRecordId != null"> and a.health_record_id = #{healthRecordId}</if>
+            <if test="personId != null "> and a.person_id = #{personId}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by a.visiting_time desc
+        limit 50
+    </select>
+
+    <select id="selectHealthScreenMedicineList" parameterType="HealthMarRecordDto" resultType="com.intc.health.domain.vo.HealthMarRecordVo">
+        select
+        a.id,
+        a.type,
+        a.health_record_id as healthRecordId,
+        a.dosing_time as dosingTime,
+        a.dosage,
+        a.person_id as personId,
+        a.resource,
+        a.place,
+        a.medicine_id as medicineId,
+        a.unit,
+        a.content,
+        a.content_unit as contentUnit,
+        hp."name" as personName,
+        hr."name" as healthRecordName,
+        hmb.short_name || '-' || hmb.brand || '(' || hmb.packaging || ')' as name
+        from health_mar_record a
+        inner join health_person hp on hp.id = a.person_id and hp.del_flag = '0'
+        left join health_record hr on hr.id = a.health_record_id
+        left join health_medicine_basic hmb on hmb.id = a.medicine_id
+        <where>
+            a.del_flag = '0'
+            <if test="endTime!=null and endTime !=''">
+                and a.dosing_time &lt;= to_date(#{endTime}, 'yyyy-MM-dd') + interval '1 day' - interval '1 second'
+            </if>
+            <if test="startTime!=null and startTime !=''">
+                and a.dosing_time &gt;= to_date(#{startTime}, 'yyyy-MM-dd')
+            </if>
+            <if test="healthRecordId != null  and healthRecordId != ''"> and a.health_record_id = #{healthRecordId}</if>
+            <if test="personId != null "> and a.person_id = #{personId}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by a.dosing_time desc
+        limit 50
+    </select>
+
+    <select id="selectHealthScreenTemperatureList" parameterType="HealthTemperatureRecordDto" resultType="com.intc.health.domain.vo.HealthTemperatureRecordVo">
+        select
+        a.id,
+        a.health_record_id as healthRecordId,
+        a.measure_time as measureTime,
+        a.temperature,
+        a.person_id as personId,
+        hp."name" as personName,
+        hr."name" as healthRecordName
+        from health_temperature_record a
+        inner join health_person hp on hp.id = a.person_id and hp.del_flag = '0'
+        left join health_record hr on hr.id = a.health_record_id
+        <where>
+            a.del_flag = '0'
+            <if test="endTime!=null and endTime !=''">
+                and a.measure_time &lt;= to_date(#{endTime}, 'yyyy-MM-dd') + interval '1 day' - interval '1 second'
+            </if>
+            <if test="startTime!=null and startTime !=''">
+                and a.measure_time &gt;= to_date(#{startTime}, 'yyyy-MM-dd')
+            </if>
+            <if test="healthRecordId != null "> and a.health_record_id = #{healthRecordId}</if>
+            <if test="personId != null "> and a.person_id = #{personId}</if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by a.measure_time desc
+        limit 1000
+    </select>
+
     <select id="selectHealthRecordCostList" parameterType="HealthRecordDto" resultType="com.intc.health.domain.vo.HealthRecordVo">
         select
         (
@@ -344,6 +603,7 @@
         health_record hr
         <where>
             hr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -445,6 +705,7 @@
 
         <where>
             hr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -469,6 +730,7 @@
                 hr.id = hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -490,6 +752,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -511,6 +774,7 @@
         left join health_record hr on hr.id=hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hr.occur_time, 'yyyy-MM-dd')
             </if>
@@ -534,6 +798,7 @@
         hr.id = hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hmr.visiting_time, 'yyyy-MM-dd')
             </if>
@@ -560,6 +825,7 @@
         hr.id = hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hmr.visiting_time, 'yyyy-MM-dd')
             </if>
@@ -585,6 +851,7 @@
         hr.id = hmr.health_record_id
         <where>
             hmr.del_flag = '0'
+            and exists (select 1 from health_person hp where hp.id = hmr.person_id and hp.del_flag = '0')
             <if test="endTime!=null and endTime !=''">
                 and #{endTime}>=to_char(hmr.visiting_time, 'yyyy-MM-dd')
             </if>
@@ -804,6 +1071,7 @@
         from
             health_milk_powder_record hmpr
         where hmpr.del_flag ='0'
+        and exists (select 1 from health_person hp where hp.id = hmpr.person_id and hp.del_flag = '0')
         <if test="personId != null "> and hmpr.person_id = #{personId}</if>
         <if test="endTime!=null and endTime !=''">
             and #{endTime}>=to_char(hmpr.suckles_time, 'yyyy-MM-dd')
@@ -820,4 +1088,4 @@
             to_char(hmpr.suckles_time,
                     'yyyy-MM-dd') desc
 </select>
-</mapper>
+</mapper>

intc-modules/intc-invest/src/main/java/com/intc/invest/controller/StatisticAnalysisController.java

@@ -3,9 +3,12 @@ package com.intc.invest.controller;
 import com.intc.common.core.web.controller.BaseController;
 import com.intc.common.core.web.domain.AjaxResult;
 import com.intc.common.core.web.page.TableDataInfo;
+import com.intc.invest.domain.dto.AccountDealLocationDto;
 import com.intc.invest.domain.dto.AccountsDto;
 import com.intc.invest.domain.dto.AnalysisDto;
 import com.intc.invest.domain.vo.AccountCalendarVo;
+import com.intc.invest.domain.vo.AccountDealLocationVo;
+import com.intc.invest.domain.vo.AccountsDealRecordVo;
 import com.intc.invest.domain.vo.AccountsVo;
 import com.intc.invest.domain.vo.BankCardStatisticsVo;
 import com.intc.invest.domain.vo.OpenCardVo;
@@ -209,4 +212,36 @@ public class StatisticAnalysisController extends BaseController {
         return AjaxResult.success(list);
     }
 
+    /**
+     * 查询交易地点消费地图概览
+     */
+    @ApiOperation(value="查询交易地点消费地图概览")
+    @GetMapping("/accountDealLocationOverview")
+    public AjaxResult getAccountDealLocationOverview(AccountDealLocationDto accountDealLocationDto)
+    {
+        return AjaxResult.success(iStatisticAnalysisService.getAccountDealLocationOverview(accountDealLocationDto));
+    }
+
+    /**
+     * 查询交易地点消费地图聚合点位
+     */
+    @ApiOperation(value="查询交易地点消费地图聚合点位",response = AccountDealLocationVo.class)
+    @GetMapping("/accountDealLocationPoints")
+    public AjaxResult getAccountDealLocationPoints(AccountDealLocationDto accountDealLocationDto)
+    {
+        List<AccountDealLocationVo> list = iStatisticAnalysisService.getAccountDealLocationPoints(accountDealLocationDto);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 查询交易地点消费明细
+     */
+    @ApiOperation(value="查询交易地点消费明细",response = AccountsDealRecordVo.class)
+    @GetMapping("/accountDealLocationRecords")
+    public AjaxResult getAccountDealLocationRecords(AccountDealLocationDto accountDealLocationDto)
+    {
+        List<AccountsDealRecordVo> list = iStatisticAnalysisService.getAccountDealLocationRecords(accountDealLocationDto);
+        return AjaxResult.success(list);
+    }
+
 }

intc-modules/intc-invest/src/main/java/com/intc/invest/domain/AccountsDealRecord.java

@@ -74,6 +74,26 @@ public class AccountsDealRecord extends BaseEntity
     @Excel(name = "交易子类别")
     private String childCategory;
 
+    /** 地点名称 */
+    @ApiModelProperty(value="地点名称")
+    @Excel(name = "地点名称")
+    private String locationName;
+
+    /** 地点地址 */
+    @ApiModelProperty(value="地点地址")
+    @Excel(name = "地点地址")
+    private String locationAddress;
+
+    /** 经度 */
+    @ApiModelProperty(value="经度")
+    @Excel(name = "经度")
+    private Double longitude;
+
+    /** 纬度 */
+    @ApiModelProperty(value="纬度")
+    @Excel(name = "纬度")
+    private Double latitude;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -93,6 +113,10 @@ public class AccountsDealRecord extends BaseEntity
                 .append("transferRecordId", getTransferRecordId())
                 .append("currentBalance", getCurrentBalance())
                 .append("childCategory", getChildCategory())
+                .append("locationName", getLocationName())
+                .append("locationAddress", getLocationAddress())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
             .toString();
     }
 }

intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/AccountDealLocationDto.java

@@ -0,0 +1,60 @@
+package com.intc.invest.domain.dto;
+
+import com.intc.common.core.web.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 交易地点消费地图查询对象
+ *
+ * @author tianyongbao
+ */
+@ApiModel("交易地点消费地图查询对象")
+@Data
+public class AccountDealLocationDto extends BaseEntity implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 开始日期 */
+    @ApiModelProperty(value="开始日期")
+    private String startTime;
+
+    /** 结束日期 */
+    @ApiModelProperty(value="结束日期")
+    private String endTime;
+
+    /** 账户 */
+    @ApiModelProperty(value="账户")
+    private Long accountId;
+
+    /** 交易类型 */
+    @ApiModelProperty(value="交易类型")
+    private String dealType;
+
+    /** 交易类别 */
+    @ApiModelProperty(value="交易类别")
+    private String dealCategory;
+
+    /** 交易子类别 */
+    @ApiModelProperty(value="交易子类别")
+    private String childCategory;
+
+    /** 地点名称 */
+    @ApiModelProperty(value="地点名称")
+    private String locationName;
+
+    /** 地点地址 */
+    @ApiModelProperty(value="地点地址")
+    private String locationAddress;
+
+    /** 经度 */
+    @ApiModelProperty(value="经度")
+    private Double longitude;
+
+    /** 纬度 */
+    @ApiModelProperty(value="纬度")
+    private Double latitude;
+}

intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/AccountDealLocationVo.java

@@ -0,0 +1,47 @@
+package com.intc.invest.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * 交易地点消费地图聚合对象
+ *
+ * @author tianyongbao
+ */
+@ApiModel("交易地点消费地图聚合对象")
+@Data
+public class AccountDealLocationVo
+{
+    /** 地点聚合键 */
+    private String locationKey;
+
+    /** 地点名称 */
+    private String locationName;
+
+    /** 地点地址 */
+    private String locationAddress;
+
+    /** 经度 */
+    private Double longitude;
+
+    /** 纬度 */
+    private Double latitude;
+
+    /** 消费金额 */
+    private Double totalAmount;
+
+    /** 交易笔数 */
+    private Long dealCount;
+
+    /** 最近交易时间 */
+    private String latestTime;
+
+    /** 关联账户 */
+    private String accountNames;
+
+    /** 交易类别 */
+    private String dealCategory;
+
+    /** 交易子类别 */
+    private String childCategory;
+}

intc-modules/intc-invest/src/main/java/com/intc/invest/mapper/StatisticAnalysisMapper.java

@@ -1,6 +1,7 @@
 package com.intc.invest.mapper;
 
 import com.intc.common.datascope.annotation.DataScope;
+import com.intc.invest.domain.dto.AccountDealLocationDto;
 import com.intc.invest.domain.dto.AccountsDealRecordDto;
 import com.intc.invest.domain.dto.AccountsDto;
 import com.intc.invest.domain.dto.BankCardLendDto;
@@ -122,4 +123,22 @@ public interface StatisticAnalysisMapper {
     @DataScope(businessAlias = "a")
     public List<BankCardStatisticsVo> selectBankCardStatistics(AccountsDto accountsDto);
 
+    /**
+     * 查询交易地点消费地图聚合点位
+     *
+     * @param accountDealLocationDto 查询条件
+     * @return 地点聚合点位集合
+     */
+    @DataScope(businessAlias = "a")
+    public List<AccountDealLocationVo> selectAccountDealLocationPoints(AccountDealLocationDto accountDealLocationDto);
+
+    /**
+     * 查询交易地点消费明细
+     *
+     * @param accountDealLocationDto 查询条件
+     * @return 交易明细集合
+     */
+    @DataScope(businessAlias = "a")
+    public List<AccountsDealRecordVo> selectAccountDealLocationRecords(AccountDealLocationDto accountDealLocationDto);
+
 }

intc-modules/intc-invest/src/main/java/com/intc/invest/service/IStatisticAnalysisService.java

@@ -1,8 +1,11 @@
 package com.intc.invest.service;
 
+import com.intc.invest.domain.dto.AccountDealLocationDto;
 import com.intc.invest.domain.dto.AccountsDto;
 import com.intc.invest.domain.dto.AnalysisDto;
 import com.intc.invest.domain.vo.AccountCalendarVo;
+import com.intc.invest.domain.vo.AccountDealLocationVo;
+import com.intc.invest.domain.vo.AccountsDealRecordVo;
 import com.intc.invest.domain.vo.AccountsVo;
 import com.intc.invest.domain.vo.BankCardStatisticsVo;
 import com.intc.invest.domain.vo.CreditReportAnalysisVO;
@@ -78,4 +81,28 @@ public interface IStatisticAnalysisService {
      */
     public List<BankCardStatisticsVo> getBankCardStatistics();
 
+    /**
+     * 查询交易地点消费地图概览
+     *
+     * @param accountDealLocationDto 查询条件
+     * @return 概览数据
+     */
+    public Map<String, Object> getAccountDealLocationOverview(AccountDealLocationDto accountDealLocationDto);
+
+    /**
+     * 查询交易地点消费地图聚合点位
+     *
+     * @param accountDealLocationDto 查询条件
+     * @return 地点聚合点位集合
+     */
+    public List<AccountDealLocationVo> getAccountDealLocationPoints(AccountDealLocationDto accountDealLocationDto);
+
+    /**
+     * 查询交易地点消费明细
+     *
+     * @param accountDealLocationDto 查询条件
+     * @return 交易明细集合
+     */
+    public List<AccountsDealRecordVo> getAccountDealLocationRecords(AccountDealLocationDto accountDealLocationDto);
+
 }

intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/StatisticAnalysisImpl.java

@@ -3429,4 +3429,71 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
     public List<BankCardStatisticsVo> getBankCardStatistics() {
         return statisticAnalysisMapper.selectBankCardStatistics(new AccountsDto());
     }
+
+    @Override
+    public Map<String, Object> getAccountDealLocationOverview(AccountDealLocationDto accountDealLocationDto) {
+        if (accountDealLocationDto == null) {
+            accountDealLocationDto = new AccountDealLocationDto();
+        }
+        List<AccountDealLocationVo> locationList = getAccountDealLocationPoints(accountDealLocationDto);
+
+        double totalAmount = 0;
+        long dealCount = 0;
+        double maxAmount = 0;
+        String latestTime = "";
+
+        for (AccountDealLocationVo vo : locationList) {
+            double amount = vo.getTotalAmount() == null ? 0 : vo.getTotalAmount();
+            totalAmount += amount;
+            dealCount += vo.getDealCount() == null ? 0 : vo.getDealCount();
+            if (amount > maxAmount) {
+                maxAmount = amount;
+            }
+            if (StringUtils.isNotEmpty(vo.getLatestTime()) && (StringUtils.isEmpty(latestTime) || vo.getLatestTime().compareTo(latestTime) > 0)) {
+                latestTime = vo.getLatestTime();
+            }
+        }
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("totalAmount", totalAmount);
+        map.put("dealCount", dealCount);
+        map.put("locationCount", locationList.size());
+        map.put("maxAmount", maxAmount);
+        map.put("latestTime", latestTime);
+        map.put("topLocations", locationList.stream().limit(10).collect(Collectors.toList()));
+        return map;
+    }
+
+    @Override
+    public List<AccountDealLocationVo> getAccountDealLocationPoints(AccountDealLocationDto accountDealLocationDto) {
+        if (accountDealLocationDto == null) {
+            accountDealLocationDto = new AccountDealLocationDto();
+        }
+        initAccountDealLocationDefaultQuery(accountDealLocationDto);
+        return statisticAnalysisMapper.selectAccountDealLocationPoints(accountDealLocationDto);
+    }
+
+    @Override
+    public List<AccountsDealRecordVo> getAccountDealLocationRecords(AccountDealLocationDto accountDealLocationDto) {
+        if (accountDealLocationDto == null) {
+            accountDealLocationDto = new AccountDealLocationDto();
+        }
+        initAccountDealLocationDefaultQuery(accountDealLocationDto);
+        List<AccountsDealRecordVo> list = statisticAnalysisMapper.selectAccountDealLocationRecords(accountDealLocationDto);
+        for (AccountsDealRecordVo vo : list) {
+            if (StringUtils.isNotEmpty(vo.getDealCategory())) {
+                vo.setDealCategoryName(DictUtils.getDictLabel("deal_category", vo.getDealCategory()));
+            }
+            if (StringUtils.isNotEmpty(vo.getChildCategory()) && "1".equals(vo.getDealCategory())) {
+                vo.setChildCategoryName(DictUtils.getDictLabel("daily_expenses", vo.getChildCategory()));
+            }
+        }
+        return list;
+    }
+
+    private void initAccountDealLocationDefaultQuery(AccountDealLocationDto accountDealLocationDto) {
+        if (accountDealLocationDto != null && StringUtils.isEmpty(accountDealLocationDto.getDealType())) {
+            accountDealLocationDto.setDealType("2");
+        }
+    }
 }

intc-modules/intc-invest/src/main/resources/mapper/invest/AccountsDealRecordMapper.xml

@@ -22,6 +22,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="transferRecordId"    column="transfer_record_id"    />
         <result property="currentBalance"    column="current_balance"    />
         <result property="childCategory"    column="child_category"    />
+        <result property="locationName"    column="location_name"    />
+        <result property="locationAddress"    column="location_address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
     </resultMap>
 
     <sql id="selectAccountsDealRecordVo">
@@ -42,6 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.deal_category,
         a.current_balance,
         a.child_category,
+        a.location_name,
+        a.location_address,
+        a.longitude,
+        a.latitude,
         CONCAT(a2."name", '（', right(a2.code, 4), '）') as account_name
         from
         accounts_deal_record a
@@ -106,6 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="transferRecordId != null and transferRecordId != ''">transfer_record_id,</if>
             <if test="currentBalance != null">current_balance,</if>
             <if test="childCategory != null">child_category,</if>
+            <if test="locationName != null">location_name,</if>
+            <if test="locationAddress != null">location_address,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -124,6 +136,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="transferRecordId != null and transferRecordId != ''">#{transferRecordId},</if>
             <if test="currentBalance != null">#{currentBalance},</if>
             <if test="childCategory != null">#{childCategory},</if>
+            <if test="locationName != null">#{locationName},</if>
+            <if test="locationAddress != null">#{locationAddress},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
          </trim>
     </insert>
 
@@ -145,6 +161,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="transferRecordId != null and transferRecordId != ''">transfer_record_id = #{transferRecordId},</if>
             <if test="currentBalance != null ">current_balance = #{currentBalance},</if>
             <if test="childCategory != null ">child_category = #{childCategory},</if>
+            <if test="locationName != null">location_name = #{locationName},</if>
+            <if test="locationAddress != null">location_address = #{locationAddress},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
         </trim>
         where id = #{id}
     </update>

intc-modules/intc-invest/src/main/resources/mapper/invest/StatisticAnalysisMapper.xml

@@ -68,6 +68,22 @@
         <result property="transferRecordId"    column="transfer_record_id"    />
         <result property="currentBalance"    column="current_balance"    />
         <result property="childCategory"    column="child_category"    />
+        <result property="locationName"    column="location_name"    />
+        <result property="locationAddress"    column="location_address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+    </resultMap>
+
+    <resultMap type="AccountDealLocationVo" id="AccountDealLocationResult">
+        <result property="locationKey"    column="location_key"    />
+        <result property="locationName"    column="location_name"    />
+        <result property="locationAddress"    column="location_address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="totalAmount"    column="total_amount"    />
+        <result property="dealCount"    column="deal_count"    />
+        <result property="latestTime"    column="latest_time"    />
+        <result property="accountNames"    column="account_names"    />
     </resultMap>
 
     <select id="selectAccountsOutInList" parameterType="AccountsDealRecordDto" resultMap="AccountsDealRecordResult">
@@ -1026,4 +1042,102 @@
             b.bank_name
     </select>
 
-</mapper>
+    <sql id="accountDealLocationWhere">
+        a.del_flag = '0'
+        and a.longitude is not null
+        and a.latitude is not null
+        <if test="endTime != null and endTime != ''">
+            and #{endTime} &gt;= to_char(a.create_time, 'yyyy-MM-dd')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and to_char(a.create_time, 'yyyy-MM-dd') &gt;= #{startTime}
+        </if>
+        <if test="accountId != null">
+            and a.account_id = #{accountId}
+        </if>
+        <if test="dealType != null and dealType != ''">
+            and a.deal_type = #{dealType}
+        </if>
+        <if test="dealCategory != null and dealCategory != ''">
+            and a.deal_category = #{dealCategory}
+        </if>
+        <if test="childCategory != null and childCategory != ''">
+            and a.child_category = #{childCategory}
+        </if>
+        <if test="locationName != null and locationName != ''">
+            and a.location_name like '%' || #{locationName} || '%'
+        </if>
+        <if test="locationAddress != null and locationAddress != ''">
+            and a.location_address like '%' || #{locationAddress} || '%'
+        </if>
+    </sql>
+
+    <select id="selectAccountDealLocationPoints" parameterType="AccountDealLocationDto" resultMap="AccountDealLocationResult">
+        select
+            concat(round(a.longitude::numeric, 5), '_', round(a.latitude::numeric, 5)) as location_key,
+            COALESCE(NULLIF(max(a.location_name), ''), NULLIF(max(a.location_address), ''), concat(round(a.longitude::numeric, 5), ',', round(a.latitude::numeric, 5))) as location_name,
+            max(a.location_address) as location_address,
+            round(a.longitude::numeric, 5)::float8 as longitude,
+            round(a.latitude::numeric, 5)::float8 as latitude,
+            COALESCE(sum(a.amount), 0) as total_amount,
+            count(1) as deal_count,
+            to_char(max(a.create_time), 'yyyy-MM-dd HH24:mi:ss') as latest_time,
+            string_agg(distinct COALESCE(ac."name", ''), '、') as account_names
+        from
+            accounts_deal_record a
+            left join accounts ac on ac.id = a.account_id
+        <where>
+            <include refid="accountDealLocationWhere"/>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        group by
+            round(a.longitude::numeric, 5),
+            round(a.latitude::numeric, 5)
+        order by
+            sum(a.amount) desc
+    </select>
+
+    <select id="selectAccountDealLocationRecords" parameterType="AccountDealLocationDto" resultMap="AccountsDealRecordResult">
+        select
+            a.id,
+            a.name,
+            a.type,
+            a.account_id,
+            a.amount,
+            a.transfer_record_id,
+            a.deal_type,
+            a.create_by,
+            a.create_time,
+            a.update_by,
+            a.update_time,
+            a.del_flag,
+            a.remark,
+            a.deal_category,
+            a.current_balance,
+            a.child_category,
+            a.location_name,
+            a.location_address,
+            a.longitude,
+            a.latitude,
+            CONCAT(ac."name", '（', right(ac.code, 4), '）') as account_name
+        from
+            accounts_deal_record a
+            left join accounts ac on ac.id = a.account_id
+        <where>
+            <include refid="accountDealLocationWhere"/>
+            <if test="longitude != null">
+                and round(a.longitude::numeric, 5) = round(CAST(#{longitude} AS numeric), 5)
+            </if>
+            <if test="latitude != null">
+                and round(a.latitude::numeric, 5) = round(CAST(#{latitude} AS numeric), 5)
+            </if>
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+        order by
+            a.create_time desc
+        limit 100
+    </select>
+
+</mapper>