From e53334611e8d51fb67e769cba898743f11dcf627 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 16 六月 2023 17:45:23 +0800
Subject: [PATCH] 患者管理相关接口，提交
---
smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java | 97 ++
smartor/src/main/java/com/smartor/mapper/SvyCategoryMapper.java | 22
smartor/src/main/java/com/smartor/service/IPatMedInspectionService.java | 62 +
smartor/src/main/java/com/smartor/mapper/PatMedDrugMapper.java | 63 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java | 10
smartor/src/main/java/com/smartor/domain/PatMedDrug.java | 298 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java | 2
smartor/src/main/java/com/smartor/domain/PatArchive.java | 2
smartor/src/main/java/com/smartor/service/impl/PatMedDrugServiceImpl.java | 90 +
smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java | 102 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java | 2
smartor/src/main/java/com/smartor/domain/SvyCategory.java | 114 -
smartor/src/main/java/com/smartor/mapper/PatMedInspectionMapper.java | 63 +
smartor/src/main/java/com/smartor/domain/PatMedInspection.java | 395 ++++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java | 100 ++
smartor/src/main/java/com/smartor/service/ISvyCategoryService.java | 20
smartor/src/main/java/com/smartor/service/impl/PatMedInspectionServiceImpl.java | 97 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java | 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java | 51
smartor/src/main/java/com/smartor/domain/BaseTagcategory.java | 18
smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml | 92 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java | 27
smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java | 2
smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java | 62 +
smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml | 218 ++++
smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java | 4
smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | 37
smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml | 116 ++
smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml | 182 +++
smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java | 63 +
smartor/src/main/java/com/smartor/service/IPatMedDrugService.java | 62 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java | 107 ++
smartor/src/main/java/com/smartor/domain/BaseTag.java | 6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java | 100 ++
smartor/src/main/java/com/smartor/domain/PatMedPhysical.java | 25
37 files changed, 2,535 insertions(+), 190 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java
new file mode 100644
index 0000000..19ecf19
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/PatArchinvecontactController.java
@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatArchinvecontact;
+import com.smartor.service.IPatArchinvecontactService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廋ontroller
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Api(description = "鎮ｈ�呰仈绯绘柟寮�")
+@RestController
+@RequestMapping("/system/archinvecontact")
+public class PatArchinvecontactController extends BaseController {
+ @Autowired
+ private IPatArchinvecontactService patArchinvecontactService;
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:archinvecontact:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PatArchinvecontact patArchinvecontact) {
+ startPage();
+ List<PatArchinvecontact> list = patArchinvecontactService.selectPatArchinvecontactList(patArchinvecontact);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎮ｈ�呰仈绯绘柟寮忓垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:archinvecontact:export')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatArchinvecontact patArchinvecontact) {
+ List<PatArchinvecontact> list = patArchinvecontactService.selectPatArchinvecontactList(patArchinvecontact);
+ ExcelUtil<PatArchinvecontact> util = new ExcelUtil<PatArchinvecontact>(PatArchinvecontact.class);
+ util.exportExcel(response, list, "鎮ｈ�呰仈绯绘柟寮忔暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呰仈绯绘柟寮忚缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:archinvecontact:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patArchinvecontactService.selectPatArchinvecontactById(id));
+ }
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ */
+ @ApiOperation("鏂板鎮ｈ�呰仈绯绘柟寮�")
+ @PreAuthorize("@ss.hasPermi('system:archinvecontact:add')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody PatArchinvecontact patArchinvecontact) {
+ return toAjax(patArchinvecontactService.insertPatArchinvecontact(patArchinvecontact));
+ }
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ */
+ @ApiOperation("淇敼鎮ｈ�呰仈绯绘柟寮�")
+ @PreAuthorize("@ss.hasPermi('system:archinvecontact:edit')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody PatArchinvecontact patArchinvecontact) {
+ return toAjax(patArchinvecontactService.updatePatArchinvecontact(patArchinvecontact));
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ */
+ @ApiOperation("鍒犻櫎鎮ｈ�呰仈绯绘柟寮�")
+ @PreAuthorize("@ss.hasPermi('system:archinvecontact:remove')")
+ @Log(title = "鎮ｈ�呰仈绯绘柟寮�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patArchinvecontactService.deletePatArchinvecontactByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
index cdb8c60..f8d2ac2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/BaseTagController.java
@@ -44,7 +44,7 @@
*/
@ApiOperation("鏌ヨ鏍囩鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:tag:list')")
- @GetMapping("/list")
+ @PostMapping("/list")
public TableDataInfo list(@RequestBody BaseTag baseTag) {
startPage();
List<BaseTag> list = baseTagService.selectBaseTagList(baseTag);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java
index 6581552..2d0f9b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedBloodsugarController.java
@@ -25,7 +25,7 @@
* @author ruoyi
* @date 2023-06-07
*/
-@Api("鎮ｈ�呰绯栬褰�")
+@Api(description = "鎮ｈ�呰绯栬褰�")
@RestController
@RequestMapping("/system/bloodsugar")
public class PatMedBloodsugarController extends BaseController {
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java
new file mode 100644
index 0000000..56cc1bd
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedDrugController.java
@@ -0,0 +1,107 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatMedDrug;
+import com.smartor.service.IPatMedDrugService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呯敤鑽褰旵ontroller
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Api(description = "鎮ｈ�呯敤鑽褰�")
+@RestController
+@RequestMapping("/system/drug")
+public class PatMedDrugController extends BaseController
+{
+ @Autowired
+ private IPatMedDrugService patMedDrugService;
+
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:drug:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PatMedDrug patMedDrug)
+ {
+ startPage();
+ List<PatMedDrug> list = patMedDrugService.selectPatMedDrugList(patMedDrug);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎮ｈ�呯敤鑽褰曞垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎮ｈ�呯敤鑽褰曞垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:drug:export')")
+ @Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatMedDrug patMedDrug)
+ {
+ List<PatMedDrug> list = patMedDrugService.selectPatMedDrugList(patMedDrug);
+ ExcelUtil<PatMedDrug> util = new ExcelUtil<PatMedDrug>(PatMedDrug.class);
+ util.exportExcel(response, list, "鎮ｈ�呯敤鑽褰曟暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呯敤鑽褰曡缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呯敤鑽褰曡缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:drug:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(patMedDrugService.selectPatMedDrugById(id));
+ }
+
+ /**
+ * 鏂板鎮ｈ�呯敤鑽褰�
+ */
+ @ApiOperation("鏂板鎮ｈ�呯敤鑽褰�")
+ @PreAuthorize("@ss.hasPermi('system:drug:add')")
+ @Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody PatMedDrug patMedDrug)
+ {
+ return toAjax(patMedDrugService.insertPatMedDrug(patMedDrug));
+ }
+
+ /**
+ * 淇敼鎮ｈ�呯敤鑽褰�
+ */
+ @ApiOperation("淇敼鎮ｈ�呯敤鑽褰�")
+ @PreAuthorize("@ss.hasPermi('system:drug:edit')")
+ @Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody PatMedDrug patMedDrug)
+ {
+ return toAjax(patMedDrugService.updatePatMedDrug(patMedDrug));
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呯敤鑽褰�
+ */
+ @ApiOperation("鍒犻櫎鎮ｈ�呯敤鑽褰�")
+ @PreAuthorize("@ss.hasPermi('system:drug:remove')")
+ @Log(title = "鎮ｈ�呯敤鑽褰�", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(patMedDrugService.deletePatMedDrugByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
index d799fe1..2696fbb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedHypertensionController.java
@@ -21,15 +21,14 @@
/**
* 鎮ｈ�呴珮琛�鍘嬭褰旵ontroller
- *
+ *
* @author ruoyi
* @date 2023-06-07
*/
@RestController
@RequestMapping("/smartor/hypertension")
-@Api("鎮ｈ�呴珮琛�鍘嬭褰�")
-public class PatMedHypertensionController extends BaseController
-{
+@Api(description = "鎮ｈ�呴珮琛�鍘嬭褰�")
+public class PatMedHypertensionController extends BaseController {
@Autowired
private IPatMedHypertensionService patMedHypertensionService;
@@ -39,8 +38,7 @@
@PreAuthorize("@ss.hasPermi('system:hypertension:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ鎮ｈ�呴珮琛�鍘嬭褰曞垪琛�")
- public TableDataInfo list(PatMedHypertension patMedHypertension)
- {
+ public TableDataInfo list(PatMedHypertension patMedHypertension) {
startPage();
List<PatMedHypertension> list = patMedHypertensionService.selectPatMedHypertensionList(patMedHypertension);
return getDataTable(list);
@@ -53,8 +51,7 @@
@PreAuthorize("@ss.hasPermi('system:hypertension:export')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, PatMedHypertension patMedHypertension)
- {
+ public void export(HttpServletResponse response, PatMedHypertension patMedHypertension) {
List<PatMedHypertension> list = patMedHypertensionService.selectPatMedHypertensionList(patMedHypertension);
ExcelUtil<PatMedHypertension> util = new ExcelUtil<PatMedHypertension>(PatMedHypertension.class);
util.exportExcel(response, list, "鎮ｈ�呴珮琛�鍘嬭褰曟暟鎹�");
@@ -67,8 +64,7 @@
@ApiImplicitParam(name = "getInfo", value = "涓婚敭ID", dataType = "long", dataTypeClass = Long.class)
@PreAuthorize("@ss.hasPermi('system:hypertension:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(patMedHypertensionService.selectPatMedHypertensionById(id));
}
@@ -79,8 +75,7 @@
@PreAuthorize("@ss.hasPermi('system:hypertension:add')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody PatMedHypertension patMedHypertension)
- {
+ public AjaxResult add(@RequestBody PatMedHypertension patMedHypertension) {
return toAjax(patMedHypertensionService.insertPatMedHypertension(patMedHypertension));
}
@@ -91,8 +86,7 @@
@PreAuthorize("@ss.hasPermi('system:hypertension:edit')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody PatMedHypertension patMedHypertension)
- {
+ public AjaxResult edit(@RequestBody PatMedHypertension patMedHypertension) {
return toAjax(patMedHypertensionService.updatePatMedHypertension(patMedHypertension));
}
@@ -103,9 +97,8 @@
@PreAuthorize("@ss.hasPermi('system:hypertension:remove')")
@Log(title = "鎮ｈ�呴珮琛�鍘嬭褰�", businessType = BusinessType.DELETE)
@ApiImplicitParam(name = "remove", value = "涓婚敭ID", dataType = "long", dataTypeClass = Array.class)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(patMedHypertensionService.deletePatMedHypertensionByIds(ids));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
index a50de21..3fbecd7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInhospController.java
@@ -2,6 +2,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +30,7 @@
* @author smartor
* @date 2023-03-04
*/
+@Api(description = "鎮ｈ�呬綇闄㈣褰�")
@RestController
@RequestMapping("/smartor/patinhosp")
public class PatMedInhospController extends BaseController
@@ -37,6 +41,7 @@
/**
* 鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
+ @ApiOperation("鏌ヨ鎮ｈ�呬綇闄㈣褰曞垪琛�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:list')")
@GetMapping("/list")
public TableDataInfo list(PatMedInhosp patMedInhosp)
@@ -49,6 +54,7 @@
/**
* 瀵煎嚭鎮ｈ�呬綇闄㈣褰曞垪琛�
*/
+ @ApiOperation("瀵煎嚭鎮ｈ�呬綇闄㈣褰曞垪琛�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:export')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -62,6 +68,7 @@
/**
* 鑾峰彇鎮ｈ�呬綇闄㈣褰曡缁嗕俊鎭�
*/
+ @ApiOperation("鑾峰彇鎮ｈ�呬綇闄㈣褰曡缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
@GetMapping(value = "/{inhospid}")
public AjaxResult getInfo(@PathVariable("inhospid") Long inhospid)
@@ -72,6 +79,7 @@
/**
* 鏂板鎮ｈ�呬綇闄㈣褰�
*/
+ @ApiOperation("鏂板鎮ｈ�呬綇闄㈣褰�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:add')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.INSERT)
@PostMapping
@@ -83,6 +91,7 @@
/**
* 淇敼鎮ｈ�呬綇闄㈣褰�
*/
+ @ApiOperation("淇敼鎮ｈ�呬綇闄㈣褰�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:edit')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.UPDATE)
@PutMapping
@@ -94,6 +103,7 @@
/**
* 鍒犻櫎鎮ｈ�呬綇闄㈣褰�
*/
+ @ApiOperation("鍒犻櫎鎮ｈ�呬綇闄㈣褰�")
@PreAuthorize("@ss.hasPermi('smartor:patinhosp:remove')")
@Log(title = "鎮ｈ�呬綇闄㈣褰�", businessType = BusinessType.DELETE)
@DeleteMapping("/{inhospids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java
new file mode 100644
index 0000000..a8cf7de
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedInspectionController.java
@@ -0,0 +1,100 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatMedInspection;
+import com.smartor.service.IPatMedInspectionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮鏌ユ楠岃褰旵ontroller
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Api(description = "鎮ｈ�呮鏌ユ楠岃褰�")
+@RestController
+@RequestMapping("/system/inspection")
+public class PatMedInspectionController extends BaseController {
+ @Autowired
+ private IPatMedInspectionService patMedInspectionService;
+
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
+ */
+ @ApiOperation("鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:inspection:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(PatMedInspection patMedInspection) {
+ startPage();
+ List<PatMedInspection> list = patMedInspectionService.selectPatMedInspectionList(patMedInspection);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
+ */
+ @ApiOperation("瀵煎嚭鎮ｈ�呮鏌ユ楠岃褰曞垪琛�")
+ @PreAuthorize("@ss.hasPermi('system:inspection:export')")
+ @Log(title = "鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatMedInspection patMedInspection) {
+ List<PatMedInspection> list = patMedInspectionService.selectPatMedInspectionList(patMedInspection);
+ ExcelUtil<PatMedInspection> util = new ExcelUtil<PatMedInspection>(PatMedInspection.class);
+ util.exportExcel(response, list, "鎮ｈ�呮鏌ユ楠岃褰曟暟鎹�");
+ }
+
+ /**
+ * 鑾峰彇鎮ｈ�呮鏌ユ楠岃褰曡缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇鎮ｈ�呮鏌ユ楠岃褰曡缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('system:inspection:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patMedInspectionService.selectPatMedInspectionById(id));
+ }
+
+ /**
+ * 鏂板鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ @PreAuthorize("@ss.hasPermi('system:inspection:add')")
+ @Log(title = "鏂板鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.INSERT)
+ @ApiOperation("鏂板鎮ｈ�呮鏌ユ楠岃褰�")
+ @PostMapping
+ public AjaxResult add(@RequestBody PatMedInspection patMedInspection) {
+ return toAjax(patMedInspectionService.insertPatMedInspection(patMedInspection));
+ }
+
+ /**
+ * 淇敼鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ @PreAuthorize("@ss.hasPermi('system:inspection:edit')")
+ @Log(title = "淇敼鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.UPDATE)
+ @ApiOperation("淇敼鎮ｈ�呮鏌ユ楠岃褰�")
+ @PutMapping
+ public AjaxResult edit(@RequestBody PatMedInspection patMedInspection) {
+ return toAjax(patMedInspectionService.updatePatMedInspection(patMedInspection));
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ @PreAuthorize("@ss.hasPermi('system:inspection:remove')")
+ @Log(title = "鎮ｈ�呮鏌ユ楠岃褰�", businessType = BusinessType.DELETE)
+ @ApiOperation("鎮ｈ�呮鏌ユ楠岃褰�")
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patMedInspectionService.deletePatMedInspectionByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
index 671b110..d7502dd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOuthospController.java
@@ -34,7 +34,7 @@
*/
@RestController
@RequestMapping("/smartor/patouthosp")
-@Api("鎮ｈ�呴棬璇婅褰�")
+@Api(description = "鎮ｈ�呴棬璇婅褰�")
public class PatMedOuthospController extends BaseController {
@Autowired
private IPatMedOuthospService patMedOuthospService;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java
index 5bebbe7..f4bc5de 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedPhysicalController.java
@@ -2,6 +2,9 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,6 +30,7 @@
* @author smartor
* @date 2023-03-04
*/
+@Api(description = "鎮ｈ�呬綋妫�璁板綍")
@RestController
@RequestMapping("/smartor/patphysical")
public class PatMedPhysicalController extends BaseController
@@ -37,6 +41,7 @@
/**
* 鏌ヨ鎮ｈ�呬綋妫�璁板綍鍒楄〃
*/
+ @ApiOperation("鏌ヨ鎮ｈ�呬綋妫�璁板綍鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:list')")
@GetMapping("/list")
public TableDataInfo list(PatMedPhysical patMedPhysical)
@@ -49,6 +54,7 @@
/**
* 瀵煎嚭鎮ｈ�呬綋妫�璁板綍鍒楄〃
*/
+ @ApiOperation("瀵煎嚭鎮ｈ�呬綋妫�璁板綍鍒楄〃")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:export')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@@ -62,6 +68,7 @@
/**
* 鑾峰彇鎮ｈ�呬綋妫�璁板綍璇︾粏淇℃伅
*/
+ @ApiOperation("鑾峰彇鎮ｈ�呬綋妫�璁板綍璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -72,6 +79,7 @@
/**
* 鏂板鎮ｈ�呬綋妫�璁板綍
*/
+ @ApiOperation("鏂板鎮ｈ�呬綋妫�璁板綍")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:add')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.INSERT)
@PostMapping
@@ -83,6 +91,7 @@
/**
* 淇敼鎮ｈ�呬綋妫�璁板綍
*/
+ @ApiOperation("淇敼鎮ｈ�呬綋妫�璁板綍")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:edit')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.UPDATE)
@PutMapping
@@ -94,6 +103,7 @@
/**
* 鍒犻櫎鎮ｈ�呬綋妫�璁板綍
*/
+ @ApiOperation("鍒犻櫎鎮ｈ�呬綋妫�璁板綍")
@PreAuthorize("@ss.hasPermi('smartor:patphysical:remove')")
@Log(title = "鎮ｈ�呬綋妫�璁板綍", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
index 6e51663..f49d9cf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedWeightController.java
@@ -25,7 +25,7 @@
* @author ruoyi
* @date 2023-06-07
*/
-@Api("鎮ｈ�呬綋閲嶈褰�")
+@Api(description = "鎮ｈ�呬綋閲嶈褰�")
@RestController
@RequestMapping("/system/weight")
public class PatMedWeightController extends BaseController
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
index dfe83ea..f9b4d93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyCategoryController.java
@@ -1,17 +1,15 @@
-package com.smartor.controller;
+package com.ruoyi.web.controller.smartor;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,14 +21,14 @@
/**
* 闂嵎鍒嗙被Controller
- *
+ *
* @author ruoyi
* @date 2023-03-02
*/
+@Api(description = "闂嵎鍒嗙被")
@RestController
@RequestMapping("/smartor/svycategory")
-public class SvyCategoryController extends BaseController
-{
+public class SvyCategoryController extends BaseController {
@Autowired
private ISvyCategoryService svyCategoryService;
@@ -39,8 +37,7 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svycategory:list')")
@GetMapping("/list")
- public TableDataInfo list(SvyCategory svyCategory)
- {
+ public TableDataInfo list(SvyCategory svyCategory) {
startPage();
List<SvyCategory> list = svyCategoryService.selectSvyCategoryList(svyCategory);
return getDataTable(list);
@@ -52,21 +49,20 @@
@PreAuthorize("@ss.hasPermi('smartor:svycategory:export')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, SvyCategory svyCategory)
- {
+ public void export(HttpServletResponse response, SvyCategory svyCategory) {
List<SvyCategory> list = svyCategoryService.selectSvyCategoryList(svyCategory);
ExcelUtil<SvyCategory> util = new ExcelUtil<SvyCategory>(SvyCategory.class);
util.exportExcel(response, list, "闂嵎鍒嗙被鏁版嵁");
}
/**
- * 鑾峰彇闂嵎鍒嗙被璇︾粏淇℃伅
+ * 鑾峰彇闂嵎鍒嗙被淇℃伅閫氳繃鍒嗙被鍚嶇О
*/
- @PreAuthorize("@ss.hasPermi('smartor:svycategory:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(svyCategoryService.selectSvyCategoryById(id));
+ // @PreAuthorize("@ss.hasPermi('smartor:svycategory:query')")
+ @ApiOperation("鑾峰彇闂嵎鍒嗙被璇︾粏淇℃伅锛堥棶鍗风被鍒級")
+ @PostMapping(value = "/getInfo")
+ public TableDataInfo getInfo(@RequestParam(required = false) String categoryname) {
+ return getDataTable(svyCategoryService.selectSvyCategoryById(categoryname));
}
/**
@@ -75,8 +71,7 @@
@PreAuthorize("@ss.hasPermi('smartor:svycategory:add')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody SvyCategory svyCategory)
- {
+ public AjaxResult add(@RequestBody SvyCategory svyCategory) {
return toAjax(svyCategoryService.insertSvyCategory(svyCategory));
}
@@ -86,8 +81,7 @@
@PreAuthorize("@ss.hasPermi('smartor:svycategory:edit')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody SvyCategory svyCategory)
- {
+ public AjaxResult edit(@RequestBody SvyCategory svyCategory) {
return toAjax(svyCategoryService.updateSvyCategory(svyCategory));
}
@@ -96,9 +90,8 @@
*/
@PreAuthorize("@ss.hasPermi('smartor:svycategory:remove')")
@Log(title = "闂嵎鍒嗙被", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(svyCategoryService.deleteSvyCategoryByIds(ids));
}
}
diff --git a/smartor/src/main/java/com/smartor/domain/BaseTag.java b/smartor/src/main/java/com/smartor/domain/BaseTag.java
index b40ea7e..86210f7 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseTag.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseTag.java
@@ -80,4 +80,10 @@
@Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date uploadTime;
+ /**
+ * 鏄惁寮�鍚�
+ */
+ @ApiModelProperty("鏄惁寮�鍚� 1寮�鍚� 0鍏抽棴")
+ private Integer isenable;
+
}
diff --git a/smartor/src/main/java/com/smartor/domain/BaseTagcategory.java b/smartor/src/main/java/com/smartor/domain/BaseTagcategory.java
index 914c3a2..0f61fad 100644
--- a/smartor/src/main/java/com/smartor/domain/BaseTagcategory.java
+++ b/smartor/src/main/java/com/smartor/domain/BaseTagcategory.java
@@ -25,47 +25,47 @@
/**
* 鑷ID
*/
- @ApiModelProperty(name = "鑷ID")
+ @ApiModelProperty(value = "鑷ID")
private Long tagcategoryid;
/**
* 鏈烘瀯ID
*/
- @ApiModelProperty(name = "鏈烘瀯ID")
+ @ApiModelProperty(value = "鏈烘瀯ID")
@Excel(name = " 鏈烘瀯ID ")
private String orgid;
/**
* 鎷奸煶鐮�
*/
- @ApiModelProperty(name = "鎷奸煶鐮�")
+ @ApiModelProperty(value = "鎷奸煶鐮�")
@Excel(name = " 鎷奸煶鐮� ")
private String pym;
/**
* 浜旂瑪鐮�
*/
- @ApiModelProperty(name = "浜旂瑪鐮�")
+ @ApiModelProperty(value = "浜旂瑪鐮�")
@Excel(name = " 浜旂瑪鐮� ")
private String wbm;
/**
* 鍒犻櫎鏍囪
*/
- @ApiModelProperty(name = "鍒犻櫎鏍囪")
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
private String delFlag;
/**
* 涓婁紶鏍囪
*/
- @ApiModelProperty(name = "涓婁紶鏍囪")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
@Excel(name = " 涓婁紶鏍囪 ")
private Long isupload;
/**
* 涓婁紶鏃堕棿
*/
- @ApiModelProperty(name = "涓婁紶鏃堕棿")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date uploadTime;
@@ -73,11 +73,11 @@
/**
* 鏍囩鍚嶇О
*/
- @ApiModelProperty(name = "鏍囩绫诲埆鍚嶇О")
+ @ApiModelProperty(value = "鏍囩绫诲埆鍚嶇О")
@Excel(name = " 鏍囩绫诲埆鍚嶇О ")
private String categoryname;
- @ApiModelProperty(name = "鏍囩鏁伴噺")
+ @ApiModelProperty(value = "鏍囩鏁伴噺")
private String tagNum;
}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java b/smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java
new file mode 100644
index 0000000..628853a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatArchinvecontact.java
@@ -0,0 +1,102 @@
+package com.smartor.domain;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮忓璞� pat_archinvecontact
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@ApiModel(value = "PatArchinvecontact", description = "鎮ｈ�呰仈绯绘柟寮忓璞�")
+@Data
+public class PatArchinvecontact extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
+ private Long id;
+
+ /**
+ * 鑱旂郴鏂瑰紡ID
+ */
+ @Excel(name = " 鑱旂郴鏂瑰紡ID ")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡ID")
+ private Long patid;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @Excel(name = " 鑱旂郴鏂瑰紡 ")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
+ private String contactway;
+
+ /**
+ * 鍏崇郴
+ */
+ @Excel(name = " 鍏崇郴 ")
+ @ApiModelProperty(value = "鍏崇郴")
+ private Long relation;
+
+ /**
+ * 鏁版嵁鏉ユ簮
+ */
+ @Excel(name = " 鏁版嵁鏉ユ簮 ")
+ @ApiModelProperty(value = "鏁版嵁鏉ユ簮")
+ private Long datasource;
+
+ /**
+ * 鏄惁榛樿
+ */
+ @Excel(name = " 鏄惁榛樿 ")
+ @ApiModelProperty(value = "鏄惁榛樿")
+ private Long isdefault;
+
+ /**
+ * 鏈烘瀯ID
+ */
+ @Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /**
+ * 涓婁紶鏍囪
+ */
+ @Excel(name = " 涓婁紶鏍囪 ")
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ private Long isupload;
+
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date uploadTime;
+
+ /**
+ * 鑱旂郴濮撳悕
+ */
+ @Excel(name = " 鑱旂郴濮撳悕 ")
+ @ApiModelProperty(value = "鑱旂郴濮撳悕")
+ private String contactname;
+
+
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchive.java b/smartor/src/main/java/com/smartor/domain/PatArchive.java
index 1271664..b133aee 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchive.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -27,7 +27,7 @@
/**
* 鑷ID
*/
- @ApiModelProperty(name = "鑷ID")
+ @ApiModelProperty("鑷ID")
private Long patid;
/**
diff --git a/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java b/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
index 6bfe281..0b6c84e 100644
--- a/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
+++ b/smartor/src/main/java/com/smartor/domain/PatArchiveAndTag.java
@@ -26,7 +26,7 @@
/**
* 鑷ID
*/
- @ApiModelProperty(name = "鑷ID")
+ @ApiModelProperty(value = "鑷ID")
private Long patid;
/**
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedDrug.java b/smartor/src/main/java/com/smartor/domain/PatMedDrug.java
new file mode 100644
index 0000000..b4d2040
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatMedDrug.java
@@ -0,0 +1,298 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 鎮ｈ�呯敤鑽褰曞璞� pat_med_drug
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+public class PatMedDrug extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 鑷ID */
+ private Long id;
+
+ /** 娴佹按鍙� */
+ @Excel(name = " 娴佹按鍙� ")
+ private String serialnum;
+
+ /** 妗ｆID */
+ @Excel(name = " 妗ｆID ")
+ private Long patid;
+
+ /** 鑽搧鍚嶇О */
+ @Excel(name = " 鑽搧鍚嶇О ")
+ private String drugname;
+
+ /** 寮�鏂规棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 寮�鏂规棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date opendate;
+
+ /** 鑽搧绫诲瀷 */
+ @Excel(name = " 鑽搧绫诲瀷 ")
+ private String drugtype;
+
+ /** 鍗曚綅 */
+ @Excel(name = " 鍗曚綅 ")
+ private String unit;
+
+ /** 瑙勬牸 */
+ @Excel(name = " 瑙勬牸 ")
+ private String spec;
+
+ /** 鐢ㄦ硶 */
+ @Excel(name = " 鐢ㄦ硶 ")
+ private String drugusage;
+
+ /** 鍓傞噺 */
+ @Excel(name = " 鍓傞噺 ")
+ private String dose;
+
+ /** 鏈烘瀯ID */
+ @Excel(name = " 鏈烘瀯ID ")
+ private String orgid;
+
+ /** 鍒犻櫎鏍囪 */
+ private String delFlag;
+
+ /** 涓婁紶鏍囪 */
+ @Excel(name = " 涓婁紶鏍囪 ")
+ private Long isupload;
+
+ /** 涓婁紶鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date uploadTime;
+
+ /** 鑽搧ID */
+ @Excel(name = " 鑽搧ID ")
+ private Long drugid;
+
+ /** 灏辫瘖绫诲瀷 */
+ @Excel(name = " 灏辫瘖绫诲瀷 ")
+ private Long visittype;
+
+ /** 灏辫瘖ID */
+ @Excel(name = " 灏辫瘖ID ")
+ private Long visitid;
+
+ /** 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗� */
+ @Excel(name = " 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚灏辫瘖 9鏃犲尮閰嶆柟妗� ")
+ private Long schemestatus;
+
+ /** 鏂规鐘舵�佹搷浣滄椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鏂规鐘舵�佹搷浣滄椂闂� ", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date schemetime;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setSerialnum(String serialnum)
+ {
+ this.serialnum = serialnum;
+ }
+
+ public String getSerialnum()
+ {
+ return serialnum;
+ }
+ public void setPatid(Long patid)
+ {
+ this.patid = patid;
+ }
+
+ public Long getPatid()
+ {
+ return patid;
+ }
+ public void setDrugname(String drugname)
+ {
+ this.drugname = drugname;
+ }
+
+ public String getDrugname()
+ {
+ return drugname;
+ }
+ public void setOpendate(Date opendate)
+ {
+ this.opendate = opendate;
+ }
+
+ public Date getOpendate()
+ {
+ return opendate;
+ }
+ public void setDrugtype(String drugtype)
+ {
+ this.drugtype = drugtype;
+ }
+
+ public String getDrugtype()
+ {
+ return drugtype;
+ }
+ public void setUnit(String unit)
+ {
+ this.unit = unit;
+ }
+
+ public String getUnit()
+ {
+ return unit;
+ }
+ public void setSpec(String spec)
+ {
+ this.spec = spec;
+ }
+
+ public String getSpec()
+ {
+ return spec;
+ }
+ public void setDrugusage(String drugusage)
+ {
+ this.drugusage = drugusage;
+ }
+
+ public String getDrugusage()
+ {
+ return drugusage;
+ }
+ public void setDose(String dose)
+ {
+ this.dose = dose;
+ }
+
+ public String getDose()
+ {
+ return dose;
+ }
+ public void setOrgid(String orgid)
+ {
+ this.orgid = orgid;
+ }
+
+ public String getOrgid()
+ {
+ return orgid;
+ }
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+ public void setIsupload(Long isupload)
+ {
+ this.isupload = isupload;
+ }
+
+ public Long getIsupload()
+ {
+ return isupload;
+ }
+ public void setUploadTime(Date uploadTime)
+ {
+ this.uploadTime = uploadTime;
+ }
+
+ public Date getUploadTime()
+ {
+ return uploadTime;
+ }
+ public void setDrugid(Long drugid)
+ {
+ this.drugid = drugid;
+ }
+
+ public Long getDrugid()
+ {
+ return drugid;
+ }
+ public void setVisittype(Long visittype)
+ {
+ this.visittype = visittype;
+ }
+
+ public Long getVisittype()
+ {
+ return visittype;
+ }
+ public void setVisitid(Long visitid)
+ {
+ this.visitid = visitid;
+ }
+
+ public Long getVisitid()
+ {
+ return visitid;
+ }
+ public void setSchemestatus(Long schemestatus)
+ {
+ this.schemestatus = schemestatus;
+ }
+
+ public Long getSchemestatus()
+ {
+ return schemestatus;
+ }
+ public void setSchemetime(Date schemetime)
+ {
+ this.schemetime = schemetime;
+ }
+
+ public Date getSchemetime()
+ {
+ return schemetime;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("serialnum", getSerialnum())
+ .append("patid", getPatid())
+ .append("drugname", getDrugname())
+ .append("opendate", getOpendate())
+ .append("drugtype", getDrugtype())
+ .append("unit", getUnit())
+ .append("spec", getSpec())
+ .append("drugusage", getDrugusage())
+ .append("dose", getDose())
+ .append("orgid", getOrgid())
+ .append("delFlag", getDelFlag())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("isupload", getIsupload())
+ .append("uploadTime", getUploadTime())
+ .append("drugid", getDrugid())
+ .append("visittype", getVisittype())
+ .append("visitid", getVisitid())
+ .append("schemestatus", getSchemestatus())
+ .append("schemetime", getSchemetime())
+ .toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
index 1df76cf..d5aacdc 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -2,6 +2,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -13,122 +15,157 @@
* @author smartor
* @date 2023-03-04
*/
+@ApiModel(value = "PatMedInhosp", description = "鎮ｈ�呬綇闄㈣褰曞璞�")
public class PatMedInhosp extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 鑷ID */
+ @ApiModelProperty(value = "鑷ID")
private Long inhospid;
/** 娴佹按鍙� */
+ @ApiModelProperty(value = "娴佹按鍙�")
private String serialnum;
/** 鍖婚櫌鍚嶇О */
+ @ApiModelProperty(value = "鍖婚櫌鍚嶇О")
@Excel(name = " 鍖婚櫌鍚嶇О ")
private String hospitalname;
/** 鍖婚櫌缂栧彿 */
+ @ApiModelProperty(value = "鍖婚櫌缂栧彿")
private String hospitalcode;
/** 闄㈠尯缂栧彿 */
+ @ApiModelProperty(value = "闄㈠尯缂栧彿")
private String hospitaldistrictcode;
/** 闄㈠尯鍚嶇О */
+ @ApiModelProperty(value = "闄㈠尯鍚嶇О")
@Excel(name = " 闄㈠尯鍚嶇О ")
private String hospitaldistrictname;
/** 鍏ラ櫌璇婃柇ICD鍊� */
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇ICD鍊�")
private String icd10code;
/** 鍏ラ櫌璇婃柇鍚嶇О */
+ @ApiModelProperty(value = "鍏ラ櫌璇婃柇鍚嶇О")
private String diagname;
/** 鍏ラ櫌鏃堕棿 */
+ @ApiModelProperty(value = "鍏ラ櫌鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 鍏ラ櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date starttime;
/** 鍑洪櫌鏃堕棿 */
+ @ApiModelProperty(value = "鍑洪櫌鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = " 鍑洪櫌鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date endtime;
/** 鍏ラ櫌绉戝浠ｇ爜 */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝浠ｇ爜")
private String deptcode;
/** 鍏ラ櫌绉戝鍚嶇О */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝鍚嶇О")
private String deptname;
/** 鎴块棿鍙� */
+ @ApiModelProperty(value = "鎴块棿鍙�")
private String roomno;
/** 搴婁綅鍙� */
+ @ApiModelProperty(value = "搴婁綅鍙�")
@Excel(name = " 搴婁綅鍙� ")
private String bedno;
/** 鏈烘瀯ID */
+ @ApiModelProperty(value = "鏈烘瀯ID")
@Excel(name = " 鏈烘瀯ID ")
private String orgid;
/** 鍒犻櫎鏍囪 */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
private String delFlag;
/** 涓婁紶鏍囪 */
+ @ApiModelProperty(value = "涓婁紶鏍囪")
private Long isupload;
/** 涓婁紶鏃堕棿 */
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
private Date uploadTime;
/** 妗ｆID */
+ @ApiModelProperty(value = "妗ｆID")
private Long patid;
/** 鍑洪櫌璇婃柇 */
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇")
@Excel(name = " 鍑洪櫌璇婃柇 ")
private String leavediagname;
/** 鍑洪櫌璇婃柇ICD鍊� */
+ @ApiModelProperty(value = "鍑洪櫌璇婃柇ICD鍊�")
private String leaveicd10code;
/** 鍖荤敓宸ュ彿 */
+ @ApiModelProperty(value = "鍖荤敓宸ュ彿")
private String drcode;
/** 鍖荤敓鍚嶇О */
+ @ApiModelProperty(value = "鍖荤敓鍚嶇О")
@Excel(name = " 鍖荤敓鍚嶇О ")
private String drname;
/** 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗� */
+ @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鍏ラ櫌 2鐢熸垚鍑洪櫌 9鏃犲尮閰嶆柟妗�")
private Long schemestatus;
/** 鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗� */
+ @ApiModelProperty(value = "鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗�")
private Long generalschemestatus;
/** 鍑洪櫌绉戝浠ｇ爜 */
+ @ApiModelProperty(value = "鍑洪櫌绉戝浠ｇ爜")
private String leaveldeptcode;
/** 鍑洪櫌绉戝鍚嶇О */
+ @ApiModelProperty(value = "鍑洪櫌绉戝鍚嶇О")
@Excel(name = " 鍑洪櫌绉戝鍚嶇О ")
private String leaveldeptname;
/** 鐥呭尯ID */
+ @ApiModelProperty(value = "鐥呭尯ID")
private Long hospitaldistrictid;
/** 鍑洪櫌鐥呭尯缂栧彿 */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯缂栧彿")
private String leavehospitaldistrictcode;
/** 鍑洪櫌鐥呭尯鍚嶇О */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯鍚嶇О")
@Excel(name = " 鍑洪櫌鐥呭尯鍚嶇О ")
private String leavehospitaldistrictname;
/** 鍑洪櫌鐥呭尯ID */
+ @ApiModelProperty(value = "鍑洪櫌鐥呭尯ID")
private Long leavehospitaldistrictid;
/** 鍏ラ櫌绉戝ID */
+ @ApiModelProperty(value = "鍏ラ櫌绉戝ID")
private Long deptid;
/** 鍑洪櫌绉戝ID */
+ @ApiModelProperty(value = "鍑洪櫌绉戝ID")
private Long leaveldeptid;
/** 鏂规鐘舵�佹搷浣滄椂闂� */
+ @ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
private Date schemetime;
public void setInhospid(Long inhospid)
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedInspection.java b/smartor/src/main/java/com/smartor/domain/PatMedInspection.java
new file mode 100644
index 0000000..4e195d3
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatMedInspection.java
@@ -0,0 +1,395 @@
+package com.smartor.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鎮ｈ�呮鏌ユ楠岃褰曞璞� pat_med_inspection
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@ApiModel(value = "PatMedInspection", description = "鎮ｈ�呮鏌ユ楠岃褰曞璞�")
+public class PatMedInspection extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 鑷ID */
+ @ApiModelProperty(value = "鑷ID")
+ private Long id;
+
+ /** 娴佹按鍙� */
+ @Excel(name = " 娴佹按鍙� ")
+ @ApiModelProperty(value = "娴佹按鍙�")
+ private String serialnum;
+
+ /** 妗ｆID */
+ @Excel(name = " 妗ｆID ")
+ @ApiModelProperty(value = "妗ｆID")
+ private Long patid;
+
+ /** 绫诲瀷;0.妫�楠岄」鐩� 1.妫�鏌ラ」鐩� */
+ @ApiModelProperty(value = "绫诲瀷;0.妫�楠岄」鐩� 1.妫�鏌ラ」鐩�")
+ @Excel(name = " 绫诲瀷;0.妫�楠岄」鐩� 1.妫�鏌ラ」鐩� ")
+ private Long projecttype;
+
+ /** 椤圭洰缂栧彿 */
+ @Excel(name = " 椤圭洰缂栧彿 ")
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
+ private String projectcode;
+
+ /** 椤圭洰鍚嶇О */
+ @Excel(name = " 椤圭洰鍚嶇О ")
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String projectname;
+
+ /** 鎶ュ憡鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鎶ュ憡鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鎶ュ憡鏃堕棿")
+ private Date reporttime;
+
+ /** 鍖婚櫌鍚嶇О */
+ @Excel(name = " 鍖婚櫌鍚嶇О ")
+ @ApiModelProperty(value = "鍖婚櫌鍚嶇О")
+ private String hospitalname;
+
+ /** 鍖婚櫌缂栧彿 */
+ @Excel(name = " 鍖婚櫌缂栧彿 ")
+ @ApiModelProperty(value = "鍖婚櫌缂栧彿")
+ private String hospitalcode;
+
+ /** 鏈烘瀯ID */
+ @Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(value = "鏈烘瀯ID")
+ private String orgid;
+
+ /** 鍒犻櫎鏍囪 */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ private String delFlag;
+
+ /** 涓婁紶鏍囪 */
+ @ApiModelProperty(value = "涓婁紶鏍囪")
+ @Excel(name = " 涓婁紶鏍囪 ")
+ private Long isupload;
+
+ /** 涓婁紶鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
+ private Date uploadTime;
+
+ /** 椤圭洰ID */
+ @Excel(name = " 椤圭洰ID ")
+ @ApiModelProperty(value = "椤圭洰ID")
+ private Long projectid;
+
+ /** 鐢宠鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鐢宠鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鐢宠鏃堕棿")
+ private Date applicationtime;
+
+ /** 灏辫瘖绫诲瀷 */
+ @Excel(name = " 灏辫瘖绫诲瀷 ")
+ @ApiModelProperty(value = "灏辫瘖绫诲瀷")
+ private Long visittype;
+
+ /** 灏辫瘖ID */
+ @Excel(name = " 灏辫瘖ID ")
+ @ApiModelProperty(value = "灏辫瘖ID")
+ private Long visitid;
+
+ /** 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鐢宠鍚� 2.鐢熸垚鎶ュ憡鍚� 9鏃犲尮閰嶆柟妗� */
+ @Excel(name = " 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鐢宠鍚� 2.鐢熸垚鎶ュ憡鍚� 9鏃犲尮閰嶆柟妗� ")
+ @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚鐢宠鍚� 2.鐢熸垚鎶ュ憡鍚� 9鏃犲尮閰嶆柟妗�")
+ private Long schemestatus;
+
+ /** 鏄惁寮傚父;0鍚� 1鏄� */
+ @Excel(name = " 鏄惁寮傚父;0鍚� 1鏄� ")
+ @ApiModelProperty(value = "鏄惁寮傚父;0鍚� 1鏄�")
+ private Long isabnormal;
+
+ /** 鎶ュ憡缁撹 */
+ @Excel(name = " 鎶ュ憡缁撹 ")
+ @ApiModelProperty(value = "鎶ュ憡缁撹")
+ private String reportconclusion;
+
+ /** 鏂规鐘舵�佹搷浣滄椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = " 鏂规鐘舵�佹搷浣滄椂闂� ", width = 30, dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
+ private Date schemetime;
+
+ /** 寮�鍗曠瀹や唬鐮� */
+ @Excel(name = " 寮�鍗曠瀹や唬鐮� ")
+ @ApiModelProperty(value = "寮�鍗曠瀹や唬鐮�")
+ private String deptcode;
+
+ /** 寮�鍗曠瀹ゅ悕绉� */
+ @Excel(name = " 寮�鍗曠瀹ゅ悕绉� ")
+ @ApiModelProperty(value = "寮�鍗曠瀹ゅ悕绉�")
+ private String deptname;
+
+ /** 寮�鍗曠瀹D */
+ @Excel(name = " 寮�鍗曠瀹D ")
+ @ApiModelProperty(value = "寮�鍗曠瀹D")
+ private Long deptid;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+ public void setSerialnum(String serialnum)
+ {
+ this.serialnum = serialnum;
+ }
+
+ public String getSerialnum()
+ {
+ return serialnum;
+ }
+ public void setPatid(Long patid)
+ {
+ this.patid = patid;
+ }
+
+ public Long getPatid()
+ {
+ return patid;
+ }
+ public void setProjecttype(Long projecttype)
+ {
+ this.projecttype = projecttype;
+ }
+
+ public Long getProjecttype()
+ {
+ return projecttype;
+ }
+ public void setProjectcode(String projectcode)
+ {
+ this.projectcode = projectcode;
+ }
+
+ public String getProjectcode()
+ {
+ return projectcode;
+ }
+ public void setProjectname(String projectname)
+ {
+ this.projectname = projectname;
+ }
+
+ public String getProjectname()
+ {
+ return projectname;
+ }
+ public void setReporttime(Date reporttime)
+ {
+ this.reporttime = reporttime;
+ }
+
+ public Date getReporttime()
+ {
+ return reporttime;
+ }
+ public void setHospitalname(String hospitalname)
+ {
+ this.hospitalname = hospitalname;
+ }
+
+ public String getHospitalname()
+ {
+ return hospitalname;
+ }
+ public void setHospitalcode(String hospitalcode)
+ {
+ this.hospitalcode = hospitalcode;
+ }
+
+ public String getHospitalcode()
+ {
+ return hospitalcode;
+ }
+ public void setOrgid(String orgid)
+ {
+ this.orgid = orgid;
+ }
+
+ public String getOrgid()
+ {
+ return orgid;
+ }
+ public void setDelFlag(String delFlag)
+ {
+ this.delFlag = delFlag;
+ }
+
+ public String getDelFlag()
+ {
+ return delFlag;
+ }
+ public void setIsupload(Long isupload)
+ {
+ this.isupload = isupload;
+ }
+
+ public Long getIsupload()
+ {
+ return isupload;
+ }
+ public void setUploadTime(Date uploadTime)
+ {
+ this.uploadTime = uploadTime;
+ }
+
+ public Date getUploadTime()
+ {
+ return uploadTime;
+ }
+ public void setProjectid(Long projectid)
+ {
+ this.projectid = projectid;
+ }
+
+ public Long getProjectid()
+ {
+ return projectid;
+ }
+ public void setApplicationtime(Date applicationtime)
+ {
+ this.applicationtime = applicationtime;
+ }
+
+ public Date getApplicationtime()
+ {
+ return applicationtime;
+ }
+ public void setVisittype(Long visittype)
+ {
+ this.visittype = visittype;
+ }
+
+ public Long getVisittype()
+ {
+ return visittype;
+ }
+ public void setVisitid(Long visitid)
+ {
+ this.visitid = visitid;
+ }
+
+ public Long getVisitid()
+ {
+ return visitid;
+ }
+ public void setSchemestatus(Long schemestatus)
+ {
+ this.schemestatus = schemestatus;
+ }
+
+ public Long getSchemestatus()
+ {
+ return schemestatus;
+ }
+ public void setIsabnormal(Long isabnormal)
+ {
+ this.isabnormal = isabnormal;
+ }
+
+ public Long getIsabnormal()
+ {
+ return isabnormal;
+ }
+ public void setReportconclusion(String reportconclusion)
+ {
+ this.reportconclusion = reportconclusion;
+ }
+
+ public String getReportconclusion()
+ {
+ return reportconclusion;
+ }
+ public void setSchemetime(Date schemetime)
+ {
+ this.schemetime = schemetime;
+ }
+
+ public Date getSchemetime()
+ {
+ return schemetime;
+ }
+ public void setDeptcode(String deptcode)
+ {
+ this.deptcode = deptcode;
+ }
+
+ public String getDeptcode()
+ {
+ return deptcode;
+ }
+ public void setDeptname(String deptname)
+ {
+ this.deptname = deptname;
+ }
+
+ public String getDeptname()
+ {
+ return deptname;
+ }
+ public void setDeptid(Long deptid)
+ {
+ this.deptid = deptid;
+ }
+
+ public Long getDeptid()
+ {
+ return deptid;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("serialnum", getSerialnum())
+ .append("patid", getPatid())
+ .append("projecttype", getProjecttype())
+ .append("projectcode", getProjectcode())
+ .append("projectname", getProjectname())
+ .append("reporttime", getReporttime())
+ .append("hospitalname", getHospitalname())
+ .append("hospitalcode", getHospitalcode())
+ .append("orgid", getOrgid())
+ .append("delFlag", getDelFlag())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("isupload", getIsupload())
+ .append("uploadTime", getUploadTime())
+ .append("projectid", getProjectid())
+ .append("applicationtime", getApplicationtime())
+ .append("visittype", getVisittype())
+ .append("visitid", getVisitid())
+ .append("schemestatus", getSchemestatus())
+ .append("isabnormal", getIsabnormal())
+ .append("reportconclusion", getReportconclusion())
+ .append("schemetime", getSchemetime())
+ .append("deptcode", getDeptcode())
+ .append("deptname", getDeptname())
+ .append("deptid", getDeptid())
+ .toString();
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedPhysical.java b/smartor/src/main/java/com/smartor/domain/PatMedPhysical.java
index 5989917..5240c4b 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedPhysical.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedPhysical.java
@@ -2,6 +2,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -13,82 +15,105 @@
* @author smartor
* @date 2023-03-04
*/
+@ApiModel(value = "PatMedPhysical", description = "鎮ｈ�呬綋妫�璁板綍瀵硅薄")
public class PatMedPhysical extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 鑷ID */
+ @ApiModelProperty(value = "鑷ID")
private Long id;
/** 娴佹按鍙� */
@Excel(name = " 娴佹按鍙� ")
+ @ApiModelProperty(value = "娴佹按鍙�")
private String serialnum;
/** 妗ｆID */
+ @ApiModelProperty(value = "妗ｆID")
private Long patid;
/** 鎬荤粨鍖荤敓宸ュ彿 */
+ @ApiModelProperty(value = "鎬荤粨鍖荤敓宸ュ彿")
private String drcode;
/** 鎬荤粨鍖荤敓鍚嶇О */
@Excel(name = " 鎬荤粨鍖荤敓鍚嶇О ")
+ @ApiModelProperty(value = "鎬荤粨鍖荤敓鍚嶇О")
private String drname;
/** 浣撴鍗曚綅/鍖婚櫌缂栧彿 */
+ @ApiModelProperty(value = "浣撴鍗曚綅/鍖婚櫌缂栧彿")
private String hospitalcode;
/** 浣撴鍗曚綅/鍖婚櫌 */
@Excel(name = " 浣撴鍗曚綅/鍖婚櫌 ")
+ @ApiModelProperty(value = "浣撴鍗曚綅/鍖婚櫌")
private String hospitalname;
/** 浣撴鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "浣撴鏃堕棿")
@Excel(name = " 浣撴鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
private Date physicaldate;
/** 鏈烘瀯ID */
@Excel(name = " 鏈烘瀯ID ")
+ @ApiModelProperty(value = "鏈烘瀯ID")
private String orgid;
/** 鍒犻櫎鏍囪 */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
private String delFlag;
/** 涓婁紶鏍囪 */
+ @ApiModelProperty(value = "涓婁紶鏍囪")
private Long isupload;
/** 涓婁紶鏃堕棿 */
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
private Date uploadTime;
/** 绉戝浠ｇ爜 */
+ @ApiModelProperty(value = "绉戝浠ｇ爜")
private String deptcode;
/** 绉戝鍚嶇О */
+ @ApiModelProperty(value = "绉戝鍚嶇О")
@Excel(name = " 绉戝鍚嶇О ")
private String deptname;
/** 浣撴椤圭洰鍚嶇О */
+ @ApiModelProperty(value = "浣撴椤圭洰鍚嶇О")
@Excel(name = " 浣撴椤圭洰鍚嶇О ")
private String projectname;
/** 浣撴椤圭洰缂栫爜 */
+ @ApiModelProperty(value = "浣撴椤圭洰缂栫爜")
private String projectcode;
/** 鐘舵��;0.宸查绾� 1.宸蹭綋妫� 2.鎶ュ憡宸插嚭 */
+ @ApiModelProperty(value = "鐘舵��;0.宸查绾� 1.宸蹭綋妫� 2.鎶ュ憡宸插嚭")
private Long state;
/** 鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚浣撴鍓� 2鐢熸垚浣撴鍚� 3.鐢熸垚鎶ュ憡宸插嚭 9鏃犲尮閰嶆柟妗� */
+ @ApiModelProperty(value = "鏄惁鐢熸垚鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚浣撴鍓� 2鐢熸垚浣撴鍚� 3.鐢熸垚鎶ュ憡宸插嚭 9鏃犲尮閰嶆柟妗�")
private Long schemestatus;
/** 鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗� */
+ @ApiModelProperty(value = "鏄惁鐢熸垚閫氱敤鏂规鐘舵��;0鏈敓鎴� 1鐢熸垚 9鏃犲尮閰嶆柟妗�")
private Long generalschemestatus;
/** 绉戝ID */
+ @ApiModelProperty(value = "绉戝ID")
private Long deptid;
/** 浣撴濂楅ID */
+ @ApiModelProperty(value = "浣撴濂楅ID")
private Long projectid;
/** 鏂规鐘舵�佹搷浣滄椂闂� */
+ @ApiModelProperty(value = "鏂规鐘舵�佹搷浣滄椂闂�")
private Date schemetime;
public void setId(Long id)
diff --git a/smartor/src/main/java/com/smartor/domain/SvyCategory.java b/smartor/src/main/java/com/smartor/domain/SvyCategory.java
index ad06d4d..4ac4511 100644
--- a/smartor/src/main/java/com/smartor/domain/SvyCategory.java
+++ b/smartor/src/main/java/com/smartor/domain/SvyCategory.java
@@ -1,7 +1,11 @@
package com.smartor.domain;
import java.util.Date;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -9,102 +13,58 @@
/**
* 闂嵎鍒嗙被瀵硅薄 svy_category
- *
+ *
* @author ruoyi
* @date 2023-03-02
*/
-public class SvyCategory extends BaseEntity
-{
+@ApiModel(value = "SvyCategory", description = "闂嵎鍒嗙被瀵硅薄")
+@Data
+public class SvyCategory extends BaseEntity {
private static final long serialVersionUID = 1L;
- /** 鑷ID */
+ /**
+ * 鑷ID
+ */
+ @ApiModelProperty(value = "鑷ID")
private Long id;
- /** 鍒嗙被鍚嶇О */
+ /**
+ * 鍒嗙被鍚嶇О
+ */
+ @ApiModelProperty(value = "闂嵎鍒嗙被鍚嶇О")
@Excel(name = " 鍒嗙被鍚嶇О ")
private String categoryname;
- /** 鏈烘瀯ID */
+ /**
+ * 鏈烘瀯ID
+ */
+ @ApiModelProperty(value = "鏈烘瀯ID")
@Excel(name = " 鏈烘瀯ID ")
private String orgid;
- /** 鍒犻櫎鏍囪 */
+ /**
+ * 鍒犻櫎鏍囪
+ */
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
private String delFlag;
- /** 涓婁紶鏍囪 */
+ /**
+ * 涓婁紶鏍囪
+ */
+ @ApiModelProperty(value = "涓婁紶鏍囪")
private Long isupload;
- /** 涓婁紶鏃堕棿 */
+ /**
+ * 涓婁紶鏃堕棿
+ */
+ @ApiModelProperty(value = "涓婁紶鏃堕棿")
private Date uploadTime;
- public void setId(Long id)
- {
- this.id = id;
- }
+ /**
+ * 闂嵎鏁伴噺
+ */
+ @ApiModelProperty(value = "闂嵎鏁伴噺")
+ private String svyNum;
- public Long getId()
- {
- return id;
- }
- public void setCategoryname(String categoryname)
- {
- this.categoryname = categoryname;
- }
- public String getCategoryname()
- {
- return categoryname;
- }
- public void setOrgid(String orgid)
- {
- this.orgid = orgid;
- }
-
- public String getOrgid()
- {
- return orgid;
- }
- public void setDelFlag(String delFlag)
- {
- this.delFlag = delFlag;
- }
-
- public String getDelFlag()
- {
- return delFlag;
- }
- public void setIsupload(Long isupload)
- {
- this.isupload = isupload;
- }
-
- public Long getIsupload()
- {
- return isupload;
- }
- public void setUploadTime(Date uploadTime)
- {
- this.uploadTime = uploadTime;
- }
-
- public Date getUploadTime()
- {
- return uploadTime;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("categoryname", getCategoryname())
- .append("orgid", getOrgid())
- .append("delFlag", getDelFlag())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("isupload", getIsupload())
- .append("uploadTime", getUploadTime())
- .toString();
- }
}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java b/smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java
new file mode 100644
index 0000000..5e809db
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatArchinvecontactMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatArchinvecontact;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廙apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Mapper
+public interface PatArchinvecontactMapper {
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ public PatArchinvecontact selectPatArchinvecontactById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 鎮ｈ�呰仈绯绘柟寮忛泦鍚�
+ */
+ public List<PatArchinvecontact> selectPatArchinvecontactList(PatArchinvecontact patArchinvecontact);
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int insertPatArchinvecontact(PatArchinvecontact patArchinvecontact);
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int updatePatArchinvecontact(PatArchinvecontact patArchinvecontact);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatArchinvecontactById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatArchinvecontactByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedDrugMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedDrugMapper.java
new file mode 100644
index 0000000..902bdb7
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedDrugMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatMedDrug;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呯敤鑽褰昅apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Mapper
+public interface PatMedDrugMapper {
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰�
+ *
+ * @param id 鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 鎮ｈ�呯敤鑽褰�
+ */
+ public PatMedDrug selectPatMedDrugById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 鎮ｈ�呯敤鑽褰曢泦鍚�
+ */
+ public List<PatMedDrug> selectPatMedDrugList(PatMedDrug patMedDrug);
+
+ /**
+ * 鏂板鎮ｈ�呯敤鑽褰�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 缁撴灉
+ */
+ public int insertPatMedDrug(PatMedDrug patMedDrug);
+
+ /**
+ * 淇敼鎮ｈ�呯敤鑽褰�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 缁撴灉
+ */
+ public int updatePatMedDrug(PatMedDrug patMedDrug);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呯敤鑽褰�
+ *
+ * @param id 鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatMedDrugById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呯敤鑽褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatMedDrugByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedInspectionMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedInspectionMapper.java
new file mode 100644
index 0000000..638e26f
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedInspectionMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatMedInspection;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮鏌ユ楠岃褰昅apper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Mapper
+public interface PatMedInspectionMapper {
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param id 鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ public PatMedInspection selectPatMedInspectionById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 鎮ｈ�呮鏌ユ楠岃褰曢泦鍚�
+ */
+ public List<PatMedInspection> selectPatMedInspectionList(PatMedInspection patMedInspection);
+
+ /**
+ * 鏂板鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 缁撴灉
+ */
+ public int insertPatMedInspection(PatMedInspection patMedInspection);
+
+ /**
+ * 淇敼鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 缁撴灉
+ */
+ public int updatePatMedInspection(PatMedInspection patMedInspection);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param id 鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatMedInspectionById(Long id);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deletePatMedInspectionByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/SvyCategoryMapper.java b/smartor/src/main/java/com/smartor/mapper/SvyCategoryMapper.java
index 6a06d97..6876508 100644
--- a/smartor/src/main/java/com/smartor/mapper/SvyCategoryMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/SvyCategoryMapper.java
@@ -1,27 +1,29 @@
package com.smartor.mapper;
import java.util.List;
+
import com.smartor.domain.SvyCategory;
+import org.apache.ibatis.annotations.Mapper;
/**
* 闂嵎鍒嗙被Mapper鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2023-03-02
*/
-public interface SvyCategoryMapper
-{
+@Mapper
+public interface SvyCategoryMapper {
/**
* 鏌ヨ闂嵎鍒嗙被
- *
+ *
* @param id 闂嵎鍒嗙被涓婚敭
* @return 闂嵎鍒嗙被
*/
- public SvyCategory selectSvyCategoryById(Long id);
+ public List<SvyCategory> selectSvyCategoryById(String categoryname);
/**
* 鏌ヨ闂嵎鍒嗙被鍒楄〃
- *
+ *
* @param svyCategory 闂嵎鍒嗙被
* @return 闂嵎鍒嗙被闆嗗悎
*/
@@ -29,7 +31,7 @@
/**
* 鏂板闂嵎鍒嗙被
- *
+ *
* @param svyCategory 闂嵎鍒嗙被
* @return 缁撴灉
*/
@@ -37,7 +39,7 @@
/**
* 淇敼闂嵎鍒嗙被
- *
+ *
* @param svyCategory 闂嵎鍒嗙被
* @return 缁撴灉
*/
@@ -45,7 +47,7 @@
/**
* 鍒犻櫎闂嵎鍒嗙被
- *
+ *
* @param id 闂嵎鍒嗙被涓婚敭
* @return 缁撴灉
*/
@@ -53,7 +55,7 @@
/**
* 鎵归噺鍒犻櫎闂嵎鍒嗙被
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java b/smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java
new file mode 100644
index 0000000..52487fc
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatArchinvecontactService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatArchinvecontact;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廠ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+public interface IPatArchinvecontactService
+{
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ public PatArchinvecontact selectPatArchinvecontactById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 鎮ｈ�呰仈绯绘柟寮忛泦鍚�
+ */
+ public List<PatArchinvecontact> selectPatArchinvecontactList(PatArchinvecontact patArchinvecontact);
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int insertPatArchinvecontact(PatArchinvecontact patArchinvecontact);
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ public int updatePatArchinvecontact(PatArchinvecontact patArchinvecontact);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呰仈绯绘柟寮忎富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deletePatArchinvecontactByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮忎俊鎭�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatArchinvecontactById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedDrugService.java b/smartor/src/main/java/com/smartor/service/IPatMedDrugService.java
new file mode 100644
index 0000000..b0509c4
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatMedDrugService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatMedDrug;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呯敤鑽褰昐ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+public interface IPatMedDrugService
+{
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰�
+ *
+ * @param id 鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 鎮ｈ�呯敤鑽褰�
+ */
+ public PatMedDrug selectPatMedDrugById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 鎮ｈ�呯敤鑽褰曢泦鍚�
+ */
+ public List<PatMedDrug> selectPatMedDrugList(PatMedDrug patMedDrug);
+
+ /**
+ * 鏂板鎮ｈ�呯敤鑽褰�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 缁撴灉
+ */
+ public int insertPatMedDrug(PatMedDrug patMedDrug);
+
+ /**
+ * 淇敼鎮ｈ�呯敤鑽褰�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 缁撴灉
+ */
+ public int updatePatMedDrug(PatMedDrug patMedDrug);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呯敤鑽褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呯敤鑽褰曚富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deletePatMedDrugByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呯敤鑽褰曚俊鎭�
+ *
+ * @param id 鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatMedDrugById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedInspectionService.java b/smartor/src/main/java/com/smartor/service/IPatMedInspectionService.java
new file mode 100644
index 0000000..515773b
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatMedInspectionService.java
@@ -0,0 +1,62 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatMedInspection;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮鏌ユ楠岃褰昐ervice鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+public interface IPatMedInspectionService
+{
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param id 鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ public PatMedInspection selectPatMedInspectionById(Long id);
+
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 鎮ｈ�呮鏌ユ楠岃褰曢泦鍚�
+ */
+ public List<PatMedInspection> selectPatMedInspectionList(PatMedInspection patMedInspection);
+
+ /**
+ * 鏂板鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 缁撴灉
+ */
+ public int insertPatMedInspection(PatMedInspection patMedInspection);
+
+ /**
+ * 淇敼鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 缁撴灉
+ */
+ public int updatePatMedInspection(PatMedInspection patMedInspection);
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呮鏌ユ楠岃褰曚富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deletePatMedInspectionByIds(Long[] ids);
+
+ /**
+ * 鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰曚俊鎭�
+ *
+ * @param id 鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 缁撴灉
+ */
+ public int deletePatMedInspectionById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/ISvyCategoryService.java b/smartor/src/main/java/com/smartor/service/ISvyCategoryService.java
index e6995fd..e457705 100644
--- a/smartor/src/main/java/com/smartor/service/ISvyCategoryService.java
+++ b/smartor/src/main/java/com/smartor/service/ISvyCategoryService.java
@@ -1,27 +1,27 @@
package com.smartor.service;
import java.util.List;
+
import com.smartor.domain.SvyCategory;
/**
* 闂嵎鍒嗙被Service鎺ュ彛
- *
+ *
* @author ruoyi
* @date 2023-03-02
*/
-public interface ISvyCategoryService
-{
+public interface ISvyCategoryService {
/**
* 鏌ヨ闂嵎鍒嗙被
- *
+ *
* @param id 闂嵎鍒嗙被涓婚敭
* @return 闂嵎鍒嗙被
*/
- public SvyCategory selectSvyCategoryById(Long id);
+ public List<SvyCategory> selectSvyCategoryById(String categoryname);
/**
* 鏌ヨ闂嵎鍒嗙被鍒楄〃
- *
+ *
* @param svyCategory 闂嵎鍒嗙被
* @return 闂嵎鍒嗙被闆嗗悎
*/
@@ -29,7 +29,7 @@
/**
* 鏂板闂嵎鍒嗙被
- *
+ *
* @param svyCategory 闂嵎鍒嗙被
* @return 缁撴灉
*/
@@ -37,7 +37,7 @@
/**
* 淇敼闂嵎鍒嗙被
- *
+ *
* @param svyCategory 闂嵎鍒嗙被
* @return 缁撴灉
*/
@@ -45,7 +45,7 @@
/**
* 鎵归噺鍒犻櫎闂嵎鍒嗙被
- *
+ *
* @param ids 闇�瑕佸垹闄ょ殑闂嵎鍒嗙被涓婚敭闆嗗悎
* @return 缁撴灉
*/
@@ -53,7 +53,7 @@
/**
* 鍒犻櫎闂嵎鍒嗙被淇℃伅
- *
+ *
* @param id 闂嵎鍒嗙被涓婚敭
* @return 缁撴灉
*/
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java
new file mode 100644
index 0000000..bdc2e11
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatArchinvecontactServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatArchinvecontact;
+import com.smartor.mapper.PatArchinvecontactMapper;
+import com.smartor.service.IPatArchinvecontactService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呰仈绯绘柟寮廠ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Service
+public class PatArchinvecontactServiceImpl implements IPatArchinvecontactService
+{
+ @Autowired
+ private PatArchinvecontactMapper patArchinvecontactMapper;
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ @Override
+ public PatArchinvecontact selectPatArchinvecontactById(Long id)
+ {
+ return patArchinvecontactMapper.selectPatArchinvecontactById(id);
+ }
+
+ /**
+ * 鏌ヨ鎮ｈ�呰仈绯绘柟寮忓垪琛�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 鎮ｈ�呰仈绯绘柟寮�
+ */
+ @Override
+ public List<PatArchinvecontact> selectPatArchinvecontactList(PatArchinvecontact patArchinvecontact)
+ {
+ return patArchinvecontactMapper.selectPatArchinvecontactList(patArchinvecontact);
+ }
+
+ /**
+ * 鏂板鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertPatArchinvecontact(PatArchinvecontact patArchinvecontact)
+ {
+ patArchinvecontact.setCreateTime(DateUtils.getNowDate());
+ return patArchinvecontactMapper.insertPatArchinvecontact(patArchinvecontact);
+ }
+
+ /**
+ * 淇敼鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param patArchinvecontact 鎮ｈ�呰仈绯绘柟寮�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updatePatArchinvecontact(PatArchinvecontact patArchinvecontact)
+ {
+ patArchinvecontact.setUpdateTime(DateUtils.getNowDate());
+ return patArchinvecontactMapper.updatePatArchinvecontact(patArchinvecontact);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呰仈绯绘柟寮�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatArchinvecontactByIds(Long[] ids)
+ {
+ return patArchinvecontactMapper.deletePatArchinvecontactByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呰仈绯绘柟寮忎俊鎭�
+ *
+ * @param id 鎮ｈ�呰仈绯绘柟寮忎富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatArchinvecontactById(Long id)
+ {
+ return patArchinvecontactMapper.deletePatArchinvecontactById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedDrugServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedDrugServiceImpl.java
new file mode 100644
index 0000000..97b5391
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedDrugServiceImpl.java
@@ -0,0 +1,90 @@
+package com.smartor.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatMedDrug;
+import com.smartor.mapper.PatMedDrugMapper;
+import com.smartor.service.IPatMedDrugService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 鎮ｈ�呯敤鑽褰昐ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Service
+public class PatMedDrugServiceImpl implements IPatMedDrugService {
+ @Autowired
+ private PatMedDrugMapper patMedDrugMapper;
+
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰�
+ *
+ * @param id 鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 鎮ｈ�呯敤鑽褰�
+ */
+ @Override
+ public PatMedDrug selectPatMedDrugById(Long id) {
+ return patMedDrugMapper.selectPatMedDrugById(id);
+ }
+
+ /**
+ * 鏌ヨ鎮ｈ�呯敤鑽褰曞垪琛�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 鎮ｈ�呯敤鑽褰�
+ */
+ @Override
+ public List<PatMedDrug> selectPatMedDrugList(PatMedDrug patMedDrug) {
+ return patMedDrugMapper.selectPatMedDrugList(patMedDrug);
+ }
+
+ /**
+ * 鏂板鎮ｈ�呯敤鑽褰�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertPatMedDrug(PatMedDrug patMedDrug) {
+ patMedDrug.setCreateTime(DateUtils.getNowDate());
+ return patMedDrugMapper.insertPatMedDrug(patMedDrug);
+ }
+
+ /**
+ * 淇敼鎮ｈ�呯敤鑽褰�
+ *
+ * @param patMedDrug 鎮ｈ�呯敤鑽褰�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updatePatMedDrug(PatMedDrug patMedDrug) {
+ patMedDrug.setUpdateTime(DateUtils.getNowDate());
+ return patMedDrugMapper.updatePatMedDrug(patMedDrug);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呯敤鑽褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatMedDrugByIds(Long[] ids) {
+ return patMedDrugMapper.deletePatMedDrugByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呯敤鑽褰曚俊鎭�
+ *
+ * @param id 鎮ｈ�呯敤鑽褰曚富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatMedDrugById(Long id) {
+ return patMedDrugMapper.deletePatMedDrugById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInspectionServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInspectionServiceImpl.java
new file mode 100644
index 0000000..b08045a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInspectionServiceImpl.java
@@ -0,0 +1,97 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatMedInspection;
+import com.smartor.mapper.PatMedInspectionMapper;
+import com.smartor.service.IPatMedInspectionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎮ｈ�呮鏌ユ楠岃褰昐ervice涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-06-16
+ */
+@Service
+public class PatMedInspectionServiceImpl implements IPatMedInspectionService
+{
+ @Autowired
+ private PatMedInspectionMapper patMedInspectionMapper;
+
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param id 鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ @Override
+ public PatMedInspection selectPatMedInspectionById(Long id)
+ {
+ return patMedInspectionMapper.selectPatMedInspectionById(id);
+ }
+
+ /**
+ * 鏌ヨ鎮ｈ�呮鏌ユ楠岃褰曞垪琛�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 鎮ｈ�呮鏌ユ楠岃褰�
+ */
+ @Override
+ public List<PatMedInspection> selectPatMedInspectionList(PatMedInspection patMedInspection)
+ {
+ return patMedInspectionMapper.selectPatMedInspectionList(patMedInspection);
+ }
+
+ /**
+ * 鏂板鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertPatMedInspection(PatMedInspection patMedInspection)
+ {
+ patMedInspection.setCreateTime(DateUtils.getNowDate());
+ return patMedInspectionMapper.insertPatMedInspection(patMedInspection);
+ }
+
+ /**
+ * 淇敼鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param patMedInspection 鎮ｈ�呮鏌ユ楠岃褰�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updatePatMedInspection(PatMedInspection patMedInspection)
+ {
+ patMedInspection.setUpdateTime(DateUtils.getNowDate());
+ return patMedInspectionMapper.updatePatMedInspection(patMedInspection);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatMedInspectionByIds(Long[] ids)
+ {
+ return patMedInspectionMapper.deletePatMedInspectionByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鎮ｈ�呮鏌ユ楠岃褰曚俊鎭�
+ *
+ * @param id 鎮ｈ�呮鏌ユ楠岃褰曚富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deletePatMedInspectionById(Long id)
+ {
+ return patMedInspectionMapper.deletePatMedInspectionById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
index 721e1f9..d67c134 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyCategoryServiceImpl.java
@@ -27,9 +27,9 @@
* @return 闂嵎鍒嗙被
*/
@Override
- public SvyCategory selectSvyCategoryById(Long id)
+ public List<SvyCategory> selectSvyCategoryById(String categoryname)
{
- return svyCategoryMapper.selectSvyCategoryById(id);
+ return svyCategoryMapper.selectSvyCategoryById(categoryname);
}
/**
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml
new file mode 100644
index 0000000..0435eaf
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/PatArchinvecontactMapper.xml
@@ -0,0 +1,116 @@
+<?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="com.smartor.mapper.PatArchinvecontactMapper">
+
+ <resultMap type="com.smartor.domain.PatArchinvecontact" id="PatArchinvecontactResult">
+ <result property="id" column="id" />
+ <result property="patid" column="patid" />
+ <result property="contactway" column="contactway" />
+ <result property="relation" column="relation" />
+ <result property="datasource" column="datasource" />
+ <result property="isdefault" column="isdefault" />
+ <result property="orgid" column="orgid" />
+ <result property="delFlag" column="del_flag" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="isupload" column="isupload" />
+ <result property="uploadTime" column="upload_time" />
+ <result property="contactname" column="contactname" />
+ </resultMap>
+
+ <sql id="selectPatArchinvecontactVo">
+ select id, patid, contactway, relation, datasource, isdefault, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, contactname from pat_archinvecontact
+ </sql>
+
+ <select id="selectPatArchinvecontactList" parameterType="com.smartor.domain.PatArchinvecontact" resultMap="PatArchinvecontactResult">
+ <include refid="selectPatArchinvecontactVo"/>
+ <where>
+ <if test="patid != null "> and patid = #{patid}</if>
+ <if test="contactway != null and contactway != ''"> and contactway = #{contactway}</if>
+ <if test="relation != null "> and relation = #{relation}</if>
+ <if test="datasource != null "> and datasource = #{datasource}</if>
+ <if test="isdefault != null "> and isdefault = #{isdefault}</if>
+ <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
+ <if test="isupload != null "> and isupload = #{isupload}</if>
+ <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
+ <if test="contactname != null and contactname != ''"> and contactname like concat('%', #{contactname}, '%')</if>
+ </where>
+ </select>
+
+ <select id="selectPatArchinvecontactById" parameterType="Long" resultMap="PatArchinvecontactResult">
+ <include refid="selectPatArchinvecontactVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertPatArchinvecontact" parameterType="com.smartor.domain.PatArchinvecontact" useGeneratedKeys="true" keyProperty="id">
+ insert into pat_archinvecontact
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="patid != null">patid,</if>
+ <if test="contactway != null">contactway,</if>
+ <if test="relation != null">relation,</if>
+ <if test="datasource != null">datasource,</if>
+ <if test="isdefault != null">isdefault,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="delFlag != null and delFlag != ''">del_flag,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="contactname != null">contactname,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="patid != null">#{patid},</if>
+ <if test="contactway != null">#{contactway},</if>
+ <if test="relation != null">#{relation},</if>
+ <if test="datasource != null">#{datasource},</if>
+ <if test="isdefault != null">#{isdefault},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="contactname != null">#{contactname},</if>
+ </trim>
+ </insert>
+
+ <update id="updatePatArchinvecontact" parameterType="com.smartor.domain.PatArchinvecontact">
+ update pat_archinvecontact
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="patid != null">patid = #{patid},</if>
+ <if test="contactway != null">contactway = #{contactway},</if>
+ <if test="relation != null">relation = #{relation},</if>
+ <if test="datasource != null">datasource = #{datasource},</if>
+ <if test="isdefault != null">isdefault = #{isdefault},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="contactname != null">contactname = #{contactname},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deletePatArchinvecontactById" parameterType="Long">
+ delete from pat_archinvecontact where id = #{id}
+ </delete>
+
+ <delete id="deletePatArchinvecontactByIds" parameterType="String">
+ delete from pat_archinvecontact where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml
new file mode 100644
index 0000000..127600e
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/PatMedDrugMapper.xml
@@ -0,0 +1,182 @@
+<?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="com.smartor.mapper.PatMedDrugMapper">
+
+ <resultMap type="com.smartor.domain.PatMedDrug" id="PatMedDrugResult">
+ <result property="id" column="id"/>
+ <result property="serialnum" column="serialnum"/>
+ <result property="patid" column="patid"/>
+ <result property="drugname" column="drugname"/>
+ <result property="opendate" column="opendate"/>
+ <result property="drugtype" column="drugtype"/>
+ <result property="unit" column="unit"/>
+ <result property="spec" column="spec"/>
+ <result property="drugusage" column="drugusage"/>
+ <result property="dose" column="dose"/>
+ <result property="orgid" column="orgid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="drugid" column="drugid"/>
+ <result property="visittype" column="visittype"/>
+ <result property="visitid" column="visitid"/>
+ <result property="schemestatus" column="schemestatus"/>
+ <result property="schemetime" column="schemetime"/>
+ </resultMap>
+
+ <sql id="selectPatMedDrugVo">
+ select id,
+ serialnum,
+ patid,
+ drugname,
+ opendate,
+ drugtype,
+ unit,
+ spec,
+ drugusage,
+ dose,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ drugid,
+ visittype,
+ visitid,
+ schemestatus,
+ schemetime
+ from pat_med_drug
+ </sql>
+
+ <select id="selectPatMedDrugList" parameterType="com.smartor.domain.PatMedDrug" resultMap="PatMedDrugResult">
+ <include refid="selectPatMedDrugVo"/>
+ <where>
+ <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="drugname != null and drugname != ''">and drugname like concat('%', #{drugname}, '%')</if>
+ <if test="opendate != null ">and opendate = #{opendate}</if>
+ <if test="drugtype != null and drugtype != ''">and drugtype = #{drugtype}</if>
+ <if test="unit != null and unit != ''">and unit = #{unit}</if>
+ <if test="spec != null and spec != ''">and spec = #{spec}</if>
+ <if test="drugusage != null and drugusage != ''">and drugusage = #{drugusage}</if>
+ <if test="dose != null and dose != ''">and dose = #{dose}</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="drugid != null ">and drugid = #{drugid}</if>
+ <if test="visittype != null ">and visittype = #{visittype}</if>
+ <if test="visitid != null ">and visitid = #{visitid}</if>
+ <if test="schemestatus != null ">and schemestatus = #{schemestatus}</if>
+ <if test="schemetime != null ">and schemetime = #{schemetime}</if>
+ </where>
+ </select>
+
+ <select id="selectPatMedDrugById" parameterType="Long" resultMap="PatMedDrugResult">
+ <include refid="selectPatMedDrugVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertPatMedDrug" parameterType="com.smartor.domain.PatMedDrug" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into pat_med_drug
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="serialnum != null">serialnum,</if>
+ <if test="patid != null">patid,</if>
+ <if test="drugname != null">drugname,</if>
+ <if test="opendate != null">opendate,</if>
+ <if test="drugtype != null">drugtype,</if>
+ <if test="unit != null">unit,</if>
+ <if test="spec != null">spec,</if>
+ <if test="drugusage != null">drugusage,</if>
+ <if test="dose != null">dose,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="delFlag != null and delFlag != ''">del_flag,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="drugid != null">drugid,</if>
+ <if test="visittype != null">visittype,</if>
+ <if test="visitid != null">visitid,</if>
+ <if test="schemestatus != null">schemestatus,</if>
+ <if test="schemetime != null">schemetime,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="serialnum != null">#{serialnum},</if>
+ <if test="patid != null">#{patid},</if>
+ <if test="drugname != null">#{drugname},</if>
+ <if test="opendate != null">#{opendate},</if>
+ <if test="drugtype != null">#{drugtype},</if>
+ <if test="unit != null">#{unit},</if>
+ <if test="spec != null">#{spec},</if>
+ <if test="drugusage != null">#{drugusage},</if>
+ <if test="dose != null">#{dose},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="drugid != null">#{drugid},</if>
+ <if test="visittype != null">#{visittype},</if>
+ <if test="visitid != null">#{visitid},</if>
+ <if test="schemestatus != null">#{schemestatus},</if>
+ <if test="schemetime != null">#{schemetime},</if>
+ </trim>
+ </insert>
+
+ <update id="updatePatMedDrug" parameterType="com.smartor.domain.PatMedDrug">
+ update pat_med_drug
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="serialnum != null">serialnum = #{serialnum},</if>
+ <if test="patid != null">patid = #{patid},</if>
+ <if test="drugname != null">drugname = #{drugname},</if>
+ <if test="opendate != null">opendate = #{opendate},</if>
+ <if test="drugtype != null">drugtype = #{drugtype},</if>
+ <if test="unit != null">unit = #{unit},</if>
+ <if test="spec != null">spec = #{spec},</if>
+ <if test="drugusage != null">drugusage = #{drugusage},</if>
+ <if test="dose != null">dose = #{dose},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="drugid != null">drugid = #{drugid},</if>
+ <if test="visittype != null">visittype = #{visittype},</if>
+ <if test="visitid != null">visitid = #{visitid},</if>
+ <if test="schemestatus != null">schemestatus = #{schemestatus},</if>
+ <if test="schemetime != null">schemetime = #{schemetime},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deletePatMedDrugById" parameterType="Long">
+ delete
+ from pat_med_drug
+ where id = #{id}
+ </delete>
+
+ <delete id="deletePatMedDrugByIds" parameterType="String">
+ delete from pat_med_drug where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml
new file mode 100644
index 0000000..5491c78
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInspectionMapper.xml
@@ -0,0 +1,218 @@
+<?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="com.smartor.mapper.PatMedInspectionMapper">
+
+ <resultMap type="com.smartor.domain.PatMedInspection" id="PatMedInspectionResult">
+ <result property="id" column="id"/>
+ <result property="serialnum" column="serialnum"/>
+ <result property="patid" column="patid"/>
+ <result property="projecttype" column="projecttype"/>
+ <result property="projectcode" column="projectcode"/>
+ <result property="projectname" column="projectname"/>
+ <result property="reporttime" column="reporttime"/>
+ <result property="hospitalname" column="hospitalname"/>
+ <result property="hospitalcode" column="hospitalcode"/>
+ <result property="orgid" column="orgid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
+ <result property="projectid" column="projectid"/>
+ <result property="applicationtime" column="applicationtime"/>
+ <result property="visittype" column="visittype"/>
+ <result property="visitid" column="visitid"/>
+ <result property="schemestatus" column="schemestatus"/>
+ <result property="isabnormal" column="isabnormal"/>
+ <result property="reportconclusion" column="reportconclusion"/>
+ <result property="schemetime" column="schemetime"/>
+ <result property="deptcode" column="deptcode"/>
+ <result property="deptname" column="deptname"/>
+ <result property="deptid" column="deptid"/>
+ </resultMap>
+
+ <sql id="selectPatMedInspectionVo">
+ select id,
+ serialnum,
+ patid,
+ projecttype,
+ projectcode,
+ projectname,
+ reporttime,
+ hospitalname,
+ hospitalcode,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time,
+ projectid,
+ applicationtime,
+ visittype,
+ visitid,
+ schemestatus,
+ isabnormal,
+ reportconclusion,
+ schemetime,
+ deptcode,
+ deptname,
+ deptid
+ from pat_med_inspection
+ </sql>
+
+ <select id="selectPatMedInspectionList" parameterType="com.smartor.domain.PatMedInspection"
+ resultMap="PatMedInspectionResult">
+ <include refid="selectPatMedInspectionVo"/>
+ <where>
+ <if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
+ <if test="patid != null ">and patid = #{patid}</if>
+ <if test="projecttype != null ">and projecttype = #{projecttype}</if>
+ <if test="projectcode != null and projectcode != ''">and projectcode = #{projectcode}</if>
+ <if test="projectname != null and projectname != ''">and projectname like concat('%', #{projectname},
+ '%')
+ </if>
+ <if test="reporttime != null ">and reporttime = #{reporttime}</if>
+ <if test="hospitalname != null and hospitalname != ''">and hospitalname like concat('%', #{hospitalname},
+ '%')
+ </if>
+ <if test="hospitalcode != null and hospitalcode != ''">and hospitalcode = #{hospitalcode}</if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
+ <if test="isupload != null ">and isupload = #{isupload}</if>
+ <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
+ <if test="projectid != null ">and projectid = #{projectid}</if>
+ <if test="applicationtime != null ">and applicationtime = #{applicationtime}</if>
+ <if test="visittype != null ">and visittype = #{visittype}</if>
+ <if test="visitid != null ">and visitid = #{visitid}</if>
+ <if test="schemestatus != null ">and schemestatus = #{schemestatus}</if>
+ <if test="isabnormal != null ">and isabnormal = #{isabnormal}</if>
+ <if test="reportconclusion != null and reportconclusion != ''">and reportconclusion = #{reportconclusion}
+ </if>
+ <if test="schemetime != null ">and schemetime = #{schemetime}</if>
+ <if test="deptcode != null and deptcode != ''">and deptcode = #{deptcode}</if>
+ <if test="deptname != null and deptname != ''">and deptname like concat('%', #{deptname}, '%')</if>
+ <if test="deptid != null ">and deptid = #{deptid}</if>
+ </where>
+ </select>
+
+ <select id="selectPatMedInspectionById" parameterType="Long" resultMap="PatMedInspectionResult">
+ <include refid="selectPatMedInspectionVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertPatMedInspection" parameterType="com.smartor.domain.PatMedInspection" useGeneratedKeys="true"
+ keyProperty="id">
+ insert into pat_med_inspection
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="serialnum != null">serialnum,</if>
+ <if test="patid != null">patid,</if>
+ <if test="projecttype != null">projecttype,</if>
+ <if test="projectcode != null">projectcode,</if>
+ <if test="projectname != null">projectname,</if>
+ <if test="reporttime != null">reporttime,</if>
+ <if test="hospitalname != null">hospitalname,</if>
+ <if test="hospitalcode != null">hospitalcode,</if>
+ <if test="orgid != null">orgid,</if>
+ <if test="delFlag != null and delFlag != ''">del_flag,</if>
+ <if test="updateBy != null">update_by,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="createBy != null">create_by,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="isupload != null">isupload,</if>
+ <if test="uploadTime != null">upload_time,</if>
+ <if test="projectid != null">projectid,</if>
+ <if test="applicationtime != null">applicationtime,</if>
+ <if test="visittype != null">visittype,</if>
+ <if test="visitid != null">visitid,</if>
+ <if test="schemestatus != null">schemestatus,</if>
+ <if test="isabnormal != null">isabnormal,</if>
+ <if test="reportconclusion != null">reportconclusion,</if>
+ <if test="schemetime != null">schemetime,</if>
+ <if test="deptcode != null">deptcode,</if>
+ <if test="deptname != null">deptname,</if>
+ <if test="deptid != null">deptid,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="serialnum != null">#{serialnum},</if>
+ <if test="patid != null">#{patid},</if>
+ <if test="projecttype != null">#{projecttype},</if>
+ <if test="projectcode != null">#{projectcode},</if>
+ <if test="projectname != null">#{projectname},</if>
+ <if test="reporttime != null">#{reporttime},</if>
+ <if test="hospitalname != null">#{hospitalname},</if>
+ <if test="hospitalcode != null">#{hospitalcode},</if>
+ <if test="orgid != null">#{orgid},</if>
+ <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+ <if test="updateBy != null">#{updateBy},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="createBy != null">#{createBy},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="isupload != null">#{isupload},</if>
+ <if test="uploadTime != null">#{uploadTime},</if>
+ <if test="projectid != null">#{projectid},</if>
+ <if test="applicationtime != null">#{applicationtime},</if>
+ <if test="visittype != null">#{visittype},</if>
+ <if test="visitid != null">#{visitid},</if>
+ <if test="schemestatus != null">#{schemestatus},</if>
+ <if test="isabnormal != null">#{isabnormal},</if>
+ <if test="reportconclusion != null">#{reportconclusion},</if>
+ <if test="schemetime != null">#{schemetime},</if>
+ <if test="deptcode != null">#{deptcode},</if>
+ <if test="deptname != null">#{deptname},</if>
+ <if test="deptid != null">#{deptid},</if>
+ </trim>
+ </insert>
+
+ <update id="updatePatMedInspection" parameterType="com.smartor.domain.PatMedInspection">
+ update pat_med_inspection
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="serialnum != null">serialnum = #{serialnum},</if>
+ <if test="patid != null">patid = #{patid},</if>
+ <if test="projecttype != null">projecttype = #{projecttype},</if>
+ <if test="projectcode != null">projectcode = #{projectcode},</if>
+ <if test="projectname != null">projectname = #{projectname},</if>
+ <if test="reporttime != null">reporttime = #{reporttime},</if>
+ <if test="hospitalname != null">hospitalname = #{hospitalname},</if>
+ <if test="hospitalcode != null">hospitalcode = #{hospitalcode},</if>
+ <if test="orgid != null">orgid = #{orgid},</if>
+ <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
+ <if test="updateBy != null">update_by = #{updateBy},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="createBy != null">create_by = #{createBy},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="isupload != null">isupload = #{isupload},</if>
+ <if test="uploadTime != null">upload_time = #{uploadTime},</if>
+ <if test="projectid != null">projectid = #{projectid},</if>
+ <if test="applicationtime != null">applicationtime = #{applicationtime},</if>
+ <if test="visittype != null">visittype = #{visittype},</if>
+ <if test="visitid != null">visitid = #{visitid},</if>
+ <if test="schemestatus != null">schemestatus = #{schemestatus},</if>
+ <if test="isabnormal != null">isabnormal = #{isabnormal},</if>
+ <if test="reportconclusion != null">reportconclusion = #{reportconclusion},</if>
+ <if test="schemetime != null">schemetime = #{schemetime},</if>
+ <if test="deptcode != null">deptcode = #{deptcode},</if>
+ <if test="deptname != null">deptname = #{deptname},</if>
+ <if test="deptid != null">deptid = #{deptid},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deletePatMedInspectionById" parameterType="Long">
+ delete
+ from pat_med_inspection
+ where id = #{id}
+ </delete>
+
+ <delete id="deletePatMedInspectionByIds" parameterType="String">
+ delete from pat_med_inspection where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml b/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
index b35b1fe..63e8534 100644
--- a/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/SvyCategoryMapper.xml
@@ -1,40 +1,70 @@
<?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">
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.smartor.mapper.SvyCategoryMapper">
-
- <resultMap type="SvyCategory" id="SvyCategoryResult">
- <result property="id" column="id" />
- <result property="categoryname" column="categoryname" />
- <result property="orgid" column="orgid" />
- <result property="delFlag" column="del_flag" />
- <result property="updateBy" column="update_by" />
- <result property="updateTime" column="update_time" />
- <result property="createBy" column="create_by" />
- <result property="createTime" column="create_time" />
- <result property="isupload" column="isupload" />
- <result property="uploadTime" column="upload_time" />
+
+ <resultMap type="com.smartor.domain.SvyCategory" id="SvyCategoryResult">
+ <result property="id" column="id"/>
+ <result property="categoryname" column="categoryname"/>
+ <result property="orgid" column="orgid"/>
+ <result property="delFlag" column="del_flag"/>
+ <result property="updateBy" column="update_by"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="createBy" column="create_by"/>
+ <result property="createTime" column="create_time"/>
+ <result property="isupload" column="isupload"/>
+ <result property="uploadTime" column="upload_time"/>
</resultMap>
<sql id="selectSvyCategoryVo">
- select id, categoryname, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time from svy_category
+ select id,
+ categoryname,
+ orgid,
+ del_flag,
+ update_by,
+ update_time,
+ create_by,
+ create_time,
+ isupload,
+ upload_time
+ from svy_category
</sql>
- <select id="selectSvyCategoryList" parameterType="SvyCategory" resultMap="SvyCategoryResult">
+ <select id="selectSvyCategoryList" parameterType="com.smartor.domain.SvyCategory" resultMap="SvyCategoryResult">
<include refid="selectSvyCategoryVo"/>
- <where>
- <if test="categoryname != null and categoryname != ''"> and categoryname like concat('%', #{categoryname}, '%')</if>
- <if test="orgid != null and orgid != ''"> and orgid = #{orgid}</if>
+ <where>
+ <if test="categoryname != null and categoryname != ''">and categoryname like concat('%', #{categoryname},
+ '%')
+ </if>
+ <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
</where>
</select>
-
- <select id="selectSvyCategoryById" parameterType="Long" resultMap="SvyCategoryResult">
- <include refid="selectSvyCategoryVo"/>
- where id = #{id}
+
+ <select id="selectSvyCategoryById" parameterType="String" resultType="com.smartor.domain.SvyCategory">
+ select a.id,
+ a.categoryname,
+ a. orgid,
+ a.del_flag,
+ a.update_by,
+ a.update_time,
+ a.create_by,
+ a.create_time,
+ a.isupload,
+ a.upload_time,
+ count(b.svyid) svyNum
+ from svy_category a,svy_lib_title b
+ <where>
+ a.id = b.categoryid
+ <if test="categoryname != null and categoryname != ''">
+ and categoryname = #{categoryname}
+ </if>
+ </where>
+ group by a.categoryname
</select>
-
- <insert id="insertSvyCategory" parameterType="SvyCategory" useGeneratedKeys="true" keyProperty="id">
+
+ <insert id="insertSvyCategory" parameterType="com.smartor.domain.SvyCategory" useGeneratedKeys="true"
+ keyProperty="id">
insert into svy_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="categoryname != null">categoryname,</if>
@@ -46,7 +76,7 @@
<if test="createTime != null">create_time,</if>
<if test="isupload != null">isupload,</if>
<if test="uploadTime != null">upload_time,</if>
- </trim>
+ </trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="categoryname != null">#{categoryname},</if>
<if test="orgid != null">#{orgid},</if>
@@ -57,10 +87,10 @@
<if test="createTime != null">#{createTime},</if>
<if test="isupload != null">#{isupload},</if>
<if test="uploadTime != null">#{uploadTime},</if>
- </trim>
+ </trim>
</insert>
- <update id="updateSvyCategory" parameterType="SvyCategory">
+ <update id="updateSvyCategory" parameterType="com.smartor.domain.SvyCategory">
update svy_category
<trim prefix="SET" suffixOverrides=",">
<if test="categoryname != null">categoryname = #{categoryname},</if>
@@ -77,11 +107,13 @@
</update>
<delete id="deleteSvyCategoryById" parameterType="Long">
- delete from svy_category where id = #{id}
+ delete
+ from svy_category
+ where id = #{id}
</delete>
<delete id="deleteSvyCategoryByIds" parameterType="String">
- delete from svy_category where id in
+ delete from svy_category where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
--
Gitblit v1.9.3