添加获取家医个性服务包和筛查项目接口
This commit is contained in:
mengkuiliang
parent
25a7771c03
commit
3927b467a5
@ -67,4 +67,9 @@ public class ResidentServiceApplyController extends BaseController {
|
||||
return R.ok(residentServiceAppletService.detail(bookingNo));
|
||||
}
|
||||
|
||||
@ApiOperation("获取个性服务包和筛查项目")
|
||||
@GetMapping("/getForm/{identity}")
|
||||
public R<?> getForm(@PathVariable String identity) {
|
||||
return R.ok(residentServiceAppletService.getForm(identity));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,97 +0,0 @@
|
||||
package com.disease.web.controller.bussiness;
|
||||
|
||||
import com.disease.business.domain.entity.ServiceProject;
|
||||
import com.disease.business.service.IPerformanceSchemaService;
|
||||
import com.disease.business.service.IServiceProjectService;
|
||||
import com.disease.common.core.controller.BaseController;
|
||||
import com.disease.common.core.domain.R;
|
||||
import com.disease.common.core.page.TableDataInfo;
|
||||
import com.disease.common.utils.uuid.IdUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author gaoyu
|
||||
* @description 服务项目管理控制器
|
||||
* @date 2022-10-26 10:29
|
||||
*/
|
||||
@Api(tags = "服务项目管理控制器")
|
||||
@RestController
|
||||
@RequestMapping("/business/serviceProject")
|
||||
public class ServiceProjectController extends BaseController {
|
||||
|
||||
@Resource
|
||||
private IServiceProjectService serviceProjectService;
|
||||
@Resource
|
||||
private IPerformanceSchemaService performanceSchemaService;
|
||||
|
||||
@ApiOperation("服务项目分页列表")
|
||||
@GetMapping("list")
|
||||
public TableDataInfo list(ServiceProject project) {
|
||||
startPage();
|
||||
List<ServiceProject> list = serviceProjectService.findList(project);
|
||||
return getDataTable(list);
|
||||
}
|
||||
|
||||
@ApiOperation("新增服务项目")
|
||||
@PostMapping("add")
|
||||
public R<String> add(@RequestBody ServiceProject project) {
|
||||
if (serviceProjectService.checkSameProjectName(project.getProjectName(), project.getDeptId(), null)) {
|
||||
return R.fail("【" + project.getDeptName() + "】已存在服务项目【" + project.getProjectName() + "】，不能重复添加");
|
||||
}
|
||||
project.setProjectId(IdUtils.fastSimpleUUID());
|
||||
project.setCreateBy(getUsername());
|
||||
project.setCreateTime(new Date());
|
||||
project.setDelFlag("0");
|
||||
return serviceProjectService.insert(project) > 0 ? R.ok() : R.fail("保存失败");
|
||||
}
|
||||
|
||||
@ApiOperation("修改服务项目")
|
||||
@PostMapping("update")
|
||||
public R<?> update(@RequestBody ServiceProject project) {
|
||||
if (serviceProjectService.checkSameProjectName(project.getProjectName(), project.getDeptId(), project.getProjectId())) {
|
||||
return R.fail("【" + project.getDeptName() + "】已存在服务项目【" + project.getProjectName() + "】，不能重复添加");
|
||||
}
|
||||
project.setUpdateBy(getUsername());
|
||||
serviceProjectService.update(project);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation("修改服务项目状态")
|
||||
@PostMapping("changeStatus")
|
||||
public R<?> changeStatus(@RequestBody ServiceProject project) {
|
||||
project.setUpdateBy(getUsername());
|
||||
serviceProjectService.update(project);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation("逻辑删除服务项目")
|
||||
@PostMapping("delete/{projectId}")
|
||||
@ApiImplicitParam(name="projectId", value = "服务项目编号", required = true, dataTypeClass = String.class)
|
||||
public R<?> delete(@PathVariable String projectId) {
|
||||
ServiceProject project = new ServiceProject();
|
||||
project.setProjectId(projectId);
|
||||
project.setDelFlag("1");
|
||||
project.setUpdateBy(getUsername());
|
||||
serviceProjectService.delete(project);
|
||||
return R.ok();
|
||||
}
|
||||
|
||||
@ApiOperation("获取复诊服务项目列表")
|
||||
@GetMapping("/getList/{identity}")
|
||||
public R<List<ServiceProject>> getList(@PathVariable String identity) {
|
||||
try {
|
||||
return R.ok(performanceSchemaService.getFormList(identity));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return R.fail(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,113 @@
|
||||
package com.xinelu.familydoctor.applet.pojo.vo;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author mengkuiliang
|
||||
* @Description 筛查项目展示对象
|
||||
* @Date 2023-10-08 008 14:32
|
||||
* @Param
|
||||
* @return
|
||||
**/
|
||||
@Data
|
||||
@ApiModel("筛查项目展示对象")
|
||||
public class ScreeningProjectVo {
|
||||
|
||||
/**
|
||||
* 项目编码
|
||||
*/
|
||||
@ApiModelProperty("项目业务主键")
|
||||
private String projectId;
|
||||
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
@ApiModelProperty("项目名称")
|
||||
private String projectName;
|
||||
|
||||
/**
|
||||
* 类型（0：其他项目 1：常规项目 2：履约项目）
|
||||
*/
|
||||
@ApiModelProperty("类型（0：其他项目 1：常规项目 2：履约项目）")
|
||||
private String projectType;
|
||||
|
||||
/**
|
||||
* 所属机构ID
|
||||
*/
|
||||
@ApiModelProperty("所属机构ID")
|
||||
private String deptId;
|
||||
|
||||
/**
|
||||
* 所属机构名称
|
||||
*/
|
||||
@ApiModelProperty("所属机构名称")
|
||||
private String deptName;
|
||||
|
||||
/**
|
||||
* 服务内容
|
||||
*/
|
||||
@ApiModelProperty("服务内容")
|
||||
private String serviceContent;
|
||||
/**
|
||||
* 单价（元/次）
|
||||
*/
|
||||
@ApiModelProperty("单价（元/次）")
|
||||
private BigDecimal price;
|
||||
|
||||
/**
|
||||
* 折扣（折）
|
||||
*/
|
||||
@ApiModelProperty("折扣（折）")
|
||||
private String discount;
|
||||
|
||||
/**
|
||||
* 显示排序
|
||||
*/
|
||||
@ApiModelProperty("显示排序")
|
||||
private Integer orderNum;
|
||||
|
||||
/**
|
||||
* 项目状态（0：正常，1：停用）
|
||||
*/
|
||||
@ApiModelProperty("项目状态（0：正常，1：停用）")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 删除标识（0：存在，1：删除）
|
||||
*/
|
||||
@ApiModelProperty(value = "删除标识（0：存在，1：删除）", hidden = true)
|
||||
private String delFlag;
|
||||
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private String createBy;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private String updateBy;
|
||||
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
}
|
||||
@ -96,4 +96,12 @@ public interface IResidentServiceAppletService {
|
||||
**/
|
||||
void updateComplete(String bookingNo);
|
||||
|
||||
/**
|
||||
* @Author mengkuiliang
|
||||
* @Description 获取个性服务包和筛查项目
|
||||
* @Date 2023-10-09 009 10:54
|
||||
* @Param [identity]
|
||||
* @return java.lang.Object
|
||||
**/
|
||||
List<?> getForm(String identity);
|
||||
}
|
||||
|
||||
@ -240,6 +240,22 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
|
||||
public void updateComplete(String bookingNo) {
|
||||
residentServiceApplyMapper.updateComplete(bookingNo);
|
||||
}
|
||||
|
||||
/**
|
||||
* @Author mengkuiliang
|
||||
* @Description 获取个性服务包和筛查项目
|
||||
* @Date 2023-10-09 009 10:55
|
||||
* @Param [identity]
|
||||
* @return java.util.List<?>
|
||||
**/
|
||||
@Override
|
||||
public List<?> getForm(String identity) {
|
||||
// 获取家医个性服务包
|
||||
|
||||
// 获取签约机构下的筛查项目
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -72,7 +72,7 @@ public class ScreeningProjectController extends BaseController {
|
||||
if (StringUtils.isBlank(project.getStatus())) {
|
||||
project.setStatus("1");
|
||||
}
|
||||
project.setDiscountPrice(project.getPrice().multiply(new BigDecimal(project.getDiscount())).multiply(new BigDecimal("0.1")));
|
||||
project.setDiscountPrice(project.getPrice().multiply(new BigDecimal(project.getDiscount())).multiply(new BigDecimal("0.1")).setScale(2, BigDecimal.ROUND_HALF_UP));
|
||||
project.setProjectId(IdUtils.fastSimpleUUID());
|
||||
project.setCreateBy(getUsername());
|
||||
project.setCreateTime(new Date());
|
||||
@ -102,7 +102,7 @@ public class ScreeningProjectController extends BaseController {
|
||||
if (StringUtils.isBlank(project.getStatus())) {
|
||||
project.setStatus("1");
|
||||
}
|
||||
project.setDiscountPrice(project.getPrice().multiply(new BigDecimal(project.getDiscount())).multiply(new BigDecimal("0.1")));
|
||||
project.setDiscountPrice(project.getPrice().multiply(new BigDecimal(project.getDiscount())).multiply(new BigDecimal("0.1")).setScale(2, BigDecimal.ROUND_HALF_UP));
|
||||
project.setUpdateBy(getUsername());
|
||||
project.setUpdateTime(new Date());
|
||||
projectService.update(project);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user