From 8821e0142251edbbc9bd6e78b3d67e894d5af4ff Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sat, 21 Mar 2026 10:51:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=85=A2=E6=80=A7=E7=97=85=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- intc-common/intc-common-core/pom.xml | 6 ++ .../ChronicDiseaseRecordController.java | 6 +- .../MedicationAdherenceController.java | 26 +++---- .../controller/MedicationPlanController.java | 2 +- .../controller/MedicationTaskController.java | 2 +- .../health/domain/ChronicDiseaseRecord.java | 7 +- .../intc/health/domain/MedicationPlan.java | 4 +- .../intc/health/domain/MedicationTask.java | 4 +- .../domain/dto/ChronicDiseaseRecordDto.java | 6 +- .../health/domain/dto/MedicationPlanDto.java | 2 +- .../health/domain/dto/MedicationTaskDto.java | 2 +- .../domain/vo/ChronicDiseaseRecordVo.java | 6 +- .../health/domain/vo/MedicationPlanVo.java | 4 +- .../health/domain/vo/MedicationTaskVo.java | 4 +- .../impl/MedicationPlanServiceImpl.java | 15 +++- .../intc/health/task/MedicationRemindJob.java | 4 +- .../intc/health/task/MedicationTaskJob.java | 3 +- .../health/ChronicDiseaseRecordMapper.xml | 36 ++++----- .../mapper/health/MedicationPlanMapper.xml | 78 +++++++++++++------ .../mapper/health/MedicationTaskMapper.xml | 24 +++--- 20 files changed, 140 insertions(+), 101 deletions(-) diff --git a/intc-common/intc-common-core/pom.xml b/intc-common/intc-common-core/pom.xml index 7ae2228..33431b0 100644 --- a/intc-common/intc-common-core/pom.xml +++ b/intc-common/intc-common-core/pom.xml @@ -145,6 +145,12 @@ mybatis-plus-extension 3.5.5 + + + org.postgresql + postgresql + provided + diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/controller/ChronicDiseaseRecordController.java b/intc-modules/intc-health/src/main/java/com/intc/health/controller/ChronicDiseaseRecordController.java index 06d3524..44e7e5b 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/controller/ChronicDiseaseRecordController.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/controller/ChronicDiseaseRecordController.java @@ -58,10 +58,10 @@ public class ChronicDiseaseRecordController extends BaseController */ @ApiOperation(value = "根据成员ID查询慢性疾病档案列表", response = ChronicDiseaseRecordVo.class) @RequiresPermissions("health:chronicDisease:list") - @GetMapping("/listByMember/{memberId}") - public AjaxResult listByMember(@PathVariable("memberId") Long memberId) + @GetMapping({"/listByPerson/{personId}", "/listByMember/{personId}"}) + public AjaxResult listByMember(@PathVariable("personId") Long personId) { - List list = chronicDiseaseRecordService.selectChronicDiseaseRecordByMemberId(memberId); + List list = chronicDiseaseRecordService.selectChronicDiseaseRecordByMemberId(personId); return success(list); } diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationAdherenceController.java b/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationAdherenceController.java index 3f02a8d..692df09 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationAdherenceController.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationAdherenceController.java @@ -21,7 +21,7 @@ import java.util.Map; * @date 2026-03-19 */ @RestController -@RequestMapping("/health/adherence") +@RequestMapping("/adherence") @Api(tags = "依从性统计") public class MedicationAdherenceController { @@ -31,52 +31,52 @@ public class MedicationAdherenceController { @GetMapping("/overall") @ApiOperation("获取总体依从性统计") public AjaxResult getOverallAdherence( - @RequestParam(required = false) Long memberId, + @RequestParam(required = false) Long personId, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) { - MedicationAdherenceVo vo = adherenceService.getOverallAdherence(memberId, startDate, endDate); + MedicationAdherenceVo vo = adherenceService.getOverallAdherence(personId, startDate, endDate); return AjaxResult.success(vo); } @GetMapping("/daily") @ApiOperation("获取每日依从性统计列表") public AjaxResult getDailyAdherenceList( - @RequestParam(required = false) Long memberId, + @RequestParam(required = false) Long personId, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) { - List list = adherenceService.getDailyAdherenceList(memberId, startDate, endDate); + List list = adherenceService.getDailyAdherenceList(personId, startDate, endDate); return AjaxResult.success(list); } @GetMapping("/calendar") @ApiOperation("获取日历视图数据") public AjaxResult getCalendarData( - @RequestParam(required = false) Long memberId, + @RequestParam(required = false) Long personId, @RequestParam String yearMonth) { - List list = adherenceService.getCalendarData(memberId, yearMonth); + List list = adherenceService.getCalendarData(personId, yearMonth); return AjaxResult.success(list); } @GetMapping("/timeSlot") @ApiOperation("获取各时段服药统计") public AjaxResult getTimeSlotAdherence( - @RequestParam(required = false) Long memberId, + @RequestParam(required = false) Long personId, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate, @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) { - Map map = adherenceService.getTimeSlotAdherence(memberId, startDate, endDate); + Map map = adherenceService.getTimeSlotAdherence(personId, startDate, endDate); return AjaxResult.success(map); } @GetMapping("/dashboard") @ApiOperation("获取仪表盘概览数据") - public AjaxResult getDashboard(@RequestParam(required = false) Long memberId) { + public AjaxResult getDashboard(@RequestParam(required = false) Long personId) { LocalDate today = LocalDate.now(); LocalDate weekAgo = today.minusDays(7); Map result = new java.util.HashMap<>(); - result.put("overall", adherenceService.getOverallAdherence(memberId, weekAgo, today)); - result.put("dailyTrend", adherenceService.getDailyAdherenceList(memberId, weekAgo, today)); - result.put("timeSlot", adherenceService.getTimeSlotAdherence(memberId, weekAgo, today)); + result.put("overall", adherenceService.getOverallAdherence(personId, weekAgo, today)); + result.put("dailyTrend", adherenceService.getDailyAdherenceList(personId, weekAgo, today)); + result.put("timeSlot", adherenceService.getTimeSlotAdherence(personId, weekAgo, today)); return AjaxResult.success(result); } diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationPlanController.java b/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationPlanController.java index 2949623..4f3ff56 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationPlanController.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationPlanController.java @@ -24,7 +24,7 @@ import java.util.List; * @date 2026-03-19 */ @RestController -@RequestMapping("/health/medicationPlan") +@RequestMapping("/medicationPlan") @Api(tags = "用药计划管理") public class MedicationPlanController extends BaseController { diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationTaskController.java b/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationTaskController.java index e1757e5..90b0fd5 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationTaskController.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/controller/MedicationTaskController.java @@ -23,7 +23,7 @@ import java.util.List; * @date 2026-03-19 */ @RestController -@RequestMapping("/health/medicationTask") +@RequestMapping("/medicationTask") @Api(tags = "服药任务管理") public class MedicationTaskController extends BaseController { diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseRecord.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseRecord.java index 6327f99..6591fd0 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseRecord.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/ChronicDiseaseRecord.java @@ -1,6 +1,6 @@ package com.intc.health.domain; -import com.intc.common.core.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -21,7 +21,7 @@ public class ChronicDiseaseRecord extends BaseEntity { private Long id; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("疾病名称") private String diseaseName; @@ -47,6 +47,9 @@ public class ChronicDiseaseRecord extends BaseEntity { @ApiModelProperty("备注说明") private String notes; + @ApiModelProperty("是否启用：1-启用 0-禁用") + private Integer isActive; + @ApiModelProperty("删除标记：0-正常 1-删除") private Integer delFlag; } \ No newline at end of file diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationPlan.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationPlan.java index 91d7287..76460b3 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationPlan.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationPlan.java @@ -1,7 +1,7 @@ package com.intc.health.domain; import com.fasterxml.jackson.databind.JsonNode; -import com.intc.common.core.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -25,7 +25,7 @@ public class MedicationPlan extends BaseEntity { private Long id; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("关联慢性疾病ID") private Long chronicDiseaseId; diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationTask.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationTask.java index 43a3c73..235e3cb 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationTask.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/MedicationTask.java @@ -1,6 +1,6 @@ package com.intc.health.domain; -import com.intc.common.core.domain.BaseEntity; +import com.intc.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -29,7 +29,7 @@ public class MedicationTask extends BaseEntity { private Long planId; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("药品名称") private String medicineName; diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/ChronicDiseaseRecordDto.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/ChronicDiseaseRecordDto.java index bbb2fcc..e2d8b76 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/ChronicDiseaseRecordDto.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/ChronicDiseaseRecordDto.java @@ -21,11 +21,7 @@ public class ChronicDiseaseRecordDto implements Serializable /** 关联成员ID */ @ApiModelProperty(value = "关联成员ID") - private Long memberId; - - /** 关联疾病ID */ - @ApiModelProperty(value = "关联疾病ID") - private Long diseaseId; + private Long personId; /** 疾病名称 */ @ApiModelProperty(value = "疾病名称") diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationPlanDto.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationPlanDto.java index f634a5e..bb49c58 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationPlanDto.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationPlanDto.java @@ -22,7 +22,7 @@ public class MedicationPlanDto { private Long id; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("关联慢性疾病ID") private Long chronicDiseaseId; diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationTaskDto.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationTaskDto.java index ef9fbbb..13a5a4d 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationTaskDto.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/MedicationTaskDto.java @@ -20,7 +20,7 @@ public class MedicationTaskDto { private Long planId; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("药品名称") private String medicineName; diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/ChronicDiseaseRecordVo.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/ChronicDiseaseRecordVo.java index f464114..dda41d7 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/ChronicDiseaseRecordVo.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/ChronicDiseaseRecordVo.java @@ -16,9 +16,7 @@ public class ChronicDiseaseRecordVo extends ChronicDiseaseRecord { private static final long serialVersionUID = 1L; - /** 疾病类型（来自health_diseases表） */ - private String diseaseType; + /** 成员姓名（来自health_person表） */ + private String personName; - /** 疾病症状（来自health_diseases表） */ - private String diseaseSymptom; } \ No newline at end of file diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationPlanVo.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationPlanVo.java index afbfb1a..91a9533 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationPlanVo.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationPlanVo.java @@ -23,10 +23,10 @@ public class MedicationPlanVo { private Long id; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("成员名称") - private String memberName; + private String personName; @ApiModelProperty("关联慢性疾病ID") private Long chronicDiseaseId; diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationTaskVo.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationTaskVo.java index 1f03a8f..52d0c33 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationTaskVo.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/MedicationTaskVo.java @@ -29,10 +29,10 @@ public class MedicationTaskVo { private String planName; @ApiModelProperty("关联成员ID") - private Long memberId; + private Long personId; @ApiModelProperty("成员名称") - private String memberName; + private String personName; @ApiModelProperty("药品名称") private String medicineName; diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/MedicationPlanServiceImpl.java b/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/MedicationPlanServiceImpl.java index e05e7b1..9d426ab 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/MedicationPlanServiceImpl.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/MedicationPlanServiceImpl.java @@ -1,5 +1,6 @@ package com.intc.health.service.impl; +import com.intc.common.core.exception.ServiceException; import com.intc.common.core.utils.DateUtils; import com.intc.common.security.utils.SecurityUtils; import com.intc.health.domain.MedicationPlan; @@ -43,6 +44,18 @@ public class MedicationPlanServiceImpl implements IMedicationPlanService { @Override public int insert(MedicationPlan plan) { + if (plan.getPersonId() == null) { + throw new ServiceException("关联成员ID不能为空"); + } + if (plan.getMedicineName() == null || plan.getMedicineName().isEmpty()) { + throw new ServiceException("药品名称不能为空"); + } + if (plan.getFrequencyType() == null) { + throw new ServiceException("频次类型不能为空"); + } + if (plan.getStartDate() == null) { + throw new ServiceException("开始日期不能为空"); + } plan.setStatus(1); // 默认执行中 plan.setDelFlag(0); plan.setCreateBy(SecurityUtils.getUsername()); @@ -91,4 +104,4 @@ public class MedicationPlanServiceImpl implements IMedicationPlanService { plan.setUpdateTime(DateUtils.getNowDate()); return planMapper.update(plan); } -} \ No newline at end of file +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationRemindJob.java b/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationRemindJob.java index 616bbc3..cd8f689 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationRemindJob.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationRemindJob.java @@ -60,7 +60,7 @@ public class MedicationRemindJob { */ private void sendReminder(MedicationTaskVo task) { log.info("发送提醒: 成员={}, 药品={}, 计划时间={} {}", - task.getMemberName(), task.getMedicineName(), + task.getPersonName(), task.getMedicineName(), task.getPlannedDate(), task.getPlannedTime()); // TODO: 实现消息推送 @@ -106,7 +106,7 @@ public class MedicationRemindJob { */ private void sendOverdueReminder(MedicationTaskVo task) { log.warn("超时未服药: 成员={}, 药品={}, 计划时间={} {}", - task.getMemberName(), task.getMedicineName(), + task.getPersonName(), task.getMedicineName(), task.getPlannedDate(), task.getPlannedTime()); // TODO: 实现超时提醒逻辑 diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationTaskJob.java b/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationTaskJob.java index eeeb79f..efdc836 100644 --- a/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationTaskJob.java +++ b/intc-modules/intc-health/src/main/java/com/intc/health/task/MedicationTaskJob.java @@ -14,6 +14,7 @@ import javax.annotation.Resource; import java.math.BigDecimal; import java.time.DayOfWeek; import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; @@ -201,7 +202,7 @@ public class MedicationTaskJob { MedicationTask task = new MedicationTask(); task.setPlanId(plan.getId()); - task.setMemberId(plan.getMemberId()); + task.setPersonId(plan.getPersonId()); task.setMedicineName(plan.getMedicineName()); task.setPlannedDate(date); task.setPlannedTime(time); diff --git a/intc-modules/intc-health/src/main/resources/mapper/health/ChronicDiseaseRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/ChronicDiseaseRecordMapper.xml index 281774d..baadaf2 100644 --- a/intc-modules/intc-health/src/main/resources/mapper/health/ChronicDiseaseRecordMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/ChronicDiseaseRecordMapper.xml @@ -6,9 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + @@ -24,31 +24,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + - select a.id, a.member_id, a.disease_id, a.disease_name, a.disease_code, a.diagnosis_date, + select a.id, a.person_id, a.disease_name, a.disease_code, a.diagnosis_date, a.disease_status, a.main_doctor, a.hospital, a.department, a.notes, a.is_active, a.create_by, a.create_time, a.update_by, a.update_time, a.del_flag, a.remark, - p.name as member_name, - d.type as disease_type, - d.symptom as disease_symptom + p.name as person_name from chronic_disease_record a - left join health_person p on a.member_id = p.id - left join health_diseases d on a.disease_id = d.id + left join health_person p on a.person_id = p.id - where a.del_flag = '0' and a.is_active = 1 and a.member_id = #{memberId} + where a.del_flag = '0' and a.is_active = 1 and a.person_id = #{personId} order by a.disease_status desc, a.create_time desc @@ -87,8 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into chronic_disease_record id, - member_id, - disease_id, + person_id, disease_name, disease_code, diagnosis_date, @@ -107,8 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, - #{memberId}, - #{diseaseId}, + #{personId}, #{diseaseName}, #{diseaseCode}, #{diagnosisDate}, @@ -130,8 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update chronic_disease_record - member_id = #{memberId}, - disease_id = #{diseaseId}, + person_id = #{personId}, disease_name = #{diseaseName}, disease_code = #{diseaseCode}, diagnosis_date = #{diagnosisDate}, diff --git a/intc-modules/intc-health/src/main/resources/mapper/health/MedicationPlanMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/MedicationPlanMapper.xml index 2b194af..e11f3a2 100644 --- a/intc-modules/intc-health/src/main/resources/mapper/health/MedicationPlanMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/MedicationPlanMapper.xml @@ -4,8 +4,8 @@ - - + + @@ -28,14 +28,14 @@ - select a.id, a.member_id, p.name as member_name, a.chronic_disease_id, + select a.id, a.person_id, p.name as person_name, a.chronic_disease_id, c.disease_name as chronic_disease_name, a.plan_name, a.medicine_id, 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 from medication_plan a - left join health_person p on a.member_id = p.id + left join health_person p on a.person_id = p.id left join chronic_disease_record c on a.chronic_disease_id = c.id @@ -48,7 +48,7 @@ a.del_flag = 0 - and a.member_id = #{memberId} + and a.person_id = #{personId} and a.chronic_disease_id = #{chronicDiseaseId} and a.plan_name like '%' || #{planName} || '%' and a.medicine_id = #{medicineId} @@ -71,29 +71,61 @@ - insert into medication_plan ( - member_id, chronic_disease_id, plan_name, medicine_id, medicine_name, - specification, dosage_per_time, dosage_unit, frequency_type, - frequency_config, time_slots, start_date, end_date, - remind_enabled, remind_advance_min, notify_family, family_member_ids, status, - create_by, create_time, remark, del_flag - ) values ( - #{memberId}, #{chronicDiseaseId}, #{planName}, #{medicineId}, #{medicineName}, - #{specification}, #{dosagePerTime}, #{dosageUnit}, #{frequencyType}, - #{frequencyConfig, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler}, - #{timeSlots, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler}, - #{startDate}, #{endDate}, - #{remindEnabled}, #{remindAdvanceMin}, #{notifyFamily}, - #{familyMemberIds, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler}, - #{status}, - #{createBy}, #{createTime}, #{remark}, 0 - ) + insert into medication_plan + + person_id, + chronic_disease_id, + plan_name, + medicine_id, + medicine_name, + specification, + dosage_per_time, + dosage_unit, + frequency_type, + frequency_config, + time_slots, + start_date, + end_date, + remind_enabled, + remind_advance_min, + notify_family, + family_member_ids, + status, + create_by, + create_time, + remark, + del_flag, + + + #{personId}, + #{chronicDiseaseId}, + #{planName}, + #{medicineId}, + #{medicineName}, + #{specification}, + #{dosagePerTime}, + #{dosageUnit}, + #{frequencyType}, + #{frequencyConfig, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler}, + #{timeSlots, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler}, + #{startDate}, + #{endDate}, + #{remindEnabled}, + #{remindAdvanceMin}, + #{notifyFamily}, + #{familyMemberIds, typeHandler=com.intc.common.core.handler.JsonNodeTypeHandler}, + #{status}, + #{createBy}, + #{createTime}, + #{remark}, + 0, + update medication_plan - member_id = #{memberId}, + person_id = #{personId}, chronic_disease_id = #{chronicDiseaseId}, plan_name = #{planName}, medicine_id = #{medicineId}, diff --git a/intc-modules/intc-health/src/main/resources/mapper/health/MedicationTaskMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/MedicationTaskMapper.xml index 2d221e6..f143cd8 100644 --- a/intc-modules/intc-health/src/main/resources/mapper/health/MedicationTaskMapper.xml +++ b/intc-modules/intc-health/src/main/resources/mapper/health/MedicationTaskMapper.xml @@ -6,8 +6,8 @@ - - + + @@ -23,13 +23,13 @@ - select a.id, a.plan_id, p.plan_name, a.member_id, m.name as member_name, + select a.id, a.plan_id, p.plan_name, a.person_id, m.name as person_name, a.medicine_name, a.planned_date, a.planned_time, a.planned_dosage, a.actual_time, a.actual_dosage, a.status, a.confirm_type, a.notes, 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.member_id = m.id + left join health_person m on a.person_id = m.id @@ -169,7 +169,7 @@ then 1 else 0 end) as ontime_tasks from medication_task where del_flag = 0 - and member_id = #{memberId} + and person_id = #{personId} and planned_date >= #{startDate} and planned_date <= #{endDate} group by planned_date @@ -187,7 +187,7 @@ then 1 else 0 end) as ontime_tasks from medication_task where del_flag = 0 - and member_id = #{memberId} + and person_id = #{personId} and planned_date >= #{startDate} and planned_date <= #{endDate} group by extract(hour from planned_time)