Browse Source

数据校验

lenovodn 2 năm trước cách đây
mục cha
commit
01155c3b19
20 tập tin đã thay đổi với 284 bổ sung119 xóa
  1. 32 8
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/DiagnoseItemsController.java
  2. 24 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MaterialItemsController.java
  3. 138 111
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/OperativeItemsController.java
  4. 23 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/TreatmentItemsController.java
  5. 2 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/DiagnoseItemsMapper.java
  6. 3 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/MaterialItemsMapper.java
  7. 3 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/OperativeItemsMapper.java
  8. 3 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/TreatmentItemsMapper.java
  9. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/DiagnoseItemsMapper.xml
  10. 3 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/MaterialItemsMapper.xml
  11. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/OperativeItemsMapper.xml
  12. 4 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/TreatmentItemsMapper.xml
  13. 1 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IDiagnoseItemsService.java
  14. 4 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IMaterialItemsService.java
  15. 4 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IOperativeItemsService.java
  16. 4 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/ITreatmentItemsService.java
  17. 5 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/DiagnoseItemsServiceImpl.java
  18. 7 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/MaterialItemsServiceImpl.java
  19. 7 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/OperativeItemsServiceImpl.java
  20. 7 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/TreatmentItemsServiceImpl.java

+ 32 - 8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/DiagnoseItemsController.java

@@ -13,6 +13,7 @@ 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.entity.MaterialItems;
 import org.jeecg.modules.medical.service.IDiagnoseItemsService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -50,7 +51,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDiagnoseItemsService> {
 	@Autowired
 	private IDiagnoseItemsService diagnoseItemsService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -80,12 +81,35 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													   HttpServletRequest req) {
 		 Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
-
 		 IPage<DiagnoseItems> pageList = diagnoseItemsService.diagnosePage(page, diagnoseItems);
-
 		 return Result.OK(pageList);
 	 }
-	
+
+     @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+     @GetMapping(value = "/configured")
+     public Result<IPage<DiagnoseItems>> configured(DiagnoseItems diagnoseItems,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+         diagnoseItems = new DiagnoseItems();
+         QueryWrapper<DiagnoseItems> queryWrapper = QueryGenerator.initQueryWrapper(diagnoseItems, req.getParameterMap());
+         Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
+         queryWrapper.isNull("item_id");
+         IPage<DiagnoseItems> pageList = diagnoseItemsService.page(page, queryWrapper);
+         return Result.OK("以下数据请填写医保药品编码", pageList);
+     }
+
+     @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+     @GetMapping(value = "/dataValidation")
+     public Result<IPage<DiagnoseItems>> dataValidation(DiagnoseItems diagnoseItems,
+                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                        HttpServletRequest req) {
+         Page<DiagnoseItems> page = new Page<DiagnoseItems>(pageNo, pageSize);
+         IPage<DiagnoseItems> pageList = diagnoseItemsService.dataValidation(page);
+         return Result.OK("以下数据请填写医保药品编码", pageList);
+     }
+
 	/**
 	 *   添加
 	 *
@@ -99,7 +123,7 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 		diagnoseItemsService.save(diagnoseItems);
 		return Result.OK("添加成功!");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -113,7 +137,7 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 		diagnoseItemsService.updateById(diagnoseItems);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -127,7 +151,7 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 		diagnoseItemsService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -141,7 +165,7 @@ public class DiagnoseItemsController extends JeecgController<DiagnoseItems, IDia
 		this.diagnoseItemsService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

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

@@ -12,6 +12,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.medical.entity.MaterialItems;
+import org.jeecg.modules.medical.entity.MedicalInsuranceDrugs;
 import org.jeecg.modules.medical.service.DefaultExcelSupportChineseService;
 import org.jeecg.modules.medical.service.IMaterialItemsService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +61,30 @@ public class MaterialItemsController extends JeecgController<MaterialItems, IMat
 		IPage<MaterialItems> pageList = materialItemsService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+	 @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+	 @GetMapping(value = "/configured")
+	 public Result<IPage<MaterialItems>> configured(MaterialItems materialItems,
+															@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+															@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+															HttpServletRequest req) {
+		 materialItems = new MaterialItems();
+		 QueryWrapper<MaterialItems> queryWrapper = QueryGenerator.initQueryWrapper(materialItems, req.getParameterMap());
+		 Page<MaterialItems> page = new Page<MaterialItems>(pageNo, pageSize);
+		 queryWrapper.isNull("item_id");
+		 IPage<MaterialItems> pageList = materialItemsService.page(page, queryWrapper);
+		 return Result.OK("以下数据请填写医保药品编码", pageList);
+	 }
 
+	 @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+	 @GetMapping(value = "/dataValidation")
+	 public Result<IPage<MaterialItems>> dataValidation(MaterialItems materialItems,
+																@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+																@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+																HttpServletRequest req) {
+		 Page<MaterialItems> page = new Page<MaterialItems>(pageNo, pageSize);
+		 IPage<MaterialItems> pageList = materialItemsService.dataValidation(page);
+		 return Result.OK("以下数据请填写医保药品编码", pageList);
+	 }
 	/**
 	 *   添加
 	 *

+ 138 - 111
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/OperativeItemsController.java

@@ -9,6 +9,7 @@ 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;
@@ -20,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.medical.entity.OperativeItems;
+import org.jeecg.modules.medical.entity.TreatmentItems;
 import org.jeecg.modules.medical.service.IOperativeItemsService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -37,133 +39,158 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+/**
  * @Description: operative_items
  * @Author: jeecg-boot
- * @Date:   2023-06-08 09:26:07
+ * @Date: 2023-06-08 09:26:07
  * @Version: V1.0
  */
-@Api(tags="operative_items")
+@Api(tags = "operative_items")
 @RestController
 @RequestMapping("/medical/operativeItems")
 @Slf4j
 public class OperativeItemsController extends JeecgController<OperativeItems, IOperativeItemsService> {
-	@Autowired
-	private IOperativeItemsService operativeItemsService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param operativeItems
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "operative_items-分页列表查询")
-	@ApiOperation(value="operative_items-分页列表查询", notes="operative_items-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<OperativeItems>> queryPageList(OperativeItems operativeItems,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<OperativeItems> queryWrapper = QueryGenerator.initQueryWrapper(operativeItems, req.getParameterMap());
-		Page<OperativeItems> page = new Page<OperativeItems>(pageNo, pageSize);
-		IPage<OperativeItems> pageList = operativeItemsService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param operativeItems
-	 * @return
-	 */
-	@AutoLog(value = "operative_items-添加")
-	@ApiOperation(value="operative_items-添加", notes="operative_items-添加")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody OperativeItems operativeItems) {
-		operativeItemsService.save(operativeItems);
-		return Result.OK("添加成功!");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @param operativeItems
-	 * @return
-	 */
-	@AutoLog(value = "operative_items-编辑")
-	@ApiOperation(value="operative_items-编辑", notes="operative_items-编辑")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody OperativeItems operativeItems) {
-		operativeItemsService.updateById(operativeItems);
-		return Result.OK("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "operative_items-通过id删除")
-	@ApiOperation(value="operative_items-通过id删除", notes="operative_items-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		operativeItemsService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "operative_items-批量删除")
-	@ApiOperation(value="operative_items-批量删除", notes="operative_items-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.operativeItemsService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
-	}
-	
-	/**
-	 * 通过id查询
-	 *
-	 * @param id
-	 * @return
-	 */
-	//@AutoLog(value = "operative_items-通过id查询")
-	@ApiOperation(value="operative_items-通过id查询", notes="operative_items-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<OperativeItems> queryById(@RequestParam(name="id",required=true) String id) {
-		OperativeItems operativeItems = operativeItemsService.getById(id);
-		if(operativeItems==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(operativeItems);
-	}
+    @Autowired
+    private IOperativeItemsService operativeItemsService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param operativeItems
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "operative_items-分页列表查询")
+    @ApiOperation(value = "operative_items-分页列表查询", notes = "operative_items-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<OperativeItems>> queryPageList(OperativeItems operativeItems,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest req) {
+        QueryWrapper<OperativeItems> queryWrapper = QueryGenerator.initQueryWrapper(operativeItems, req.getParameterMap());
+        Page<OperativeItems> page = new Page<OperativeItems>(pageNo, pageSize);
+        IPage<OperativeItems> pageList = operativeItemsService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+    @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+    @GetMapping(value = "/configured")
+    public Result<IPage<OperativeItems>> configured(OperativeItems operativeItems,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        operativeItems = new OperativeItems();
+        QueryWrapper<OperativeItems> queryWrapper = QueryGenerator.initQueryWrapper(operativeItems, req.getParameterMap());
+        Page<OperativeItems> page = new Page<OperativeItems>(pageNo, pageSize);
+        queryWrapper.isNull("medical_operative_code");
+        IPage<OperativeItems> pageList = operativeItemsService.page(page, queryWrapper);
+        return Result.OK("以下数据请填写医保药品编码", pageList);
+    }
+
+    @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+    @GetMapping(value = "/dataValidation")
+    public Result<IPage<OperativeItems>> dataValidation(OperativeItems operativeItems,
+                                                        @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                        @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                        HttpServletRequest req) {
+        Page<OperativeItems> page = new Page<OperativeItems>(pageNo, pageSize);
+        IPage<OperativeItems> pageList = operativeItemsService.dataValidation(page);
+        return Result.OK("以下数据请填写医保药品编码", pageList);
+    }
+
+    /**
+     * 添加
+     *
+     * @param operativeItems
+     * @return
+     */
+    @AutoLog(value = "operative_items-添加")
+    @ApiOperation(value = "operative_items-添加", notes = "operative_items-添加")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody OperativeItems operativeItems) {
+        operativeItemsService.save(operativeItems);
+        return Result.OK("添加成功!");
+    }
+
+    /**
+     * 编辑
+     *
+     * @param operativeItems
+     * @return
+     */
+    @AutoLog(value = "operative_items-编辑")
+    @ApiOperation(value = "operative_items-编辑", notes = "operative_items-编辑")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody OperativeItems operativeItems) {
+        operativeItemsService.updateById(operativeItems);
+        return Result.OK("编辑成功!");
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "operative_items-通过id删除")
+    @ApiOperation(value = "operative_items-通过id删除", notes = "operative_items-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        operativeItemsService.removeById(id);
+        return Result.OK("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "operative_items-批量删除")
+    @ApiOperation(value = "operative_items-批量删除", notes = "operative_items-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.operativeItemsService.removeByIds(Arrays.asList(ids.split(",")));
+        return Result.OK("批量删除成功!");
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    //@AutoLog(value = "operative_items-通过id查询")
+    @ApiOperation(value = "operative_items-通过id查询", notes = "operative_items-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<OperativeItems> queryById(@RequestParam(name = "id", required = true) String id) {
+        OperativeItems operativeItems = operativeItemsService.getById(id);
+        if (operativeItems == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(operativeItems);
+    }
 
     /**
-    * 导出excel
-    *
-    * @param request
-    * @param operativeItems
-    */
+     * 导出excel
+     *
+     * @param request
+     * @param operativeItems
+     */
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, OperativeItems operativeItems) {
         return super.exportXls(request, operativeItems, OperativeItems.class, "operative_items");
     }
 
     /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, OperativeItems.class);

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

@@ -76,7 +76,30 @@ public class TreatmentItemsController extends JeecgController<TreatmentItems, IT
 		IPage<TreatmentItems> pageList = treatmentItemsService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
+	 @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+	 @GetMapping(value = "/configured")
+	 public Result<IPage<TreatmentItems>> configured(TreatmentItems treatmentItems,
+													@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+													@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+													HttpServletRequest req) {
+		 treatmentItems = new TreatmentItems();
+		 QueryWrapper<TreatmentItems> queryWrapper = QueryGenerator.initQueryWrapper(treatmentItems, req.getParameterMap());
+		 Page<TreatmentItems> page = new Page<TreatmentItems>(pageNo, pageSize);
+		 queryWrapper.isNull("item_id");
+		 IPage<TreatmentItems> pageList = treatmentItemsService.page(page, queryWrapper);
+		 return Result.OK("以下数据请填写医保药品编码", pageList);
+	 }
 
+	 @ApiOperation(value = "medical_insurance_drugs-分页列表查询", notes = "medical_insurance_drugs-分页列表查询")
+	 @GetMapping(value = "/dataValidation")
+	 public Result<IPage<TreatmentItems>> dataValidation(TreatmentItems treatmentItems,
+														@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+														@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+														HttpServletRequest req) {
+		 Page<TreatmentItems> page = new Page<TreatmentItems>(pageNo, pageSize);
+		 IPage<TreatmentItems> pageList = treatmentItemsService.dataValidation(page);
+		 return Result.OK("以下数据请填写医保药品编码", pageList);
+	 }
 	/**
 	 *   添加
 	 *

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

@@ -16,4 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DiagnoseItemsMapper extends BaseMapper<DiagnoseItems> {
     public IPage<DiagnoseItems> diagnosePage(Page<DiagnoseItems> page, @Param("ew")DiagnoseItems diagnoseItems);
+
+    IPage<DiagnoseItems> dataValidation(Page<DiagnoseItems> page);
 }

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.medical.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.medical.entity.MaterialItems;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaterialItemsMapper extends BaseMapper<MaterialItems> {
 
+    IPage<MaterialItems> dataValidation(Page<MaterialItems> page);
 }

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.medical.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.medical.entity.OperativeItems;
@@ -14,4 +16,5 @@ import org.jeecg.modules.medical.entity.OperativeItems;
  */
 public interface OperativeItemsMapper extends BaseMapper<OperativeItems> {
 
+    IPage<OperativeItems> dataValidation(Page<OperativeItems> page);
 }

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

@@ -2,6 +2,8 @@ package org.jeecg.modules.medical.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.medical.entity.TreatmentItems;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TreatmentItemsMapper extends BaseMapper<TreatmentItems> {
 
+    IPage<TreatmentItems> dataValidation(Page<TreatmentItems> page);
 }

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

@@ -12,5 +12,10 @@
           and pd.medical_ins_project_code = #{ew.projectCode}
           and pd.project_code_type = #{ew.projectCodeType}
 
+    </select>
+    <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.DiagnoseItems">
+        select *From diagnose_items d where medical_diagnose_code not in(select diagnose_code from diagnoses)
+
+
     </select>
 </mapper>

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

@@ -2,4 +2,7 @@
 <!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.MaterialItemsMapper">
 
+    <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.MaterialItems">
+        select *From material_items d where item_id not in(select consumable_code from consumable_material)
+    </select>
 </mapper>

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

@@ -2,4 +2,9 @@
 <!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.OperativeItemsMapper">
 
+    <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.OperativeItems">
+        select *From operative_items d where medical_operative_code not in(select oper_code from operative)
+
+
+    </select>
 </mapper>

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

@@ -2,4 +2,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.TreatmentItemsMapper">
 
+    <select id="dataValidation" resultType="org.jeecg.modules.medical.entity.TreatmentItems">
+        select *From treatment_items d where item_id not in(select project_code from diagnosis_treatment)
+
+    </select>
 </mapper>

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

@@ -18,4 +18,5 @@ public interface IDiagnoseItemsService extends IService<DiagnoseItems> {
 
      DiagnoseItems saveHisDiagnose(DiagnosesVO diagnosesVO);
 
+     IPage<DiagnoseItems> dataValidation(Page<DiagnoseItems> page);
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.medical.entity.AdviceDetailsVO;
 import org.jeecg.modules.medical.entity.MaterialItems;
@@ -30,4 +32,6 @@ public interface IMaterialItemsService extends IService<MaterialItems> {
     List<MaterialItems> loadDbExistsList(List<MaterialItems> list);
 
     MaterialItems saveMaterialItems(AdviceDetailsVO adviceDetailsVO);
+
+    IPage<MaterialItems> dataValidation(Page<MaterialItems> page);
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.medical.entity.OperativeItems;
 
@@ -11,4 +13,6 @@ import org.jeecg.modules.medical.entity.OperativeItems;
  */
 public interface IOperativeItemsService extends IService<OperativeItems> {
     OperativeItems saveHisOperativeItems(String code,String name,String json);
+
+    IPage<OperativeItems> dataValidation(Page<OperativeItems> page);
 }

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.medical.entity.AdviceDetailsVO;
 import org.jeecg.modules.medical.entity.TreatmentItems;
@@ -26,4 +28,6 @@ public interface ITreatmentItemsService extends IService<TreatmentItems> {
     Result<?> importExcel(HttpServletRequest request, HttpServletResponse response);
 
     TreatmentItems saveTreatmentItems(AdviceDetailsVO adviceDetailsVO);
+
+    IPage<TreatmentItems> dataValidation(Page<TreatmentItems> page);
 }

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

@@ -47,4 +47,9 @@ public class DiagnoseItemsServiceImpl extends ServiceImpl<DiagnoseItemsMapper, D
         }
         return null;
     }
+
+    @Override
+    public IPage<DiagnoseItems> dataValidation(Page<DiagnoseItems> page) {
+        return baseMapper.dataValidation(page);
+    }
 }

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

@@ -3,7 +3,9 @@ package org.jeecg.modules.medical.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
@@ -226,6 +228,11 @@ public class MaterialItemsServiceImpl extends ServiceImpl<MaterialItemsMapper, M
         return null;
     }
 
+    @Override
+    public IPage<MaterialItems> dataValidation(Page<MaterialItems> page) {
+        return baseMapper.dataValidation(page);
+    }
+
     private List<MaterialItems> listByItemIdIn(List<String> itemIds) {
         LambdaQueryWrapper<MaterialItems> in = Wrappers.<MaterialItems>lambdaQuery()
                 .in(MaterialItems::getItemId, itemIds);

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

@@ -1,6 +1,8 @@
 package org.jeecg.modules.medical.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.medical.entity.OperativeItems;
 import org.jeecg.modules.medical.mapper.OperativeItemsMapper;
 import org.jeecg.modules.medical.service.IOperativeItemsService;
@@ -29,4 +31,9 @@ public class OperativeItemsServiceImpl extends ServiceImpl<OperativeItemsMapper,
         this.save(operativeItems);
         return operativeItems;
     }
+
+    @Override
+    public IPage<OperativeItems> dataValidation(Page<OperativeItems> page) {
+        return baseMapper.dataValidation(page);
+    }
 }

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

@@ -3,7 +3,9 @@ package org.jeecg.modules.medical.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
@@ -155,6 +157,11 @@ public class TreatmentItemsServiceImpl extends ServiceImpl<TreatmentItemsMapper,
         return null;
     }
 
+    @Override
+    public IPage<TreatmentItems> dataValidation(Page<TreatmentItems> page) {
+        return baseMapper.dataValidation(page);
+    }
+
     /**
      * 根据医保项目编码,获取数据库中以后的内容
      * @param itemIds 医保项目编码