From 22c2446b35306ba8dbaabcdc9ddb6d082c8a9a2f Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 19 Mar 2024 15:55:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/AgencyCategoryManageLevelEnum.java | 34 ++++++++++ .../xinelu/common/enums/AgencyStatusEnum.java | 29 +++++++++ .../com/xinelu/common/enums/NodeTypeEnum.java | 64 +++++++++++++++++++ ...cialDiseaseTriggerConditionController.java | 5 +- .../TriggerConditionDTO.java | 21 ++++++ .../SpecialDiseaseTriggerConditionMapper.java | 20 ++++-- ...SignPatientManageRouteNodeServiceImpl.java | 4 +- ...SpecialDiseaseTriggerConditionService.java | 15 +++-- ...ialDiseaseTriggerConditionServiceImpl.java | 11 ++-- .../SpecialDiseaseTriggerConditionMapper.xml | 29 +++++++++ 10 files changed, 211 insertions(+), 21 deletions(-) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java new file mode 100644 index 00000000..69bcebc4 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyCategoryManageLevelEnum.java @@ -0,0 +1,34 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 机构分类管理类别 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum AgencyCategoryManageLevelEnum { + + /** + * 非营利性医疗机构 + */ + NON_PROFIT_MEDICAL_AGENCY("NON_PROFIT_MEDICAL_AGENCY"), + + /** + * 营利性医疗机构 + */ + FOR_PROFIT_MEDICAL_AGENCY("FOR_PROFIT_MEDICAL_AGENCY"), + + /** + * 其他卫生机构 + */ + OTHER_HEALTH_AGENCY("OTHER_HEALTH_AGENCY"), + ; + + final private String info; + + AgencyCategoryManageLevelEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java new file mode 100644 index 00000000..2de1d909 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/AgencyStatusEnum.java @@ -0,0 +1,29 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 机构状态 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum AgencyStatusEnum { + + /** + * 启用 + */ + ON("ON"), + + /** + * 禁用 + */ + OFF("OFF"), + ; + + final private String info; + + AgencyStatusEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java new file mode 100644 index 00000000..6bdd3148 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/NodeTypeEnum.java @@ -0,0 +1,64 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 节点类型 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum NodeTypeEnum { + + /** + * 卫健委 + */ + HEALTH_COMMISSION("HEALTH_COMMISSION"), + + /** + * 医保局 + */ + MEDICAL_INSURANCE_BUREAU("MEDICAL_INSURANCE_BUREAU"), + + /** + * 医院 + */ + HOSPITAL("HOSPITAL"), + + /** + * 院区 + */ + CAMPUS("CAMPUS"), + + /** + * 药店 + */ + PHARMACY("PHARMACY"), + + /** + * 科室 + */ + DEPARTMENT("DEPARTMENT"), + + /** + * 病区 + */ + WARD("WARD"), + + /** + * 中国 + */ + CHINA("CHINA"), + + /** + * 省份： + */ + PROVINCE("PROVINCE"), + ; + + final private String info; + + NodeTypeEnum(String info) { + this.info = info; + } +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java index 932a15d0..2a09634a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java @@ -7,6 +7,7 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO; import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -65,8 +66,8 @@ public class SpecialDiseaseTriggerConditionController extends BaseController { @PreAuthorize("@ss.hasPermi('system:triggerCondition:add')") @Log(title = "触发条件关系", businessType = BusinessType.INSERT) @PostMapping("/add") - public AjaxResult add(@RequestBody SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { - return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition)); + public AjaxResult add(@RequestBody TriggerConditionDTO triggerConditionList) { + return toAjax(specialDiseaseTriggerConditionService.insertSpecialDiseaseTriggerCondition(triggerConditionList)); } /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java new file mode 100644 index 00000000..8aa35ae8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/specialdiseasetriggercondition/TriggerConditionDTO.java @@ -0,0 +1,21 @@ +package com.xinelu.manage.dto.specialdiseasetriggercondition; + +import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import lombok.Data; + +import java.util.List; + +/** + * 触发条件关系DTO + * + * @author xinelu + * @date 2024-03-18 + */ +@Data +public class TriggerConditionDTO { + + /** + * 触发条件集和 + */ + List triggerConditionList; +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java index 23ee7b42..2bd41168 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.java @@ -17,7 +17,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param id 触发条件关系主键 * @return 触发条件关系 */ - public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); + SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); /** * 查询触发条件关系列表 @@ -25,7 +25,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 触发条件关系集合 */ - public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 新增触发条件关系 @@ -33,7 +33,15 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 结果 */ - public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + + /** + * 批量新增触发条件关系 + * + * @param triggerConditionList 触发条件关系 + * @return 结果 + */ + int insertTriggerConditionList(List triggerConditionList); /** * 修改触发条件关系 @@ -41,7 +49,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 结果 */ - public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 删除触发条件关系 @@ -49,7 +57,7 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param id 触发条件关系主键 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionById(Long id); + int deleteSpecialDiseaseTriggerConditionById(Long id); /** * 批量删除触发条件关系 @@ -57,5 +65,5 @@ public interface SpecialDiseaseTriggerConditionMapper { * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); + int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 5ab8bac3..a4aeadac 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -49,7 +49,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage */ @Override public int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) { - signPatientManageRouteNode.setCreateTime(DateUtils.getNowDate()); + return signPatientManageRouteNodeMapper.insertSignPatientManageRouteNode(signPatientManageRouteNode); } @@ -61,7 +61,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage */ @Override public int updateSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) { - signPatientManageRouteNode.setUpdateTime(DateUtils.getNowDate()); + return signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java index 67bb2be8..5c027868 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java @@ -1,6 +1,7 @@ package com.xinelu.manage.service.specialdiseasetriggercondition; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO; import java.util.List; @@ -17,7 +18,7 @@ public interface ISpecialDiseaseTriggerConditionService { * @param id 触发条件关系主键 * @return 触发条件关系 */ - public SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); + SpecialDiseaseTriggerCondition selectSpecialDiseaseTriggerConditionById(Long id); /** * 查询触发条件关系列表 @@ -25,15 +26,15 @@ public interface ISpecialDiseaseTriggerConditionService { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 触发条件关系集合 */ - public List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + List selectSpecialDiseaseTriggerConditionList(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 新增触发条件关系 * - * @param specialDiseaseTriggerCondition 触发条件关系 + * @param triggerConditionList 触发条件关系 * @return 结果 */ - public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int insertSpecialDiseaseTriggerCondition(TriggerConditionDTO triggerConditionList); /** * 修改触发条件关系 @@ -41,7 +42,7 @@ public interface ISpecialDiseaseTriggerConditionService { * @param specialDiseaseTriggerCondition 触发条件关系 * @return 结果 */ - public int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); + int updateSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition); /** * 批量删除触发条件关系 @@ -49,7 +50,7 @@ public interface ISpecialDiseaseTriggerConditionService { * @param ids 需要删除的触发条件关系主键集合 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); + int deleteSpecialDiseaseTriggerConditionByIds(Long[] ids); /** * 删除触发条件关系信息 @@ -57,5 +58,5 @@ public interface ISpecialDiseaseTriggerConditionService { * @param id 触发条件关系主键 * @return 结果 */ - public int deleteSpecialDiseaseTriggerConditionById(Long id); + int deleteSpecialDiseaseTriggerConditionById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java index 1edc1d97..b6f5f42c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java @@ -1,6 +1,8 @@ package com.xinelu.manage.service.specialdiseasetriggercondition.impl; +import com.xinelu.common.utils.SecurityUtils; import com.xinelu.manage.domain.specialdiseasetriggercondition.SpecialDiseaseTriggerCondition; +import com.xinelu.manage.dto.specialdiseasetriggercondition.TriggerConditionDTO; import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper; import com.xinelu.manage.service.specialdiseasetriggercondition.ISpecialDiseaseTriggerConditionService; import org.springframework.stereotype.Service; @@ -46,13 +48,14 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas /** * 新增触发条件关系 * - * @param specialDiseaseTriggerCondition 触发条件关系 + * @param triggerConditionList 触发条件关系 * @return 结果 */ @Override - public int insertSpecialDiseaseTriggerCondition(SpecialDiseaseTriggerCondition specialDiseaseTriggerCondition) { - specialDiseaseTriggerCondition.setCreateTime(LocalDateTime.now()); - return specialDiseaseTriggerConditionMapper.insertSpecialDiseaseTriggerCondition(specialDiseaseTriggerCondition); + public int insertSpecialDiseaseTriggerCondition(TriggerConditionDTO triggerConditionList) { + triggerConditionList.getTriggerConditionList().forEach(item -> item.setCreateTime(LocalDateTime.now())); + triggerConditionList.getTriggerConditionList().forEach(item -> item.setCreateBy(SecurityUtils.getUsername())); + return specialDiseaseTriggerConditionMapper.insertTriggerConditionList(triggerConditionList.getTriggerConditionList()); } /** diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml index dbd1096b..72f89394 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionMapper.xml @@ -132,6 +132,35 @@ + + insert into special_disease_trigger_condition( + route_id, + route_name, + trigger_condition_code, + trigger_condition_name, + trigger_condition_operator, + trigger_condition_value, + trigger_condition_sort, + trigger_condition_remark, + create_by, + create_time + )values + + ( + #{triggerConditionList.routeId}, + #{triggerConditionList.routeName}, + #{triggerConditionList.triggerConditionCode}, + #{triggerConditionList.triggerConditionName}, + #{triggerConditionList.triggerConditionOperator}, + #{triggerConditionList.triggerConditionValue}, + #{triggerConditionList.triggerConditionSort}, + #{triggerConditionList.triggerConditionRemark}, + #{triggerConditionList.createBy}, + #{triggerConditionList.createTime} + ) + + + update special_disease_trigger_condition