Просмотр исходного кода

add 警示管理、医疗服务项目目录

lenovodn 2 лет назад
Родитель
Сommit
2f1ce384ed

+ 6 - 6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/DiagnosisTreatmentController.java

@@ -81,7 +81,7 @@ public class DiagnosisTreatmentController extends JeecgController<DiagnosisTreat
 	 */
 	@AutoLog(value = "diagnosis_treatment-添加")
 	@ApiOperation(value="diagnosis_treatment-添加", notes="diagnosis_treatment-添加")
-	@RequiresPermissions("medical:diagnosis_treatment:add")
+//	@RequiresPermissions("medical:diagnosis_treatment:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody DiagnosisTreatment diagnosisTreatment) {
 		diagnosisTreatmentService.save(diagnosisTreatment);
@@ -96,7 +96,7 @@ public class DiagnosisTreatmentController extends JeecgController<DiagnosisTreat
 	 */
 	@AutoLog(value = "diagnosis_treatment-编辑")
 	@ApiOperation(value="diagnosis_treatment-编辑", notes="diagnosis_treatment-编辑")
-	@RequiresPermissions("medical:diagnosis_treatment:edit")
+//	@RequiresPermissions("medical:diagnosis_treatment:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody DiagnosisTreatment diagnosisTreatment) {
 		diagnosisTreatmentService.updateById(diagnosisTreatment);
@@ -111,7 +111,7 @@ public class DiagnosisTreatmentController extends JeecgController<DiagnosisTreat
 	 */
 	@AutoLog(value = "diagnosis_treatment-通过id删除")
 	@ApiOperation(value="diagnosis_treatment-通过id删除", notes="diagnosis_treatment-通过id删除")
-	@RequiresPermissions("medical:diagnosis_treatment:delete")
+//	@RequiresPermissions("medical:diagnosis_treatment:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		diagnosisTreatmentService.removeById(id);
@@ -126,7 +126,7 @@ public class DiagnosisTreatmentController extends JeecgController<DiagnosisTreat
 	 */
 	@AutoLog(value = "diagnosis_treatment-批量删除")
 	@ApiOperation(value="diagnosis_treatment-批量删除", notes="diagnosis_treatment-批量删除")
-	@RequiresPermissions("medical:diagnosis_treatment:deleteBatch")
+//	@RequiresPermissions("medical:diagnosis_treatment:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.diagnosisTreatmentService.removeByIds(Arrays.asList(ids.split(",")));
@@ -156,7 +156,7 @@ public class DiagnosisTreatmentController extends JeecgController<DiagnosisTreat
     * @param request
     * @param diagnosisTreatment
     */
-    @RequiresPermissions("medical:diagnosis_treatment:exportXls")
+//    @RequiresPermissions("medical:diagnosis_treatment:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, DiagnosisTreatment diagnosisTreatment) {
         return super.exportXls(request, diagnosisTreatment, DiagnosisTreatment.class, "diagnosis_treatment");
@@ -169,7 +169,7 @@ public class DiagnosisTreatmentController extends JeecgController<DiagnosisTreat
     * @param response
     * @return
     */
-    @RequiresPermissions("medical:diagnosis_treatment:importExcel")
+//    @RequiresPermissions("medical:diagnosis_treatment:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, DiagnosisTreatment.class);

+ 178 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/WarningManagementController.java

@@ -0,0 +1,178 @@
+package org.jeecg.modules.medical.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.medical.entity.WarningManagement;
+import org.jeecg.modules.medical.service.IWarningManagementService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: warning_management
+ * @Author: jeecg-boot
+ * @Date:   2023-05-09 19:59:10
+ * @Version: V1.0
+ */
+@Api(tags="警示管理")
+@RestController
+@RequestMapping("/medical/warningManagement")
+@Slf4j
+public class WarningManagementController extends JeecgController<WarningManagement, IWarningManagementService> {
+	@Autowired
+	private IWarningManagementService warningManagementService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param warningManagement
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "warning_management-分页列表查询")
+	@ApiOperation(value="warning_management-分页列表查询", notes="warning_management-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<WarningManagement>> queryPageList(WarningManagement warningManagement,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<WarningManagement> queryWrapper = QueryGenerator.initQueryWrapper(warningManagement, req.getParameterMap());
+		Page<WarningManagement> page = new Page<WarningManagement>(pageNo, pageSize);
+		IPage<WarningManagement> pageList = warningManagementService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param warningManagement
+	 * @return
+	 */
+	@AutoLog(value = "warning_management-添加")
+	@ApiOperation(value="warning_management-添加", notes="warning_management-添加")
+//	@RequiresPermissions("medical:warning_management:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody WarningManagement warningManagement) {
+		warningManagementService.save(warningManagement);
+		return Result.OK("添加成功!");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param warningManagement
+	 * @return
+	 */
+	@AutoLog(value = "warning_management-编辑")
+	@ApiOperation(value="warning_management-编辑", notes="warning_management-编辑")
+//	@RequiresPermissions("medical:warning_management:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody WarningManagement warningManagement) {
+		warningManagementService.updateById(warningManagement);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "warning_management-通过id删除")
+	@ApiOperation(value="warning_management-通过id删除", notes="warning_management-通过id删除")
+//	@RequiresPermissions("medical:warning_management:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		warningManagementService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "warning_management-批量删除")
+	@ApiOperation(value="warning_management-批量删除", notes="warning_management-批量删除")
+//	@RequiresPermissions("medical:warning_management:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.warningManagementService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "warning_management-通过id查询")
+	@ApiOperation(value="warning_management-通过id查询", notes="warning_management-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<WarningManagement> queryById(@RequestParam(name="id",required=true) String id) {
+		WarningManagement warningManagement = warningManagementService.getById(id);
+		if(warningManagement==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(warningManagement);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param warningManagement
+    */
+    @RequiresPermissions("medical:warning_management:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, WarningManagement warningManagement) {
+        return super.exportXls(request, warningManagement, WarningManagement.class, "warning_management");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("medical:warning_management:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, WarningManagement.class);
+    }
+
+}

+ 41 - 12
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/DiagnosisTreatment.java

@@ -36,6 +36,30 @@ public class DiagnosisTreatment implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键ID")
     private java.lang.Integer id;
+    /**国家编码*/
+    @Excel(name = "国家编码", width = 15)
+    @ApiModelProperty(value = "国家编码")
+    private java.lang.String countryCode;
+    /**计算机编码*/
+    @Excel(name = "计算机编码", width = 15)
+    @ApiModelProperty(value = "计算机编码")
+    private java.lang.String computerCode;
+    /**财务编码*/
+    @Excel(name = "财务编码", width = 15)
+    @ApiModelProperty(value = "财务编码")
+    private java.lang.String financeCode;
+    /**财务项目*/
+    @Excel(name = "财务项目", width = 15)
+    @ApiModelProperty(value = "财务项目")
+    private java.lang.String financeItem;
+    /**医保属性*/
+    @Excel(name = "医保属性", width = 15)
+    @ApiModelProperty(value = "医保属性")
+    private java.lang.String medicalAttribute;
+    /**先行自付比例*/
+    @Excel(name = "先行自付比例", width = 15)
+    @ApiModelProperty(value = "先行自付比例")
+    private java.lang.String paymentRate;
 	/**病案项目*/
 	@Excel(name = "病案项目", width = 15)
     @ApiModelProperty(value = "病案项目")
@@ -64,18 +88,19 @@ public class DiagnosisTreatment implements Serializable {
 	@Excel(name = "计价单位", width = 15)
     @ApiModelProperty(value = "计价单位")
     private java.lang.String unitAccount;
-	/**三级医院价格*/
-	@Excel(name = "三级医院价格", width = 15)
-    @ApiModelProperty(value = "三级医院价格")
-    private java.math.BigDecimal tertialHospitalPrice;
-	/**二级医院价格*/
-	@Excel(name = "二级医院价格", width = 15)
-    @ApiModelProperty(value = "二级医院价格")
-    private java.math.BigDecimal secondaryHospitalPrice;
-	/**一级医院及以下价格*/
-	@Excel(name = "一级医院及以下价格", width = 15)
-    @ApiModelProperty(value = "一级医院及以下价格")
-    private java.math.BigDecimal levelIHospitalPrice;
+    /**市级价格*/
+    @Excel(name = "市级价格", width = 15)
+    @ApiModelProperty(value = "市级价格")
+    private java.math.BigDecimal cityPrice;
+	/**县级价格*/
+	@Excel(name = "县级价格", width = 15)
+    @ApiModelProperty(value = "县级价格")
+    private java.math.BigDecimal countyPrice;
+
+	/**基层价格*/
+	@Excel(name = "基层价格", width = 15)
+    @ApiModelProperty(value = "基层价格")
+    private java.math.BigDecimal grassrootsPrice;
 	/**说明*/
 	@Excel(name = "说明", width = 15)
     @ApiModelProperty(value = "说明")
@@ -90,6 +115,10 @@ public class DiagnosisTreatment implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "执行日期")
     private java.util.Date executionDate;
+    /**备注说明*/
+    @Excel(name = "备注说明", width = 15)
+    @ApiModelProperty(value = "备注说明")
+    private java.lang.String remark;
 	/**状态*/
 	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")

+ 67 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/WarningManagement.java

@@ -0,0 +1,67 @@
+package org.jeecg.modules.medical.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: warning_management
+ * @Author: jeecg-boot
+ * @Date:   2023-05-09 19:59:10
+ * @Version: V1.0
+ */
+@Data
+@TableName("warning_management")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="warning_management对象", description="warning_management")
+public class WarningManagement implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
+    private String id;
+	/**警示管理级别*/
+	@Excel(name = "警示管理级别", width = 15)
+    @ApiModelProperty(value = "警示管理级别")
+    private String warningLevel;
+	/**违规级别*/
+	@Excel(name = "违规级别", width = 15)
+    @ApiModelProperty(value = "违规级别")
+    private String violationLevel;
+	/**警示说明*/
+	@Excel(name = "警示说明", width = 15)
+    @ApiModelProperty(value = "警示说明")
+    private String remark;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern =  "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

+ 17 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/WarningManagementMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.medical.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.medical.entity.WarningManagement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: warning_management
+ * @Author: jeecg-boot
+ * @Date:   2023-05-09 19:59:10
+ * @Version: V1.0
+ */
+public interface WarningManagementMapper extends BaseMapper<WarningManagement> {
+
+}

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/WarningManagementMapper.xml

@@ -0,0 +1,5 @@
+<?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="org.jeecg.modules.medical.mapper.WarningManagementMapper">
+
+</mapper>

+ 14 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IWarningManagementService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.medical.service;
+
+import org.jeecg.modules.medical.entity.WarningManagement;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: warning_management
+ * @Author: jeecg-boot
+ * @Date:   2023-05-09 19:59:10
+ * @Version: V1.0
+ */
+public interface IWarningManagementService extends IService<WarningManagement> {
+
+}

+ 19 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/WarningManagementServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.medical.service.impl;
+
+import org.jeecg.modules.medical.entity.WarningManagement;
+import org.jeecg.modules.medical.mapper.WarningManagementMapper;
+import org.jeecg.modules.medical.service.IWarningManagementService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: warning_management
+ * @Author: jeecg-boot
+ * @Date:   2023-05-09 19:59:10
+ * @Version: V1.0
+ */
+@Service
+public class WarningManagementServiceImpl extends ServiceImpl<WarningManagementMapper, WarningManagement> implements IWarningManagementService {
+
+}