专病路径修改

This commit is contained in:
zhangheng 2024-04-23 14:27:19 +08:00
parent d44124f756
commit 7ba09706a1
7 changed files with 31 additions and 19 deletions

View File

@ -5,7 +5,6 @@ import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update;
import com.xinelu.common.enums.BusinessType;
import com.xinelu.common.utils.poi.ExcelUtil;
import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
@ -84,7 +83,7 @@ public class SignPatientManageRouteController extends BaseController {
@PreAuthorize("@ss.hasPermi('manage:signroute:edit')")
@Log(title = "签约患者管理任务路径", businessType = BusinessType.UPDATE)
@PutMapping("/edit")
public AjaxResult edit(@RequestBody @Validated(Update.class) SignPatientManageRouteVO signPatientManageRoute) {
public AjaxResult edit(@RequestBody SignPatientManageRouteVO signPatientManageRoute) {
return signPatientManageRouteService.updateSignPatientManageRoute(signPatientManageRoute);
}

View File

@ -4,12 +4,15 @@ import com.xinelu.common.annotation.Log;
import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update;
import com.xinelu.common.enums.BusinessType;
import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute;
import com.xinelu.manage.dto.specialdiseaseroute.SpecialDiseaseRouteDTO;
import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService;
import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -53,7 +56,7 @@ public class SpecialDiseaseRouteController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:add')")
@Log(title = "专病路径信息", businessType = BusinessType.INSERT)
@PostMapping("/add")
public AjaxResult add(@RequestBody SpecialDiseaseRouteVO specialDiseaseRoute) {
public AjaxResult add(@RequestBody @Validated(Insert.class)SpecialDiseaseRouteVO specialDiseaseRoute) {
return specialDiseaseRouteService.insertSpecialDiseaseRoute(specialDiseaseRoute);
}
@ -63,7 +66,7 @@ public class SpecialDiseaseRouteController extends BaseController {
@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')")
@Log(title = "专病路径信息", businessType = BusinessType.UPDATE)
@PutMapping("/edit")
public AjaxResult edit(@RequestBody SpecialDiseaseRouteVO specialDiseaseRoute) {
public AjaxResult edit(@RequestBody @Validated(Update.class)SpecialDiseaseRouteVO specialDiseaseRoute) {
return specialDiseaseRouteService.updateSpecialDiseaseRoute(specialDiseaseRoute);
}

View File

@ -3,7 +3,6 @@ package com.xinelu.manage.domain.signpatientmanageroute;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseEntity;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -83,7 +82,7 @@ public class SignPatientManageRoute extends BaseEntity {
/** 路径名称(任务名称) */
@ApiModelProperty(value = "路径名称")
@Excel(name = "路径名称", readConverterExp = "任务名称")
@NotBlank(message = "任务名称不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "任务名称不能为空", groups = {Insert.class})
private String routeName;
/** 任务创建类型手动创建MANUAL_CREATE自动匹配MANUAL_MATCHE */
@ -104,7 +103,7 @@ public class SignPatientManageRoute extends BaseEntity {
/** 适用范围在院IN_THE_HOSPITAL出院DISCHARGE门诊OUTPATIENT_SERVICE门诊+出院OUTPATIENT_SERVICE_DISCHARGE */
@ApiModelProperty(value = "适用范围在院IN_THE_HOSPITAL出院DISCHARGE门诊OUTPATIENT_SERVICE门诊+出院OUTPATIENT_SERVICE_DISCHARGE")
@Excel(name = "适用范围在院IN_THE_HOSPITAL出院DISCHARGE门诊OUTPATIENT_SERVICE门诊+出院OUTPATIENT_SERVICE_DISCHARGE")
@NotBlank(message = "适用范围不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "适用范围不能为空", groups = {Insert.class})
private String suitRange;
/** 排序 */

View File

@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseEntity;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;
@ -42,50 +41,49 @@ public class SignPatientManageRouteNode extends BaseEntity {
/** 路径名称(任务名称) */
@ApiModelProperty(value = "路径名称")
@Excel(name = "路径名称", readConverterExp = "任务名称")
@NotBlank(message = "路径名称不能为空", groups = {Insert.class, Update.class})
private String manageRouteName;
/** 管理路径节点名称 */
@ApiModelProperty(value = "管理路径节点名称")
@Excel(name = "管理路径节点名称")
@NotBlank(message = "管理路径节点名称不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "管理路径节点名称不能为空", groups = {Insert.class})
private String routeNodeName;
/** 管理路径节点时间,时间单位为:天 */
@ApiModelProperty(value = "管理路径节点时间,时间单位为:天")
@Excel(name = "管理路径节点时间,时间单位为:天")
@NotNull(message = "管理路径节点时间不能为空", groups = {Insert.class, Update.class})
@NotNull(message = "管理路径节点时间不能为空", groups = {Insert.class})
private Integer routeNodeDay;
/** 任务类型电话外呼PHONE_OUTBOUND问卷量表QUESTIONNAIRE_SCALE宣教文章PROPAGANDA_ARTICLE文字提醒TEXT_REMIND人工随访ARTIFICIAL_FOLLOW_UP */
@ApiModelProperty(value = "任务类型电话外呼PHONE_OUTBOUND问卷量表QUESTIONNAIRE_SCALE宣教文章PROPAGANDA_ARTICLE文字提醒TEXT_REMIND人工随访ARTIFICIAL_FOLLOW_UP")
@Excel(name = "任务类型电话外呼PHONE_OUTBOUND问卷量表QUESTIONNAIRE_SCALE宣教文章PROPAGANDA_ARTICLE文字提醒TEXT_REMIND人工随访ARTIFICIAL_FOLLOW_UP")
@NotBlank(message = "任务类型不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "任务类型不能为空", groups = {Insert.class})
private String taskType;
/** 任务状态 */
@ApiModelProperty(value = "任务状态")
@Excel(name = "任务状态")
@NotBlank(message = "任务状态不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "任务状态不能为空", groups = {Insert.class})
private String taskStatus;
/** 任务细分 */
@ApiModelProperty(value = "任务细分")
@Excel(name = "任务细分")
@NotBlank(message = "任务细分不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "任务细分不能为空", groups = {Insert.class})
private String taskSubdivision;
/** 二级分类描述 */
@ApiModelProperty(value = "二级分类描述")
@Excel(name = "二级分类描述")
@NotBlank(message = "二级分类描述不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "二级分类描述不能为空", groups = {Insert.class})
private String secondClassifyDescribe;
/** 执行时间格式HH:mm */
@ApiModelProperty(value = "执行时间格式HH:mm")
@JsonFormat(pattern = "HH:mm")
@Excel(name = "执行时间格式HH:mm", width = 30, dateFormat = "yyyy-MM-dd")
@NotBlank(message = "执行时间不能为空", groups = {Insert.class, Update.class})
@NotBlank(message = "执行时间不能为空", groups = {Insert.class})
private LocalTime executeTime;
/** 电话推送标识0未开启1已开启 */

View File

@ -3,6 +3,8 @@ package com.xinelu.manage.domain.specialdiseasenode;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseEntity;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -12,6 +14,8 @@ import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.time.LocalTime;
@ -53,6 +57,7 @@ public class SpecialDiseaseNode extends BaseEntity {
*/
@ApiModelProperty(value = "节点名称出院后AFTER_DISCHARGE入院后AFTER_ADMISSION就诊后AFTER_CONSULTATION就诊/出院后AFTER_VISIT_DISCHARGE术前PREOPERATIVE术后POSTOPERATIVE")
@Excel(name = "节点名称出院后AFTER_DISCHARGE入院后AFTER_ADMISSION就诊后AFTER_CONSULTATION就诊/出院后AFTER_VISIT_DISCHARGE术前PREOPERATIVE术后POSTOPERATIVE")
@NotBlank(message = "节点名称不能为空", groups = {Insert.class, Update.class})
private String routeNodeName;
/**
@ -60,6 +65,7 @@ public class SpecialDiseaseNode extends BaseEntity {
*/
@ApiModelProperty(value = "节点天数,单位:天")
@Excel(name = "节点天数,单位:天")
@NotNull(message = "节点天数不能为空", groups = {Insert.class, Update.class})
private Integer routeNodeDay;
/**
@ -67,6 +73,7 @@ public class SpecialDiseaseNode extends BaseEntity {
*/
@ApiModelProperty(value = "任务类型")
@Excel(name = "任务类型")
@NotBlank(message = "任务类型不能为空", groups = {Insert.class, Update.class})
private String taskType;
/**
@ -74,6 +81,7 @@ public class SpecialDiseaseNode extends BaseEntity {
*/
@ApiModelProperty(value = "任务细分")
@Excel(name = "任务细分")
@NotBlank(message = "任务细分不能为空", groups = {Insert.class, Update.class})
private String taskSubdivision;
/**
@ -81,6 +89,7 @@ public class SpecialDiseaseNode extends BaseEntity {
*/
@ApiModelProperty(value = "任务状态")
@Excel(name = "任务状态")
@NotBlank(message = "任务状态不能为空", groups = {Insert.class, Update.class})
private String taskStatus;
/**

View File

@ -2,6 +2,8 @@ package com.xinelu.manage.domain.specialdiseaseroute;
import com.xinelu.common.annotation.Excel;
import com.xinelu.common.core.domain.BaseEntity;
import com.xinelu.common.custominterface.Insert;
import com.xinelu.common.custominterface.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
@ -11,6 +13,8 @@ import lombok.NoArgsConstructor;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
/**
* 专病路径信息对象 special_disease_route
*
@ -63,6 +67,7 @@ public class SpecialDiseaseRoute extends BaseEntity {
*/
@ApiModelProperty(value = "路径名称")
@Excel(name = "路径名称")
@NotBlank(message = "路径名称不能为空", groups = {Insert.class, Update.class})
private String routeName;
/**
@ -77,6 +82,7 @@ public class SpecialDiseaseRoute extends BaseEntity {
*/
@ApiModelProperty(value = "版本号")
@Excel(name = "版本号")
@NotBlank(message = "版本号不能为空", groups = {Insert.class, Update.class})
private String version;
/**
@ -98,6 +104,7 @@ public class SpecialDiseaseRoute extends BaseEntity {
*/
@ApiModelProperty(value = "适用范围在院IN_THE_HOSPITAL出院DISCHARGE门诊OUTPATIENT_SERVICE门诊+出院OUTPATIENT_SERVICE_DISCHARGE")
@Excel(name = "适用范围在院IN_THE_HOSPITAL出院DISCHARGE门诊OUTPATIENT_SERVICE门诊+出院OUTPATIENT_SERVICE_DISCHARGE")
@NotBlank(message = "版本号不能为空", groups = {Insert.class, Update.class})
private String suitRange;
/**

View File

@ -1,13 +1,11 @@
package com.xinelu.manage.vo.signpatientmanageroute;
import com.xinelu.common.custominterface.Update;
import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode;
import com.xinelu.manage.vo.signroutetriggercondition.SignRouteTriggerConditionVO;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@ -23,7 +21,6 @@ public class SignPatientManageRouteVO extends SignPatientManageRoute {
/**
* 患者管理任务路径id
*/
@NotNull(message = "管理路径信息不能为空", groups = {Update.class})
private Long signPatientManageRouteId;
/**