Merge remote-tracking branch 'origin/master'

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/DiagnoseItemsController.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.DiagnoseItems;
+import org.jeecg.modules.medical.service.IDiagnoseItemsService;
+
+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: diagnose_items
+ * @Author: jeecg-boot
+ * @Date:   2023-05-28 11:10:59
+ * @Version: V1.0
+ */
+@Api(tags="diagnose_items")
+@RestController
+@RequestMapping("/medical/diagnoseItems")
+@Slf4j
+public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDiagnoseItemsService> {
+	@Autowired
+	private IDiagnoseItemsService diagnoseItemsService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param diagnoseItems
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "diagnose_items-分页列表查询")
+	@ApiOperation(value="diagnose_items-分页列表查询", notes="diagnose_items-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<DiagnoseItems>> queryPageList(DiagnoseItems diagnoseItems,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<DiagnoseItems> queryWrapper = QueryGenerator.initQueryWrapper(diagnoseItems, req.getParameterMap());
+		Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
+		IPage<DiagnoseItems> pageList = diagnoseItemsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param diagnoseItems
+	 * @return
+	 */
+	@AutoLog(value = "diagnose_items-添加")
+	@ApiOperation(value="diagnose_items-添加", notes="diagnose_items-添加")
+	@RequiresPermissions("medical:diagnose_items:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody DiagnoseItems diagnoseItems) {
+		diagnoseItemsService.save(diagnoseItems);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param diagnoseItems
+	 * @return
+	 */
+	@AutoLog(value = "diagnose_items-编辑")
+	@ApiOperation(value="diagnose_items-编辑", notes="diagnose_items-编辑")
+	@RequiresPermissions("medical:diagnose_items:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody DiagnoseItems diagnoseItems) {
+		diagnoseItemsService.updateById(diagnoseItems);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "diagnose_items-通过id删除")
+	@ApiOperation(value="diagnose_items-通过id删除", notes="diagnose_items-通过id删除")
+	@RequiresPermissions("medical:diagnose_items:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		diagnoseItemsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "diagnose_items-批量删除")
+	@ApiOperation(value="diagnose_items-批量删除", notes="diagnose_items-批量删除")
+	@RequiresPermissions("medical:diagnose_items:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.diagnoseItemsService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "diagnose_items-通过id查询")
+	@ApiOperation(value="diagnose_items-通过id查询", notes="diagnose_items-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<DiagnoseItems> queryById(@RequestParam(name="id",required=true) String id) {
+		DiagnoseItems diagnoseItems = diagnoseItemsService.getById(id);
+		if(diagnoseItems==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(diagnoseItems);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param diagnoseItems
+    */
+    @RequiresPermissions("medical:diagnose_items:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, DiagnoseItems diagnoseItems) {
+        return super.exportXls(request, diagnoseItems, DiagnoseItems.class, "diagnose_items");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("medical:diagnose_items:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, DiagnoseItems.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/DiagnoseItems.java

@@ -0,0 +1,75 @@
+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: diagnose_items
+ * @Author: jeecg-boot
+ * @Date:   2023-05-28 11:10:59
+ * @Version: V1.0
+ */
+@Data
+@TableName("diagnose_items")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="diagnose_items对象", description="diagnose_items")
+public class DiagnoseItems implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键ID*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键ID")
+    private Integer id;
+	/**医院诊断编码*/
+	@Excel(name = "医院诊断编码", width = 15)
+    @ApiModelProperty(value = "医院诊断编码")
+    private String diagnoseCode;
+	/**医院诊断名称*/
+	@Excel(name = "医院诊断名称", width = 15)
+    @ApiModelProperty(value = "医院诊断名称")
+    private String diagnoseName;
+	/**医保诊断编码*/
+	@Excel(name = "医保诊断编码", width = 15)
+    @ApiModelProperty(value = "医保诊断编码")
+    private String medicalDiagnoseCode;
+	/**医保诊断名称*/
+	@Excel(name = "医保诊断名称", width = 15)
+    @ApiModelProperty(value = "医保诊断名称")
+    private String medicalDiagnoseName;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String state;
+	/**创建人*/
+    @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;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentWarningVO.java

@@ -23,7 +23,7 @@ public class MidIncidentWarningVO {
     private String medical_dept_code;//科室编码
     @NotBlank(message = "科室名称不能为空")
     private String medical_dept_name;//科室名称
-    @NotBlank(message = "就诊类型不能为空")
+    @NotBlank(message = "就诊类型不能为空（1：住院、2：门诊）")
     private String visit_type;//就诊类型（1住院、2门诊）
     /**
      * 险种类别

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/DiagnoseItemsMapper.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.DiagnoseItems;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: diagnose_items
+ * @Author: jeecg-boot
+ * @Date:   2023-05-28 11:10:59
+ * @Version: V1.0
+ */
+public interface DiagnoseItemsMapper extends BaseMapper<DiagnoseItems> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/DiagnoseItemsMapper.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.DiagnoseItemsMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/projectcache/HisMedicalProjectCache.java

@@ -3,9 +3,11 @@ package org.jeecg.modules.medical.ruleengine.projectcache;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.medical.Constant;
+import org.jeecg.modules.medical.entity.DiagnoseItems;
 import org.jeecg.modules.medical.entity.MaterialItems;
 import org.jeecg.modules.medical.entity.MedicalInsuranceDrugs;
 import org.jeecg.modules.medical.entity.TreatmentItems;
+import org.jeecg.modules.medical.service.IDiagnosesService;
 import org.jeecg.modules.medical.service.IMaterialItemsService;
 import org.jeecg.modules.medical.service.IMedicalInsuranceDrugsService;
 import org.jeecg.modules.medical.service.ITreatmentItemsService;
@@ -29,6 +31,8 @@ public class HisMedicalProjectCache {
     ITreatmentItemsService treatmentItemsService;
     @Autowired
     IMaterialItemsService materialItemsService;
+    @Autowired
+    IDiagnosesService diagnosesService;
 
     @PostConstruct
     public void initHisMedicalProjectCache(){
@@ -40,7 +44,7 @@ public class HisMedicalProjectCache {
             if (modNum > 0) {
                 pageNum = pageNum + 1;
             }
-            for (int i = 0; i < pageNum; i++) {
+            for (int i = 1; i <= pageNum; i++) {
                 IPage page = new Page(i, 1000);
                 List<MedicalInsuranceDrugs> medicalInsuranceDrugsList = medicalInsuranceDrugsService.page(page).getRecords();
                 for (MedicalInsuranceDrugs medicalInsuranceDrugs : medicalInsuranceDrugsList) {
@@ -56,7 +60,7 @@ public class HisMedicalProjectCache {
             if (modNum > 0) {
                 pageNum = pageNum + 1;
             }
-            for (int i = 0; i < pageNum; i++) {
+            for (int i = 1; i <= pageNum; i++) {
                 IPage page = new Page(i, 1000);
                 List<TreatmentItems> treatmentItemsList = treatmentItemsService.page(page).getRecords();
                 for (TreatmentItems treatmentItems : treatmentItemsList) {
@@ -82,5 +86,23 @@ public class HisMedicalProjectCache {
                 }
             }
         }
+
+
+        count = diagnosesService.count();
+        if(count>0) {
+            long pageNum = count / 1000;
+            long modNum = count % 1000;
+            if (modNum > 0) {
+                pageNum = pageNum + 1;
+            }
+            for (int i = 1; i <= pageNum; i++) {
+                IPage page = new Page(i, 1000);
+                List<DiagnoseItems> diagnoseItemsList = diagnosesService.page(page).getRecords();
+                for (DiagnoseItems diagnoseItems : diagnoseItemsList) {
+                    redisTemplate.opsForHash().put(Constant.HIS_MEDICAL_DICT_KEY, diagnoseItems.getDiagnoseCode(), diagnoseItems.getMedicalDiagnoseCode());
+                    redisTemplate.opsForHash().put(Constant.MEDICAL_CODE_NAME_KEY, diagnoseItems.getMedicalDiagnoseCode(), diagnoseItems.getMedicalDiagnoseName());
+                }
+            }
+        }
     }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IDiagnoseItemsService.java

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

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/DiagnoseItemsServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.medical.service.impl;
+
+import org.jeecg.modules.medical.entity.DiagnoseItems;
+import org.jeecg.modules.medical.mapper.DiagnoseItemsMapper;
+import org.jeecg.modules.medical.service.IDiagnoseItemsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: diagnose_items
+ * @Author: jeecg-boot
+ * @Date:   2023-05-28 11:10:59
+ * @Version: V1.0
+ */
+@Service
+public class DiagnoseItemsServiceImpl extends ServiceImpl<DiagnoseItemsMapper, DiagnoseItems> implements IDiagnoseItemsService {
+
+}