From 2d5f3bc910e22d3ffd52cd5081daecdb5916ab9c Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期五, 09 十月 2026 15:25:09 +0800
Subject: [PATCH] 【丽水】妇幼档案拆分为妇科/儿科主表与详情表并完成CRUD
---
smartor/src/main/java/com/smartor/domain/PatChildArchiveDetail.java | 275 +++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveController.java | 88 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveController.java | 88 ++
smartor/src/main/java/com/smartor/service/IPatChildArchiveService.java | 26
smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml | 88 -
smartor/src/main/java/com/smartor/domain/PatChildArchive.java | 179 ++++
smartor/src/main/java/com/smartor/domain/PatMaternityArchive.java | 184 ++++
smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml | 170 ++--
smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java | 234 ++++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveDetailController.java | 88 ++
smartor/src/main/java/com/smartor/service/IPatChildArchiveDetailService.java | 26
smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml | 188 +++-
smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveMapper.java | 28
smartor/src/main/java/com/smartor/service/IPatMaternityArchiveDetailService.java | 26
smartor/src/main/java/com/smartor/service/impl/PatChildArchiveDetailServiceImpl.java | 61 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveDetailController.java | 88 ++
/dev/null | 97 --
smartor/src/main/java/com/smartor/service/IPatMaternityArchiveService.java | 26
smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java | 61 +
smartor/src/main/java/com/smartor/service/impl/PatChildArchiveServiceImpl.java | 61 +
smartor/src/main/java/com/smartor/mapper/PatChildArchiveMapper.java | 28
smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveDetailServiceImpl.java | 61 +
smartor/src/main/java/com/smartor/mapper/PatChildArchiveDetailMapper.java | 28
smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveDetailMapper.java | 28
smartor/src/main/resources/mapper/smartor/PatMaternityArchiveMapper.xml | 82 -
25 files changed, 1,930 insertions(+), 379 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveController.java
new file mode 100644
index 0000000..74927de
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveController.java
@@ -0,0 +1,88 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.AddOrgId;
+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.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatChildArchive;
+import com.smartor.service.IPatChildArchiveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆController
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Api(description = "鍎跨妗ｆ")
+@RestController
+@RequestMapping("/smartor/childArchive")
+public class PatChildArchiveController extends BaseController {
+ @Autowired
+ private IPatChildArchiveService patChildArchiveService;
+
+ @ApiOperation("鏌ヨ鍎跨妗ｆ鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:childArchive:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/selectPatChildArchiveList")
+ public TableDataInfo selectPatChildArchiveList(@RequestBody PatChildArchive patChildArchive) {
+ PageUtils.startPageByPost(patChildArchive.getPageNum(), patChildArchive.getPageSize());
+ List<PatChildArchive> list = patChildArchiveService.selectPatChildArchiveList(patChildArchive);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("瀵煎嚭鍎跨妗ｆ鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:childArchive:export')")
+ @Log(title = "鍎跨妗ｆ", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatChildArchive patChildArchive) {
+ List<PatChildArchive> list = patChildArchiveService.selectPatChildArchiveList(patChildArchive);
+ ExcelUtil<PatChildArchive> util = new ExcelUtil<PatChildArchive>(PatChildArchive.class);
+ util.exportExcel(response, list, "鍎跨妗ｆ鏁版嵁");
+ }
+
+ @ApiOperation("鑾峰彇鍎跨妗ｆ璇︾粏淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('system:childArchive:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patChildArchiveService.selectPatChildArchiveById(id));
+ }
+
+ @ApiOperation("鏂板鍎跨妗ｆ")
+ //@PreAuthorize("@ss.hasPermi('system:childArchive:add')")
+ @Log(title = "鍎跨妗ｆ", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatChildArchive patChildArchive) {
+ SysUser user = getLoginUser().getUser();
+ patChildArchive.setOrgid(user.getOrgid());
+ return toAjax(patChildArchiveService.insertPatChildArchive(patChildArchive));
+ }
+
+ @ApiOperation("淇敼鍎跨妗ｆ")
+ //@PreAuthorize("@ss.hasPermi('system:childArchive:edit')")
+ @Log(title = "鍎跨妗ｆ", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody PatChildArchive patChildArchive) {
+ return toAjax(patChildArchiveService.updatePatChildArchive(patChildArchive));
+ }
+
+ @ApiOperation("鍒犻櫎鍎跨妗ｆ")
+ //@PreAuthorize("@ss.hasPermi('system:childArchive:remove')")
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patChildArchiveService.deletePatChildArchiveByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveDetailController.java
new file mode 100644
index 0000000..cb95eef
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatChildArchiveDetailController.java
@@ -0,0 +1,88 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.AddOrgId;
+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.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatChildArchiveDetail;
+import com.smartor.service.IPatChildArchiveDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆ璇︽儏Controller
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Api(description = "鍎跨妗ｆ璇︽儏")
+@RestController
+@RequestMapping("/smartor/childArchiveDetail")
+public class PatChildArchiveDetailController extends BaseController {
+ @Autowired
+ private IPatChildArchiveDetailService patChildArchiveDetailService;
+
+ @ApiOperation("鏌ヨ鍎跨妗ｆ璇︽儏鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/selectPatChildArchiveDetailList")
+ public TableDataInfo selectPatChildArchiveDetailList(@RequestBody PatChildArchiveDetail patChildArchiveDetail) {
+ PageUtils.startPageByPost(patChildArchiveDetail.getPageNum(), patChildArchiveDetail.getPageSize());
+ List<PatChildArchiveDetail> list = patChildArchiveDetailService.selectPatChildArchiveDetailList(patChildArchiveDetail);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("瀵煎嚭鍎跨妗ｆ璇︽儏鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:export')")
+ @Log(title = "鍎跨妗ｆ璇︽儏", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatChildArchiveDetail patChildArchiveDetail) {
+ List<PatChildArchiveDetail> list = patChildArchiveDetailService.selectPatChildArchiveDetailList(patChildArchiveDetail);
+ ExcelUtil<PatChildArchiveDetail> util = new ExcelUtil<PatChildArchiveDetail>(PatChildArchiveDetail.class);
+ util.exportExcel(response, list, "鍎跨妗ｆ璇︽儏鏁版嵁");
+ }
+
+ @ApiOperation("鑾峰彇鍎跨妗ｆ璇︽儏璇︾粏淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patChildArchiveDetailService.selectPatChildArchiveDetailById(id));
+ }
+
+ @ApiOperation("鏂板鍎跨妗ｆ璇︽儏")
+ //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:add')")
+ @Log(title = "鍎跨妗ｆ璇︽儏", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatChildArchiveDetail patChildArchiveDetail) {
+ SysUser user = getLoginUser().getUser();
+ patChildArchiveDetail.setOrgid(user.getOrgid());
+ return toAjax(patChildArchiveDetailService.insertPatChildArchiveDetail(patChildArchiveDetail));
+ }
+
+ @ApiOperation("淇敼鍎跨妗ｆ璇︽儏")
+ //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:edit')")
+ @Log(title = "鍎跨妗ｆ璇︽儏", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody PatChildArchiveDetail patChildArchiveDetail) {
+ return toAjax(patChildArchiveDetailService.updatePatChildArchiveDetail(patChildArchiveDetail));
+ }
+
+ @ApiOperation("鍒犻櫎鍎跨妗ｆ璇︽儏")
+ //@PreAuthorize("@ss.hasPermi('system:childArchiveDetail:remove')")
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patChildArchiveDetailService.deletePatChildArchiveDetailByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveController.java
new file mode 100644
index 0000000..8250a36
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveController.java
@@ -0,0 +1,88 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.AddOrgId;
+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.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatMaternityArchive;
+import com.smartor.service.IPatMaternityArchiveService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 濡囩妗ｆController
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Api(description = "濡囩妗ｆ")
+@RestController
+@RequestMapping("/smartor/maternityArchive")
+public class PatMaternityArchiveController extends BaseController {
+ @Autowired
+ private IPatMaternityArchiveService patMaternityArchiveService;
+
+ @ApiOperation("鏌ヨ濡囩妗ｆ鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchive:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/selectPatMaternityArchiveList")
+ public TableDataInfo selectPatMaternityArchiveList(@RequestBody PatMaternityArchive patMaternityArchive) {
+ PageUtils.startPageByPost(patMaternityArchive.getPageNum(), patMaternityArchive.getPageSize());
+ List<PatMaternityArchive> list = patMaternityArchiveService.selectPatMaternityArchiveList(patMaternityArchive);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("瀵煎嚭濡囩妗ｆ鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchive:export')")
+ @Log(title = "濡囩妗ｆ", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatMaternityArchive patMaternityArchive) {
+ List<PatMaternityArchive> list = patMaternityArchiveService.selectPatMaternityArchiveList(patMaternityArchive);
+ ExcelUtil<PatMaternityArchive> util = new ExcelUtil<PatMaternityArchive>(PatMaternityArchive.class);
+ util.exportExcel(response, list, "濡囩妗ｆ鏁版嵁");
+ }
+
+ @ApiOperation("鑾峰彇濡囩妗ｆ璇︾粏淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchive:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patMaternityArchiveService.selectPatMaternityArchiveById(id));
+ }
+
+ @ApiOperation("鏂板濡囩妗ｆ")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchive:add')")
+ @Log(title = "濡囩妗ｆ", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatMaternityArchive patMaternityArchive) {
+ SysUser user = getLoginUser().getUser();
+ patMaternityArchive.setOrgid(user.getOrgid());
+ return toAjax(patMaternityArchiveService.insertPatMaternityArchive(patMaternityArchive));
+ }
+
+ @ApiOperation("淇敼濡囩妗ｆ")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchive:edit')")
+ @Log(title = "濡囩妗ｆ", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody PatMaternityArchive patMaternityArchive) {
+ return toAjax(patMaternityArchiveService.updatePatMaternityArchive(patMaternityArchive));
+ }
+
+ @ApiOperation("鍒犻櫎濡囩妗ｆ")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchive:remove')")
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patMaternityArchiveService.deletePatMaternityArchiveByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveDetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveDetailController.java
new file mode 100644
index 0000000..0a514a9
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityArchiveDetailController.java
@@ -0,0 +1,88 @@
+package com.ruoyi.web.controller.smartor;
+
+import com.ruoyi.common.annotation.AddOrgId;
+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.domain.entity.SysUser;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.smartor.domain.PatMaternityArchiveDetail;
+import com.smartor.service.IPatMaternityArchiveDetailService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 濡囩妗ｆ璇︽儏Controller
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Api(description = "濡囩妗ｆ璇︽儏")
+@RestController
+@RequestMapping("/smartor/maternityArchiveDetail")
+public class PatMaternityArchiveDetailController extends BaseController {
+ @Autowired
+ private IPatMaternityArchiveDetailService patMaternityArchiveDetailService;
+
+ @ApiOperation("鏌ヨ濡囩妗ｆ璇︽儏鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:list')")
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/selectPatMaternityArchiveDetailList")
+ public TableDataInfo selectPatMaternityArchiveDetailList(@RequestBody PatMaternityArchiveDetail patMaternityArchiveDetail) {
+ PageUtils.startPageByPost(patMaternityArchiveDetail.getPageNum(), patMaternityArchiveDetail.getPageSize());
+ List<PatMaternityArchiveDetail> list = patMaternityArchiveDetailService.selectPatMaternityArchiveDetailList(patMaternityArchiveDetail);
+ return getDataTable(list);
+ }
+
+ @ApiOperation("瀵煎嚭濡囩妗ｆ璇︽儏鍒楄〃")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:export')")
+ @Log(title = "濡囩妗ｆ璇︽儏", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, PatMaternityArchiveDetail patMaternityArchiveDetail) {
+ List<PatMaternityArchiveDetail> list = patMaternityArchiveDetailService.selectPatMaternityArchiveDetailList(patMaternityArchiveDetail);
+ ExcelUtil<PatMaternityArchiveDetail> util = new ExcelUtil<PatMaternityArchiveDetail>(PatMaternityArchiveDetail.class);
+ util.exportExcel(response, list, "濡囩妗ｆ璇︽儏鏁版嵁");
+ }
+
+ @ApiOperation("鑾峰彇濡囩妗ｆ璇︽儏璇︾粏淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ return success(patMaternityArchiveDetailService.selectPatMaternityArchiveDetailById(id));
+ }
+
+ @ApiOperation("鏂板濡囩妗ｆ璇︽儏")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:add')")
+ @Log(title = "濡囩妗ｆ璇︽儏", businessType = BusinessType.INSERT)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/add")
+ public AjaxResult add(@RequestBody PatMaternityArchiveDetail patMaternityArchiveDetail) {
+ SysUser user = getLoginUser().getUser();
+ patMaternityArchiveDetail.setOrgid(user.getOrgid());
+ return toAjax(patMaternityArchiveDetailService.insertPatMaternityArchiveDetail(patMaternityArchiveDetail));
+ }
+
+ @ApiOperation("淇敼濡囩妗ｆ璇︽儏")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:edit')")
+ @Log(title = "濡囩妗ｆ璇︽儏", businessType = BusinessType.UPDATE)
+ @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
+ @PostMapping("/edit")
+ public AjaxResult edit(@RequestBody PatMaternityArchiveDetail patMaternityArchiveDetail) {
+ return toAjax(patMaternityArchiveDetailService.updatePatMaternityArchiveDetail(patMaternityArchiveDetail));
+ }
+
+ @ApiOperation("鍒犻櫎濡囩妗ｆ璇︽儏")
+ //@PreAuthorize("@ss.hasPermi('system:maternityArchiveDetail:remove')")
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ return toAjax(patMaternityArchiveDetailService.deletePatMaternityArchiveDetailByIds(ids));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityChildArchiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityChildArchiveController.java
deleted file mode 100644
index 24d6533..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMaternityChildArchiveController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.ruoyi.web.controller.smartor;
-
-import com.ruoyi.common.annotation.AddOrgId;
-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.domain.entity.SysUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.smartor.domain.PatMaternityChildArchive;
-import com.smartor.service.IPatMaternityChildArchiveService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * 濡囧辜妗ｆController
- *
- * @author ruoyi
- * @date 2026-10-08
- */
-@Api(description = "濡囧辜妗ｆ")
-@RestController
-@RequestMapping("/smartor/maternityChildArchive")
-public class PatMaternityChildArchiveController extends BaseController {
- @Autowired
- private IPatMaternityChildArchiveService patMaternityChildArchiveService;
-
- /**
- * 鏌ヨ濡囧辜妗ｆ鍒楄〃
- */
- @ApiOperation("鏌ヨ濡囧辜妗ｆ鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('system:maternityChildArchive:list')")
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/selectPatMaternityChildArchiveList")
- public TableDataInfo selectPatMaternityChildArchiveList(@RequestBody PatMaternityChildArchive patMaternityChildArchive) {
- PageUtils.startPageByPost(patMaternityChildArchive.getPageNum(), patMaternityChildArchive.getPageSize());
- List<PatMaternityChildArchive> list = patMaternityChildArchiveService.selectPatMaternityChildArchiveList(patMaternityChildArchive);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭濡囧辜妗ｆ鍒楄〃
- */
- @ApiOperation("瀵煎嚭濡囧辜妗ｆ鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('system:maternityChildArchive:export')")
- @Log(title = "濡囧辜妗ｆ", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, PatMaternityChildArchive patMaternityChildArchive) {
- List<PatMaternityChildArchive> list = patMaternityChildArchiveService.selectPatMaternityChildArchiveList(patMaternityChildArchive);
- ExcelUtil<PatMaternityChildArchive> util = new ExcelUtil<PatMaternityChildArchive>(PatMaternityChildArchive.class);
- util.exportExcel(response, list, "濡囧辜妗ｆ鏁版嵁");
- }
-
- /**
- * 鑾峰彇濡囧辜妗ｆ璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇濡囧辜妗ｆ璇︾粏淇℃伅")
- //@PreAuthorize("@ss.hasPermi('system:maternityChildArchive:query')")
- @GetMapping(value = "/getInfo/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(patMaternityChildArchiveService.selectPatMaternityChildArchiveById(id));
- }
-
- /**
- * 鏂板濡囧辜妗ｆ
- */
- @ApiOperation("鏂板濡囧辜妗ｆ")
- //@PreAuthorize("@ss.hasPermi('system:maternityChildArchive:add')")
- @Log(title = "濡囧辜妗ｆ", businessType = BusinessType.INSERT)
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/add")
- public AjaxResult add(@RequestBody PatMaternityChildArchive patMaternityChildArchive) {
- SysUser user = getLoginUser().getUser();
- patMaternityChildArchive.setOrgid(user.getOrgid());
- return toAjax(patMaternityChildArchiveService.insertPatMaternityChildArchive(patMaternityChildArchive));
- }
-
- /**
- * 淇敼濡囧辜妗ｆ
- */
- @ApiOperation("淇敼濡囧辜妗ｆ")
- //@PreAuthorize("@ss.hasPermi('system:maternityChildArchive:edit')")
- @Log(title = "濡囧辜妗ｆ", businessType = BusinessType.UPDATE)
- @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
- @PostMapping("/edit")
- public AjaxResult edit(@RequestBody PatMaternityChildArchive patMaternityChildArchive) {
- return toAjax(patMaternityChildArchiveService.updatePatMaternityChildArchive(patMaternityChildArchive));
- }
-
- /**
- * 鍒犻櫎濡囧辜妗ｆ
- */
- @ApiOperation("鍒犻櫎濡囧辜妗ｆ")
- //@PreAuthorize("@ss.hasPermi('system:maternityChildArchive:remove')")
- @GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(patMaternityChildArchiveService.deletePatMaternityChildArchiveByIds(ids));
- }
-}
diff --git a/smartor/src/main/java/com/smartor/domain/PatChildArchive.java b/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
new file mode 100644
index 0000000..7822b7b
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatChildArchive.java
@@ -0,0 +1,179 @@
+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 com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鍎跨妗ｆ瀵硅薄 pat_child_archive
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Data
+@ApiModel(value = "鍎跨妗ｆ瀵硅薄")
+public class PatChildArchive extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 鍎跨妗ｆ涓婚敭ID */
+ @ApiModelProperty(value = "鍎跨妗ｆ涓婚敭ID")
+ private Long id;
+
+ /** 鍎跨妗ｆ绫诲瀷: 1 钀ュ吇鎬х柧鐥�2 瀛︿範鍥伴毦3 楂樺嵄鍎夸笓妗� */
+ @Excel(name = "妗ｆ绫诲瀷")
+ @ApiModelProperty(value = "鍎跨妗ｆ绫诲瀷: 1 钀ュ吇鎬х柧鐥�2 瀛︿範鍥伴毦3 楂樺嵄鍎夸笓妗�")
+ private String archiveType;
+
+ /** 闂ㄨ瘖缂栧彿 */
+ @Excel(name = "闂ㄨ瘖缂栧彿")
+ @ApiModelProperty(value = "闂ㄨ瘖缂栧彿")
+ private String outhospno;
+
+ /** 浣忛櫌缂栧彿 */
+ @Excel(name = "浣忛櫌缂栧彿")
+ @ApiModelProperty(value = "浣忛櫌缂栧彿")
+ private String inhospno;
+
+ /** 娴佹按鍙� */
+ @Excel(name = "娴佹按鍙�")
+ @ApiModelProperty(value = "娴佹按鍙�")
+ private String serialnum;
+
+ /** 鎮ｈ�匢D */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private Long patid;
+
+ /** 鎮ｈ�呭鍚� */
+ @Excel(name = "鎮ｈ�呭鍚�")
+ @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+ private String patname;
+
+ /** 瀹堕暱濮撳悕 */
+ @Excel(name = "瀹堕暱濮撳悕")
+ @ApiModelProperty(value = "瀹堕暱濮撳悕")
+ private String parentname;
+
+ /** 鍑虹敓鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ private Date birthdate;
+
+ /** 璇佷欢鍙风爜 */
+ @Excel(name = "璇佷欢鍙风爜")
+ @ApiModelProperty(value = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /** 鑱旂郴鐢佃瘽 */
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /** 璇婃柇鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璇婃柇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "璇婃柇鏃堕棿")
+ private Date diagTime;
+
+ /** 寤烘。鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寤烘。鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寤烘。鏃堕棿")
+ private Date archiveTime;
+
+ /** 鎷熼殢璁挎椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎷熼殢璁挎椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鎷熼殢璁挎椂闂�")
+ private Date plannedFollowTime;
+
+ /** 闅忚鍛ㄦ湡(娆℃暟) */
+ @Excel(name = "闅忚鍛ㄦ湡(娆℃暟)")
+ @ApiModelProperty(value = "闅忚鍛ㄦ湡(娆℃暟)")
+ private String followupCycleTimes;
+
+ /** 鎬у埆 1:鐢� 2:濂� */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
+ private Long sex;
+
+ /** 涓绘不鍖荤敓 */
+ @Excel(name = "涓绘不鍖荤敓")
+ @ApiModelProperty(value = "涓绘不鍖荤敓")
+ private String doctorCode;
+
+ /** 涓绘不鍖荤敓濮撳悕 */
+ @Excel(name = "涓绘不鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "涓绘不鍖荤敓濮撳悕")
+ private String doctorName;
+
+ /** 缁忕鍖荤敓 */
+ @Excel(name = "缁忕鍖荤敓")
+ @ApiModelProperty(value = "缁忕鍖荤敓")
+ private String managementDoctorCode;
+
+ /** 缁忕鍖荤敓濮撳悕 */
+ @Excel(name = "缁忕鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
+ private String managementDoctorName;
+
+ /** 绉戝缂栧彿 */
+ @Excel(name = "绉戝缂栧彿")
+ @ApiModelProperty(value = "绉戝缂栧彿")
+ private String deptcode;
+
+ /** 绉戝鍚嶇О */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
+
+ /** 鐥呭尯缂栧彿 */
+ @Excel(name = "鐥呭尯缂栧彿")
+ @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ private String wardcode;
+
+ /** 鐥呭尯鍚嶇О */
+ @Excel(name = "鐥呭尯鍚嶇О")
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String wardname;
+
+ /** 璇婃柇ID */
+ @Excel(name = "璇婃柇ID")
+ @ApiModelProperty(value = "璇婃柇ID")
+ private String icd10code;
+
+ /** 璇婃柇鍚嶇О */
+ @Excel(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String diagname;
+
+ /** 缁撴鐘舵�� */
+ @Excel(name = "缁撴鐘舵��")
+ @ApiModelProperty(value = "缁撴鐘舵��")
+ private String closeStatus;
+
+ /** 鐧昏浜哄憳 */
+ @Excel(name = "鐧昏浜哄憳")
+ @ApiModelProperty(value = "鐧昏浜哄憳")
+ private String registerUser;
+
+ /** 鍖婚櫌鏈烘瀯ID */
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ @ApiModelProperty(value = "鍖婚櫌鏈烘瀯ID")
+ private String orgid;
+
+ /** 闄㈠尯ID */
+ @Excel(name = "闄㈠尯ID")
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatChildArchiveDetail.java b/smartor/src/main/java/com/smartor/domain/PatChildArchiveDetail.java
new file mode 100644
index 0000000..99606c2
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatChildArchiveDetail.java
@@ -0,0 +1,275 @@
+package com.smartor.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 鍎跨妗ｆ璇︽儏瀵硅薄 pat_child_archive_detail
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Data
+@ApiModel(value = "鍎跨妗ｆ璇︽儏瀵硅薄")
+public class PatChildArchiveDetail extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 鍎跨妗ｆ璇︽儏涓婚敭ID */
+ @ApiModelProperty(value = "鍎跨妗ｆ璇︽儏涓婚敭ID")
+ private Long id;
+
+ /** 鍎跨妗ｆ涓婚敭ID 瀵瑰簲 pat_child_archive.id */
+ @Excel(name = "妗ｆID")
+ @ApiModelProperty(value = "鍎跨妗ｆ涓婚敭ID 瀵瑰簲 pat_child_archive.id")
+ private Long archiveid;
+
+ /** 妗ｆ绫诲瀷: 1 钀ュ吇鎬х柧鐥�2 瀛︿範鍥伴毦3 楂樺嵄鍎夸笓妗� */
+ @Excel(name = "妗ｆ绫诲瀷")
+ @ApiModelProperty(value = "妗ｆ绫诲瀷: 1 钀ュ吇鎬х柧鐥�2 瀛︿範鍥伴毦3 楂樺嵄鍎夸笓妗�")
+ private String archiveType;
+
+ /** 鏉ユ簮绫诲瀷: 1 闂ㄨ瘖璁板綍 */
+ @Excel(name = "鏉ユ簮绫诲瀷")
+ @ApiModelProperty(value = "鏉ユ簮绫诲瀷: 1 闂ㄨ瘖璁板綍")
+ private String sourceType;
+
+ /** 闂ㄨ瘖缂栧彿 */
+ @Excel(name = "闂ㄨ瘖缂栧彿")
+ @ApiModelProperty(value = "闂ㄨ瘖缂栧彿")
+ private String outhospno;
+
+ /** 浣忛櫌缂栧彿 */
+ @Excel(name = "浣忛櫌缂栧彿")
+ @ApiModelProperty(value = "浣忛櫌缂栧彿")
+ private String inhospno;
+
+ /** 娴佹按鍙� */
+ @Excel(name = "娴佹按鍙�")
+ @ApiModelProperty(value = "娴佹按鍙�")
+ private String serialnum;
+
+ /** 鎮ｈ�匢D */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private Long patid;
+
+ /** 鎮ｈ�呭鍚� */
+ @Excel(name = "鎮ｈ�呭鍚�")
+ @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+ private String patname;
+
+ /** 瀹堕暱濮撳悕 */
+ @Excel(name = "瀹堕暱濮撳悕")
+ @ApiModelProperty(value = "瀹堕暱濮撳悕")
+ private String parentname;
+
+ /** 瀹堕暱涓庡効绔ュ叧绯� */
+ @Excel(name = "瀹堕暱涓庡効绔ュ叧绯�")
+ @ApiModelProperty(value = "瀹堕暱涓庡効绔ュ叧绯�")
+ private String parentRelation;
+
+ /** 瀹堕暱鑱旂郴鐢佃瘽 */
+ @Excel(name = "瀹堕暱鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "瀹堕暱鑱旂郴鐢佃瘽")
+ private String parentPhone;
+
+ /** 瀹堕暱璇佷欢鍙风爜 */
+ @Excel(name = "瀹堕暱璇佷欢鍙风爜")
+ @ApiModelProperty(value = "瀹堕暱璇佷欢鍙风爜")
+ private String parentIdcardno;
+
+ /** 瀹堕暱鑱旂郴鍦板潃 */
+ @Excel(name = "瀹堕暱鑱旂郴鍦板潃")
+ @ApiModelProperty(value = "瀹堕暱鑱旂郴鍦板潃")
+ private String parentAddress;
+
+ /** 鍑虹敓鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ private Date birthdate;
+
+ /** 璇佷欢鍙风爜 */
+ @Excel(name = "璇佷欢鍙风爜")
+ @ApiModelProperty(value = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /** 鑱旂郴鐢佃瘽 */
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /** 璇婃柇鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璇婃柇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "璇婃柇鏃堕棿")
+ private Date diagTime;
+
+ /** 寤烘。鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寤烘。鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寤烘。鏃堕棿")
+ private Date archiveTime;
+
+ /** 鎬у埆 1:鐢� 2:濂� */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
+ private Long sex;
+
+ /** 涓绘不鍖荤敓 */
+ @Excel(name = "涓绘不鍖荤敓")
+ @ApiModelProperty(value = "涓绘不鍖荤敓")
+ private String doctorCode;
+
+ /** 涓绘不鍖荤敓濮撳悕 */
+ @Excel(name = "涓绘不鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "涓绘不鍖荤敓濮撳悕")
+ private String doctorName;
+
+ /** 缁忕鍖荤敓 */
+ @Excel(name = "缁忕鍖荤敓")
+ @ApiModelProperty(value = "缁忕鍖荤敓")
+ private String managementDoctorCode;
+
+ /** 缁忕鍖荤敓濮撳悕 */
+ @Excel(name = "缁忕鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
+ private String managementDoctorName;
+
+ /** 绉戝缂栧彿 */
+ @Excel(name = "绉戝缂栧彿")
+ @ApiModelProperty(value = "绉戝缂栧彿")
+ private String deptcode;
+
+ /** 绉戝鍚嶇О */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
+
+ /** 鐥呭尯缂栧彿 */
+ @Excel(name = "鐥呭尯缂栧彿")
+ @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ private String wardcode;
+
+ /** 鐥呭尯鍚嶇О */
+ @Excel(name = "鐥呭尯鍚嶇О")
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String wardname;
+
+ /** 璇婃柇ID */
+ @Excel(name = "璇婃柇ID")
+ @ApiModelProperty(value = "璇婃柇ID")
+ private String icd10code;
+
+ /** 璇婃柇鍚嶇О */
+ @Excel(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String diagname;
+
+ /** 钀ュ吇鎬х柧鐥匢D */
+ @Excel(name = "钀ュ吇鎬х柧鐥匢D")
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥匢D")
+ private String nutritionIcd10Code;
+
+ /** 钀ュ吇鎬х柧鐥呭悕绉� */
+ @Excel(name = "钀ュ吇鎬х柧鐥呭悕绉�")
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥呭悕绉�")
+ private String nutritionDiagName;
+
+ /** 钀ュ吇鎬х柧鐥�-浣撴牸娴嬮噺 */
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥�-浣撴牸娴嬮噺")
+ private String ndPhysicalMeasurements;
+
+ /** 钀ュ吇鎬х柧鐥�-鑶抽璇勪及 */
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥�-鑶抽璇勪及")
+ private String ndDietaryAssessment;
+
+ /** 钀ュ吇鎬х柧鐥�-骞查鏂规 */
+ @ApiModelProperty(value = "钀ュ吇鎬х柧鐥�-骞查鏂规")
+ private String ndInterventionProgram;
+
+ /** 瀛︿範鍥伴毦-棰勭害鎯呭喌 */
+ @ApiModelProperty(value = "瀛︿範鍥伴毦-棰勭害鎯呭喌")
+ private String appointmentSituation;
+
+ /** 瀛︿範鍥伴毦-瀛︿範鑳藉姏璇勪及 */
+ @ApiModelProperty(value = "瀛︿範鍥伴毦-瀛︿範鑳藉姏璇勪及")
+ private String ldLearningAbilityAssessment;
+
+ /** 瀛︿範鍥伴毦-琛屼负璇勪及 */
+ @ApiModelProperty(value = "瀛︿範鍥伴毦-琛屼负璇勪及")
+ private String ldBehavioralAssessment;
+
+ /** 瀛︿範鍥伴毦-骞查璁粌璁板綍 */
+ @ApiModelProperty(value = "瀛︿範鍥伴毦-骞查璁粌璁板綍")
+ private String ldInterventionTrainingRecord;
+
+ /** 楂樺嵄鍎夸笓妗�-楂樺嵄鍎垮垎绫� */
+ @Excel(name = "楂樺嵄鍎垮垎绫�")
+ @ApiModelProperty(value = "楂樺嵄鍎夸笓妗�-楂樺嵄鍎垮垎绫�")
+ private String highRiskChildType;
+
+ /** 楂樺嵄鍎夸笓妗�-楂樺嵄鍎垮悕绉� */
+ @Excel(name = "楂樺嵄鍎垮悕绉�")
+ @ApiModelProperty(value = "楂樺嵄鍎夸笓妗�-楂樺嵄鍎垮悕绉�")
+ private String highRiskChildName;
+
+ /** 楂樺嵄鍎夸笓妗�-鎷熼殢璁挎椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎷熼殢璁挎椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "楂樺嵄鍎夸笓妗�-鎷熼殢璁挎椂闂�")
+ private Date plannedFollowTime;
+
+ /** 楂樺嵄鍎夸笓妗�-鐢熼暱鍙戣偛妫�娴� */
+ @ApiModelProperty(value = "楂樺嵄鍎夸笓妗�-鐢熼暱鍙戣偛妫�娴�")
+ private String hrcGrowthDevelopmentMonitoring;
+
+ /** 楂樺嵄鍎夸笓妗�-绁炵粡绯荤粺璇勪及 */
+ @ApiModelProperty(value = "楂樺嵄鍎夸笓妗�-绁炵粡绯荤粺璇勪及")
+ private String hrcNeurologicalEvaluation;
+
+ /** 楂樺嵄鍎夸笓妗�-骞查璁板綍 */
+ @ApiModelProperty(value = "楂樺嵄鍎夸笓妗�-骞查璁板綍")
+ private String hrcInterventionRecords;
+
+ /** 缁撴鐘舵�� */
+ @Excel(name = "缁撴鐘舵��")
+ @ApiModelProperty(value = "缁撴鐘舵��")
+ private String closeStatus;
+
+ /** 鍑虹敓瀛曞懆 */
+ @Excel(name = "鍑虹敓瀛曞懆")
+ @ApiModelProperty(value = "鍑虹敓瀛曞懆")
+ private BigDecimal gestationalWeek;
+
+ /** 鍑虹敓浣撻噸(kg) */
+ @Excel(name = "鍑虹敓浣撻噸(kg)")
+ @ApiModelProperty(value = "鍑虹敓浣撻噸(kg)")
+ private BigDecimal birthWeight;
+
+ /** 鐧昏浜哄憳 */
+ @Excel(name = "鐧昏浜哄憳")
+ @ApiModelProperty(value = "鐧昏浜哄憳")
+ private String registerUser;
+
+ /** 鍖婚櫌鏈烘瀯ID */
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ @ApiModelProperty(value = "鍖婚櫌鏈烘瀯ID")
+ private String orgid;
+
+ /** 闄㈠尯ID */
+ @Excel(name = "闄㈠尯ID")
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMaternityArchive.java b/smartor/src/main/java/com/smartor/domain/PatMaternityArchive.java
new file mode 100644
index 0000000..be9ce5f
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatMaternityArchive.java
@@ -0,0 +1,184 @@
+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 com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 濡囩妗ｆ瀵硅薄 pat_maternity_archive
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Data
+@ApiModel(value = "濡囩妗ｆ瀵硅薄")
+public class PatMaternityArchive extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 濡囩妗ｆ涓婚敭ID */
+ @ApiModelProperty(value = "濡囩妗ｆ涓婚敭ID")
+ private Long id;
+
+ /** 濡囧辜妗ｆ绫诲瀷: 1 鏃╁瓡鍏崇埍2 鍥寸粷缁忔湡MHI */
+ @Excel(name = "妗ｆ绫诲瀷")
+ @ApiModelProperty(value = "濡囧辜妗ｆ绫诲瀷: 1 鏃╁瓡鍏崇埍2 鍥寸粷缁忔湡MHI")
+ private String archiveType;
+
+ /** 闂ㄨ瘖缂栧彿 */
+ @Excel(name = "闂ㄨ瘖缂栧彿")
+ @ApiModelProperty(value = "闂ㄨ瘖缂栧彿")
+ private String outhospno;
+
+ /** 浣忛櫌缂栧彿 */
+ @Excel(name = "浣忛櫌缂栧彿")
+ @ApiModelProperty(value = "浣忛櫌缂栧彿")
+ private String inhospno;
+
+ /** 娴佹按鍙� */
+ @Excel(name = "娴佹按鍙�")
+ @ApiModelProperty(value = "娴佹按鍙�")
+ private String serialnum;
+
+ /** 鎮ｈ�匢D */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private Long patid;
+
+ /** 鎮ｈ�呭鍚� */
+ @Excel(name = "鎮ｈ�呭鍚�")
+ @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+ private String patname;
+
+ /** 瀹堕暱濮撳悕 */
+ @Excel(name = "瀹堕暱濮撳悕")
+ @ApiModelProperty(value = "瀹堕暱濮撳悕")
+ private String parentname;
+
+ /** 鍑虹敓鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ private Date birthdate;
+
+ /** 璇佷欢鍙风爜 */
+ @Excel(name = "璇佷欢鍙风爜")
+ @ApiModelProperty(value = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /** 鑱旂郴鐢佃瘽 */
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /** 璇婃柇鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璇婃柇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "璇婃柇鏃堕棿")
+ private Date diagTime;
+
+ /** 寤烘。鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寤烘。鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寤烘。鏃堕棿")
+ private Date archiveTime;
+
+ /** 鎷熼殢璁挎椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎷熼殢璁挎椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鎷熼殢璁挎椂闂�")
+ private Date plannedFollowTime;
+
+ /** 闅忚鍛ㄦ湡(娆℃暟) */
+ @Excel(name = "闅忚鍛ㄦ湡(娆℃暟)")
+ @ApiModelProperty(value = "闅忚鍛ㄦ湡(娆℃暟)")
+ private String followupCycleTimes;
+
+ /** 鎬у埆 1:鐢� 2:濂� */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
+ private Long sex;
+
+ /** 涓绘不鍖荤敓 */
+ @Excel(name = "涓绘不鍖荤敓")
+ @ApiModelProperty(value = "涓绘不鍖荤敓")
+ private String doctorCode;
+
+ /** 涓绘不鍖荤敓濮撳悕 */
+ @Excel(name = "涓绘不鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "涓绘不鍖荤敓濮撳悕")
+ private String doctorName;
+
+ /** 缁忕鍖荤敓 */
+ @Excel(name = "缁忕鍖荤敓")
+ @ApiModelProperty(value = "缁忕鍖荤敓")
+ private String managementDoctorCode;
+
+ /** 缁忕鍖荤敓濮撳悕 */
+ @Excel(name = "缁忕鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
+ private String managementDoctorName;
+
+ /** 绉戝缂栧彿 */
+ @Excel(name = "绉戝缂栧彿")
+ @ApiModelProperty(value = "绉戝缂栧彿")
+ private String deptcode;
+
+ /** 绉戝鍚嶇О */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
+
+ /** 鐥呭尯缂栧彿 */
+ @Excel(name = "鐥呭尯缂栧彿")
+ @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ private String wardcode;
+
+ /** 鐥呭尯鍚嶇О */
+ @Excel(name = "鐥呭尯鍚嶇О")
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String wardname;
+
+ /** 璇婃柇ID */
+ @Excel(name = "璇婃柇ID")
+ @ApiModelProperty(value = "璇婃柇ID")
+ private String icd10code;
+
+ /** 璇婃柇鍚嶇О */
+ @Excel(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String diagname;
+
+ /** 濡婂鎯呭喌 */
+ @Excel(name = "濡婂鎯呭喌")
+ @ApiModelProperty(value = "濡婂鎯呭喌")
+ private String pregnancySituation;
+
+ /** 缁撴鐘舵�� */
+ @Excel(name = "缁撴鐘舵��")
+ @ApiModelProperty(value = "缁撴鐘舵��")
+ private String closeStatus;
+
+ /** 鐧昏浜哄憳 */
+ @Excel(name = "鐧昏浜哄憳")
+ @ApiModelProperty(value = "鐧昏浜哄憳")
+ private String registerUser;
+
+ /** 鍖婚櫌鏈烘瀯ID */
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ @ApiModelProperty(value = "鍖婚櫌鏈烘瀯ID")
+ private String orgid;
+
+ /** 闄㈠尯ID */
+ @Excel(name = "闄㈠尯ID")
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+}
diff --git a/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java b/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
new file mode 100644
index 0000000..ce7e64b
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatMaternityArchiveDetail.java
@@ -0,0 +1,234 @@
+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 com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 濡囩妗ｆ璇︽儏瀵硅薄 pat_maternity_archive_detail
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Data
+@ApiModel(value = "濡囩妗ｆ璇︽儏瀵硅薄")
+public class PatMaternityArchiveDetail extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /** 濡囩妗ｆ璇︽儏涓婚敭ID */
+ @ApiModelProperty(value = "濡囩妗ｆ璇︽儏涓婚敭ID")
+ private Long id;
+
+ /** 濡囩妗ｆ涓婚敭ID 瀵瑰簲 pat_maternity_archive.id */
+ @Excel(name = "妗ｆID")
+ @ApiModelProperty(value = "濡囩妗ｆ涓婚敭ID 瀵瑰簲 pat_maternity_archive.id")
+ private Long archiveid;
+
+ /** 妗ｆ绫诲瀷: 1 鏃╁瓡鍏崇埍2 鍥寸粷缁忔湡MHI */
+ @Excel(name = "妗ｆ绫诲瀷")
+ @ApiModelProperty(value = "妗ｆ绫诲瀷: 1 鏃╁瓡鍏崇埍2 鍥寸粷缁忔湡MHI")
+ private String archiveType;
+
+ /** 鏉ユ簮绫诲瀷: 1 闂ㄨ瘖璁板綍 */
+ @Excel(name = "鏉ユ簮绫诲瀷")
+ @ApiModelProperty(value = "鏉ユ簮绫诲瀷: 1 闂ㄨ瘖璁板綍")
+ private String sourceType;
+
+ /** 闂ㄨ瘖缂栧彿 */
+ @Excel(name = "闂ㄨ瘖缂栧彿")
+ @ApiModelProperty(value = "闂ㄨ瘖缂栧彿")
+ private String outhospno;
+
+ /** 浣忛櫌缂栧彿 */
+ @Excel(name = "浣忛櫌缂栧彿")
+ @ApiModelProperty(value = "浣忛櫌缂栧彿")
+ private String inhospno;
+
+ /** 娴佹按鍙� */
+ @Excel(name = "娴佹按鍙�")
+ @ApiModelProperty(value = "娴佹按鍙�")
+ private String serialnum;
+
+ /** 鎮ｈ�匢D */
+ @Excel(name = "鎮ｈ�匢D")
+ @ApiModelProperty(value = "鎮ｈ�匢D")
+ private Long patid;
+
+ /** 鎮ｈ�呭鍚� */
+ @Excel(name = "鎮ｈ�呭鍚�")
+ @ApiModelProperty(value = "鎮ｈ�呭鍚�")
+ private String patname;
+
+ /** 鍑虹敓鏃ユ湡 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍑虹敓鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ private Date birthdate;
+
+ /** 璇佷欢鍙风爜 */
+ @Excel(name = "璇佷欢鍙风爜")
+ @ApiModelProperty(value = "璇佷欢鍙风爜")
+ private String idcardno;
+
+ /** 鑱旂郴鐢佃瘽 */
+ @Excel(name = "鑱旂郴鐢佃瘽")
+ @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+ private String phone;
+
+ /** 璇婃柇鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璇婃柇鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "璇婃柇鏃堕棿")
+ private Date diagTime;
+
+ /** 寤烘。鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "寤烘。鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寤烘。鏃堕棿")
+ private Date archiveTime;
+
+ /** 鎷熼殢璁挎椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鎷熼殢璁挎椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鎷熼殢璁挎椂闂�")
+ private Date plannedFollowTime;
+
+ /** 鎬у埆 1:鐢� 2:濂� */
+ @Excel(name = "鎬у埆")
+ @ApiModelProperty(value = "鎬у埆 1:鐢� 2:濂�")
+ private Long sex;
+
+ /** 涓绘不鍖荤敓 */
+ @Excel(name = "涓绘不鍖荤敓")
+ @ApiModelProperty(value = "涓绘不鍖荤敓")
+ private String doctorCode;
+
+ /** 涓绘不鍖荤敓濮撳悕 */
+ @Excel(name = "涓绘不鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "涓绘不鍖荤敓濮撳悕")
+ private String doctorName;
+
+ /** 缁忕鍖荤敓 */
+ @Excel(name = "缁忕鍖荤敓")
+ @ApiModelProperty(value = "缁忕鍖荤敓")
+ private String managementDoctorCode;
+
+ /** 缁忕鍖荤敓濮撳悕 */
+ @Excel(name = "缁忕鍖荤敓濮撳悕")
+ @ApiModelProperty(value = "缁忕鍖荤敓濮撳悕")
+ private String managementDoctorName;
+
+ /** 绉戝缂栧彿 */
+ @Excel(name = "绉戝缂栧彿")
+ @ApiModelProperty(value = "绉戝缂栧彿")
+ private String deptcode;
+
+ /** 绉戝鍚嶇О */
+ @Excel(name = "绉戝鍚嶇О")
+ @ApiModelProperty(value = "绉戝鍚嶇О")
+ private String deptname;
+
+ /** 鐥呭尯缂栧彿 */
+ @Excel(name = "鐥呭尯缂栧彿")
+ @ApiModelProperty(value = "鐥呭尯缂栧彿")
+ private String wardcode;
+
+ /** 鐥呭尯鍚嶇О */
+ @Excel(name = "鐥呭尯鍚嶇О")
+ @ApiModelProperty(value = "鐥呭尯鍚嶇О")
+ private String wardname;
+
+ /** 璇婃柇ID */
+ @Excel(name = "璇婃柇ID")
+ @ApiModelProperty(value = "璇婃柇ID")
+ private String icd10code;
+
+ /** 璇婃柇鍚嶇О */
+ @Excel(name = "璇婃柇鍚嶇О")
+ @ApiModelProperty(value = "璇婃柇鍚嶇О")
+ private String diagname;
+
+ /** 濡婂鎯呭喌 */
+ @ApiModelProperty(value = "濡婂鎯呭喌")
+ private String pregnancySituation;
+
+ /** 鍏蜂綋鎯呭喌 */
+ @ApiModelProperty(value = "鍏蜂綋鎯呭喌")
+ private String specificSituation;
+
+ /** 澶勭悊寤鸿 */
+ @ApiModelProperty(value = "澶勭悊寤鸿")
+ private String handleSuggestion;
+
+ /** 缁撴鐘舵�� */
+ @Excel(name = "缁撴鐘舵��")
+ @ApiModelProperty(value = "缁撴鐘舵��")
+ private String closeStatus;
+
+ /** 鏄惁寤哄唽 0-鍚� 1-鏄� */
+ @Excel(name = "鏄惁寤哄唽")
+ @ApiModelProperty(value = "鏄惁寤哄唽 0-鍚� 1-鏄�")
+ private String isRecordEstablished;
+
+ /** 棰勪骇鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "棰勪骇鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "棰勪骇鏈�")
+ private Date dueDate;
+
+ /** 鐧昏浜哄憳 */
+ @Excel(name = "鐧昏浜哄憳")
+ @ApiModelProperty(value = "鐧昏浜哄憳")
+ private String registerUser;
+
+ /** 闅忚鍛ㄦ湡 */
+ @ApiModelProperty(value = "闅忚鍛ㄦ湡")
+ private String followupPeriod;
+
+ /** 鏃╁瓡鍏崇埍-鏃╁瓡闅忚琛� */
+ @ApiModelProperty(value = "鏃╁瓡鍏崇埍-鏃╁瓡闅忚琛�")
+ private String epEarlyPregnancyFollowupForm;
+
+ /** 鍥寸粷缁忔湡MHI-鏇村勾鏈熼殢璁跨郴缁熼棶棰樿〃 */
+ @ApiModelProperty(value = "鍥寸粷缁忔湡MHI-鏇村勾鏈熼殢璁跨郴缁熼棶棰樿〃")
+ private String mhiMenopauseFollowupSystemIssuesForm;
+
+ /** 鍥寸粷缁忔湡MHI-MHT棣栬瘖鐥呭巻琛� */
+ @ApiModelProperty(value = "鍥寸粷缁忔湡MHI-MHT棣栬瘖鐥呭巻琛�")
+ private String mhiMhtInitialVisitMedicalRecordForm;
+
+ /** 鍥寸粷缁忔湡MHI-MHT澶嶈瘖鐥呭巻琛� */
+ @ApiModelProperty(value = "鍥寸粷缁忔湡MHI-MHT澶嶈瘖鐥呭巻琛�")
+ private String mhiMhtFollowUpMedicalRecordForm;
+
+ /** 鍥寸粷缁忔湡MHI-鏀硅壇 Kupperman璇勫垎鏍囧噯琛� */
+ @ApiModelProperty(value = "鍥寸粷缁忔湡MHI-鏀硅壇 Kupperman璇勫垎鏍囧噯琛�")
+ private String mhiModifiedKuppermanScoringScaleForm;
+
+ /** 鍥寸粷缁忔湡MHI-鏇村勾鏈熻瘎瀹氶噺琛紙MRS锛� */
+ @ApiModelProperty(value = "鍥寸粷缁忔湡MHI-鏇村勾鏈熻瘎瀹氶噺琛紙MRS锛�")
+ private String mhiMenopauseRatingScaleForm;
+
+ /** 鍥寸粷缁忔湡MHI-鍖瑰吂鍫＄潯鐪犺川閲忔寚鏁伴噺琛紙PSQI锛� */
+ @ApiModelProperty(value = "鍥寸粷缁忔湡MHI-鍖瑰吂鍫＄潯鐪犺川閲忔寚鏁伴噺琛紙PSQI锛�")
+ private String mhiPittsburghSleepQualityIndexForm;
+
+ /** 鍖婚櫌鏈烘瀯ID */
+ @Excel(name = "鍖婚櫌鏈烘瀯ID")
+ @ApiModelProperty(value = "鍖婚櫌鏈烘瀯ID")
+ private String orgid;
+
+ /** 闄㈠尯ID */
+ @Excel(name = "闄㈠尯ID")
+ @ApiModelProperty(value = "闄㈠尯ID")
+ private String campusid;
+
+ /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+ @ApiModelProperty(value = "鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+ private String delFlag;
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatChildArchiveDetailMapper.java b/smartor/src/main/java/com/smartor/mapper/PatChildArchiveDetailMapper.java
new file mode 100644
index 0000000..dbf5b1f
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatChildArchiveDetailMapper.java
@@ -0,0 +1,28 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatChildArchiveDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆ璇︽儏Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Mapper
+public interface PatChildArchiveDetailMapper
+{
+ public PatChildArchiveDetail selectPatChildArchiveDetailById(Long id);
+
+ public List<PatChildArchiveDetail> selectPatChildArchiveDetailList(PatChildArchiveDetail patChildArchiveDetail);
+
+ public int insertPatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);
+
+ public int updatePatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);
+
+ public int deletePatChildArchiveDetailById(Long id);
+
+ public int deletePatChildArchiveDetailByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatChildArchiveMapper.java b/smartor/src/main/java/com/smartor/mapper/PatChildArchiveMapper.java
new file mode 100644
index 0000000..1f55556
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatChildArchiveMapper.java
@@ -0,0 +1,28 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatChildArchive;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆMapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Mapper
+public interface PatChildArchiveMapper
+{
+ public PatChildArchive selectPatChildArchiveById(Long id);
+
+ public List<PatChildArchive> selectPatChildArchiveList(PatChildArchive patChildArchive);
+
+ public int insertPatChildArchive(PatChildArchive patChildArchive);
+
+ public int updatePatChildArchive(PatChildArchive patChildArchive);
+
+ public int deletePatChildArchiveById(Long id);
+
+ public int deletePatChildArchiveByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveDetailMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveDetailMapper.java
new file mode 100644
index 0000000..8a7b74d
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveDetailMapper.java
@@ -0,0 +1,28 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatMaternityArchiveDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 濡囩妗ｆ璇︽儏Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Mapper
+public interface PatMaternityArchiveDetailMapper
+{
+ public PatMaternityArchiveDetail selectPatMaternityArchiveDetailById(Long id);
+
+ public List<PatMaternityArchiveDetail> selectPatMaternityArchiveDetailList(PatMaternityArchiveDetail patMaternityArchiveDetail);
+
+ public int insertPatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);
+
+ public int updatePatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);
+
+ public int deletePatMaternityArchiveDetailById(Long id);
+
+ public int deletePatMaternityArchiveDetailByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveMapper.java
new file mode 100644
index 0000000..55721fc
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatMaternityArchiveMapper.java
@@ -0,0 +1,28 @@
+package com.smartor.mapper;
+
+import com.smartor.domain.PatMaternityArchive;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 濡囩妗ｆMapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Mapper
+public interface PatMaternityArchiveMapper
+{
+ public PatMaternityArchive selectPatMaternityArchiveById(Long id);
+
+ public List<PatMaternityArchive> selectPatMaternityArchiveList(PatMaternityArchive patMaternityArchive);
+
+ public int insertPatMaternityArchive(PatMaternityArchive patMaternityArchive);
+
+ public int updatePatMaternityArchive(PatMaternityArchive patMaternityArchive);
+
+ public int deletePatMaternityArchiveById(Long id);
+
+ public int deletePatMaternityArchiveByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMaternityChildArchiveMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMaternityChildArchiveMapper.java
deleted file mode 100644
index 4856bb9..0000000
--- a/smartor/src/main/java/com/smartor/mapper/PatMaternityChildArchiveMapper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.smartor.mapper;
-
-import com.smartor.domain.PatMaternityChildArchive;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 濡囧辜妗ｆMapper鎺ュ彛
- *
- * @author ruoyi
- * @date 2026-10-08
- */
-@Mapper
-public interface PatMaternityChildArchiveMapper
-{
- /**
- * 鏌ヨ濡囧辜妗ｆ
- *
- * @param id 濡囧辜妗ｆ涓婚敭
- * @return 濡囧辜妗ｆ
- */
- public PatMaternityChildArchive selectPatMaternityChildArchiveById(Long id);
-
- /**
- * 鏌ヨ濡囧辜妗ｆ鍒楄〃
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 濡囧辜妗ｆ闆嗗悎
- */
- public List<PatMaternityChildArchive> selectPatMaternityChildArchiveList(PatMaternityChildArchive patMaternityChildArchive);
-
- /**
- * 鏂板濡囧辜妗ｆ
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 缁撴灉
- */
- public int insertPatMaternityChildArchive(PatMaternityChildArchive patMaternityChildArchive);
-
- /**
- * 淇敼濡囧辜妗ｆ
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 缁撴灉
- */
- public int updatePatMaternityChildArchive(PatMaternityChildArchive patMaternityChildArchive);
-
- /**
- * 鍒犻櫎濡囧辜妗ｆ
- *
- * @param id 濡囧辜妗ｆ涓婚敭
- * @return 缁撴灉
- */
- public int deletePatMaternityChildArchiveById(Long id);
-
- /**
- * 鎵归噺鍒犻櫎濡囧辜妗ｆ
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deletePatMaternityChildArchiveByIds(Long[] ids);
-}
diff --git a/smartor/src/main/java/com/smartor/service/IPatChildArchiveDetailService.java b/smartor/src/main/java/com/smartor/service/IPatChildArchiveDetailService.java
new file mode 100644
index 0000000..2d8f399
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatChildArchiveDetailService.java
@@ -0,0 +1,26 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatChildArchiveDetail;
+
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆ璇︽儏Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+public interface IPatChildArchiveDetailService
+{
+ public PatChildArchiveDetail selectPatChildArchiveDetailById(Long id);
+
+ public List<PatChildArchiveDetail> selectPatChildArchiveDetailList(PatChildArchiveDetail patChildArchiveDetail);
+
+ public int insertPatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);
+
+ public int updatePatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail);
+
+ public int deletePatChildArchiveDetailByIds(Long[] ids);
+
+ public int deletePatChildArchiveDetailById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatChildArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatChildArchiveService.java
new file mode 100644
index 0000000..c32bf24
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatChildArchiveService.java
@@ -0,0 +1,26 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatChildArchive;
+
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆService鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+public interface IPatChildArchiveService
+{
+ public PatChildArchive selectPatChildArchiveById(Long id);
+
+ public List<PatChildArchive> selectPatChildArchiveList(PatChildArchive patChildArchive);
+
+ public int insertPatChildArchive(PatChildArchive patChildArchive);
+
+ public int updatePatChildArchive(PatChildArchive patChildArchive);
+
+ public int deletePatChildArchiveByIds(Long[] ids);
+
+ public int deletePatChildArchiveById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMaternityArchiveDetailService.java b/smartor/src/main/java/com/smartor/service/IPatMaternityArchiveDetailService.java
new file mode 100644
index 0000000..e5e03b2
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatMaternityArchiveDetailService.java
@@ -0,0 +1,26 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatMaternityArchiveDetail;
+
+import java.util.List;
+
+/**
+ * 濡囩妗ｆ璇︽儏Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+public interface IPatMaternityArchiveDetailService
+{
+ public PatMaternityArchiveDetail selectPatMaternityArchiveDetailById(Long id);
+
+ public List<PatMaternityArchiveDetail> selectPatMaternityArchiveDetailList(PatMaternityArchiveDetail patMaternityArchiveDetail);
+
+ public int insertPatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);
+
+ public int updatePatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail);
+
+ public int deletePatMaternityArchiveDetailByIds(Long[] ids);
+
+ public int deletePatMaternityArchiveDetailById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMaternityArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatMaternityArchiveService.java
new file mode 100644
index 0000000..61c7145
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatMaternityArchiveService.java
@@ -0,0 +1,26 @@
+package com.smartor.service;
+
+import com.smartor.domain.PatMaternityArchive;
+
+import java.util.List;
+
+/**
+ * 濡囩妗ｆService鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+public interface IPatMaternityArchiveService
+{
+ public PatMaternityArchive selectPatMaternityArchiveById(Long id);
+
+ public List<PatMaternityArchive> selectPatMaternityArchiveList(PatMaternityArchive patMaternityArchive);
+
+ public int insertPatMaternityArchive(PatMaternityArchive patMaternityArchive);
+
+ public int updatePatMaternityArchive(PatMaternityArchive patMaternityArchive);
+
+ public int deletePatMaternityArchiveByIds(Long[] ids);
+
+ public int deletePatMaternityArchiveById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMaternityChildArchiveService.java b/smartor/src/main/java/com/smartor/service/IPatMaternityChildArchiveService.java
deleted file mode 100644
index 3c8a208..0000000
--- a/smartor/src/main/java/com/smartor/service/IPatMaternityChildArchiveService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.smartor.service;
-
-import com.smartor.domain.PatMaternityChildArchive;
-
-import java.util.List;
-
-/**
- * 濡囧辜妗ｆService鎺ュ彛
- *
- * @author ruoyi
- * @date 2026-10-08
- */
-public interface IPatMaternityChildArchiveService
-{
- /**
- * 鏌ヨ濡囧辜妗ｆ
- *
- * @param id 濡囧辜妗ｆ涓婚敭
- * @return 濡囧辜妗ｆ
- */
- public PatMaternityChildArchive selectPatMaternityChildArchiveById(Long id);
-
- /**
- * 鏌ヨ濡囧辜妗ｆ鍒楄〃
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 濡囧辜妗ｆ闆嗗悎
- */
- public List<PatMaternityChildArchive> selectPatMaternityChildArchiveList(PatMaternityChildArchive patMaternityChildArchive);
-
- /**
- * 鏂板濡囧辜妗ｆ
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 缁撴灉
- */
- public int insertPatMaternityChildArchive(PatMaternityChildArchive patMaternityChildArchive);
-
- /**
- * 淇敼濡囧辜妗ｆ
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 缁撴灉
- */
- public int updatePatMaternityChildArchive(PatMaternityChildArchive patMaternityChildArchive);
-
- /**
- * 鎵归噺鍒犻櫎濡囧辜妗ｆ
- *
- * @param ids 闇�瑕佸垹闄ょ殑濡囧辜妗ｆ涓婚敭闆嗗悎
- * @return 缁撴灉
- */
- public int deletePatMaternityChildArchiveByIds(Long[] ids);
-
- /**
- * 鍒犻櫎濡囧辜妗ｆ淇℃伅
- *
- * @param id 濡囧辜妗ｆ涓婚敭
- * @return 缁撴灉
- */
- public int deletePatMaternityChildArchiveById(Long id);
-}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatChildArchiveDetailServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatChildArchiveDetailServiceImpl.java
new file mode 100644
index 0000000..f3eb204
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatChildArchiveDetailServiceImpl.java
@@ -0,0 +1,61 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatChildArchiveDetail;
+import com.smartor.mapper.PatChildArchiveDetailMapper;
+import com.smartor.service.IPatChildArchiveDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆ璇︽儏Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Service
+public class PatChildArchiveDetailServiceImpl implements IPatChildArchiveDetailService
+{
+ @Autowired
+ private PatChildArchiveDetailMapper patChildArchiveDetailMapper;
+
+ @Override
+ public PatChildArchiveDetail selectPatChildArchiveDetailById(Long id)
+ {
+ return patChildArchiveDetailMapper.selectPatChildArchiveDetailById(id);
+ }
+
+ @Override
+ public List<PatChildArchiveDetail> selectPatChildArchiveDetailList(PatChildArchiveDetail patChildArchiveDetail)
+ {
+ return patChildArchiveDetailMapper.selectPatChildArchiveDetailList(patChildArchiveDetail);
+ }
+
+ @Override
+ public int insertPatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail)
+ {
+ patChildArchiveDetail.setCreateTime(DateUtils.getNowDate());
+ return patChildArchiveDetailMapper.insertPatChildArchiveDetail(patChildArchiveDetail);
+ }
+
+ @Override
+ public int updatePatChildArchiveDetail(PatChildArchiveDetail patChildArchiveDetail)
+ {
+ patChildArchiveDetail.setUpdateTime(DateUtils.getNowDate());
+ return patChildArchiveDetailMapper.updatePatChildArchiveDetail(patChildArchiveDetail);
+ }
+
+ @Override
+ public int deletePatChildArchiveDetailByIds(Long[] ids)
+ {
+ return patChildArchiveDetailMapper.deletePatChildArchiveDetailByIds(ids);
+ }
+
+ @Override
+ public int deletePatChildArchiveDetailById(Long id)
+ {
+ return patChildArchiveDetailMapper.deletePatChildArchiveDetailById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatChildArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatChildArchiveServiceImpl.java
new file mode 100644
index 0000000..c7f4390
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatChildArchiveServiceImpl.java
@@ -0,0 +1,61 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatChildArchive;
+import com.smartor.mapper.PatChildArchiveMapper;
+import com.smartor.service.IPatChildArchiveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鍎跨妗ｆService涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Service
+public class PatChildArchiveServiceImpl implements IPatChildArchiveService
+{
+ @Autowired
+ private PatChildArchiveMapper patChildArchiveMapper;
+
+ @Override
+ public PatChildArchive selectPatChildArchiveById(Long id)
+ {
+ return patChildArchiveMapper.selectPatChildArchiveById(id);
+ }
+
+ @Override
+ public List<PatChildArchive> selectPatChildArchiveList(PatChildArchive patChildArchive)
+ {
+ return patChildArchiveMapper.selectPatChildArchiveList(patChildArchive);
+ }
+
+ @Override
+ public int insertPatChildArchive(PatChildArchive patChildArchive)
+ {
+ patChildArchive.setCreateTime(DateUtils.getNowDate());
+ return patChildArchiveMapper.insertPatChildArchive(patChildArchive);
+ }
+
+ @Override
+ public int updatePatChildArchive(PatChildArchive patChildArchive)
+ {
+ patChildArchive.setUpdateTime(DateUtils.getNowDate());
+ return patChildArchiveMapper.updatePatChildArchive(patChildArchive);
+ }
+
+ @Override
+ public int deletePatChildArchiveByIds(Long[] ids)
+ {
+ return patChildArchiveMapper.deletePatChildArchiveByIds(ids);
+ }
+
+ @Override
+ public int deletePatChildArchiveById(Long id)
+ {
+ return patChildArchiveMapper.deletePatChildArchiveById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveDetailServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveDetailServiceImpl.java
new file mode 100644
index 0000000..6f5c742
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveDetailServiceImpl.java
@@ -0,0 +1,61 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatMaternityArchiveDetail;
+import com.smartor.mapper.PatMaternityArchiveDetailMapper;
+import com.smartor.service.IPatMaternityArchiveDetailService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 濡囩妗ｆ璇︽儏Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Service
+public class PatMaternityArchiveDetailServiceImpl implements IPatMaternityArchiveDetailService
+{
+ @Autowired
+ private PatMaternityArchiveDetailMapper patMaternityArchiveDetailMapper;
+
+ @Override
+ public PatMaternityArchiveDetail selectPatMaternityArchiveDetailById(Long id)
+ {
+ return patMaternityArchiveDetailMapper.selectPatMaternityArchiveDetailById(id);
+ }
+
+ @Override
+ public List<PatMaternityArchiveDetail> selectPatMaternityArchiveDetailList(PatMaternityArchiveDetail patMaternityArchiveDetail)
+ {
+ return patMaternityArchiveDetailMapper.selectPatMaternityArchiveDetailList(patMaternityArchiveDetail);
+ }
+
+ @Override
+ public int insertPatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail)
+ {
+ patMaternityArchiveDetail.setCreateTime(DateUtils.getNowDate());
+ return patMaternityArchiveDetailMapper.insertPatMaternityArchiveDetail(patMaternityArchiveDetail);
+ }
+
+ @Override
+ public int updatePatMaternityArchiveDetail(PatMaternityArchiveDetail patMaternityArchiveDetail)
+ {
+ patMaternityArchiveDetail.setUpdateTime(DateUtils.getNowDate());
+ return patMaternityArchiveDetailMapper.updatePatMaternityArchiveDetail(patMaternityArchiveDetail);
+ }
+
+ @Override
+ public int deletePatMaternityArchiveDetailByIds(Long[] ids)
+ {
+ return patMaternityArchiveDetailMapper.deletePatMaternityArchiveDetailByIds(ids);
+ }
+
+ @Override
+ public int deletePatMaternityArchiveDetailById(Long id)
+ {
+ return patMaternityArchiveDetailMapper.deletePatMaternityArchiveDetailById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java
new file mode 100644
index 0000000..49b170a
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMaternityArchiveServiceImpl.java
@@ -0,0 +1,61 @@
+package com.smartor.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatMaternityArchive;
+import com.smartor.mapper.PatMaternityArchiveMapper;
+import com.smartor.service.IPatMaternityArchiveService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 濡囩妗ｆService涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2026-10-09
+ */
+@Service
+public class PatMaternityArchiveServiceImpl implements IPatMaternityArchiveService
+{
+ @Autowired
+ private PatMaternityArchiveMapper patMaternityArchiveMapper;
+
+ @Override
+ public PatMaternityArchive selectPatMaternityArchiveById(Long id)
+ {
+ return patMaternityArchiveMapper.selectPatMaternityArchiveById(id);
+ }
+
+ @Override
+ public List<PatMaternityArchive> selectPatMaternityArchiveList(PatMaternityArchive patMaternityArchive)
+ {
+ return patMaternityArchiveMapper.selectPatMaternityArchiveList(patMaternityArchive);
+ }
+
+ @Override
+ public int insertPatMaternityArchive(PatMaternityArchive patMaternityArchive)
+ {
+ patMaternityArchive.setCreateTime(DateUtils.getNowDate());
+ return patMaternityArchiveMapper.insertPatMaternityArchive(patMaternityArchive);
+ }
+
+ @Override
+ public int updatePatMaternityArchive(PatMaternityArchive patMaternityArchive)
+ {
+ patMaternityArchive.setUpdateTime(DateUtils.getNowDate());
+ return patMaternityArchiveMapper.updatePatMaternityArchive(patMaternityArchive);
+ }
+
+ @Override
+ public int deletePatMaternityArchiveByIds(Long[] ids)
+ {
+ return patMaternityArchiveMapper.deletePatMaternityArchiveByIds(ids);
+ }
+
+ @Override
+ public int deletePatMaternityArchiveById(Long id)
+ {
+ return patMaternityArchiveMapper.deletePatMaternityArchiveById(id);
+ }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMaternityChildArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMaternityChildArchiveServiceImpl.java
deleted file mode 100644
index e5427ea..0000000
--- a/smartor/src/main/java/com/smartor/service/impl/PatMaternityChildArchiveServiceImpl.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.smartor.service.impl;
-
-import com.ruoyi.common.utils.DateUtils;
-import com.smartor.domain.PatMaternityChildArchive;
-import com.smartor.mapper.PatMaternityChildArchiveMapper;
-import com.smartor.service.IPatMaternityChildArchiveService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 濡囧辜妗ｆService涓氬姟灞傚鐞�
- *
- * @author ruoyi
- * @date 2026-10-08
- */
-@Service
-public class PatMaternityChildArchiveServiceImpl implements IPatMaternityChildArchiveService
-{
- @Autowired
- private PatMaternityChildArchiveMapper patMaternityChildArchiveMapper;
-
- /**
- * 鏌ヨ濡囧辜妗ｆ
- *
- * @param id 濡囧辜妗ｆ涓婚敭
- * @return 濡囧辜妗ｆ
- */
- @Override
- public PatMaternityChildArchive selectPatMaternityChildArchiveById(Long id)
- {
- return patMaternityChildArchiveMapper.selectPatMaternityChildArchiveById(id);
- }
-
- /**
- * 鏌ヨ濡囧辜妗ｆ鍒楄〃
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 濡囧辜妗ｆ
- */
- @Override
- public List<PatMaternityChildArchive> selectPatMaternityChildArchiveList(PatMaternityChildArchive patMaternityChildArchive)
- {
- return patMaternityChildArchiveMapper.selectPatMaternityChildArchiveList(patMaternityChildArchive);
- }
-
- /**
- * 鏂板濡囧辜妗ｆ
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 缁撴灉
- */
- @Override
- public int insertPatMaternityChildArchive(PatMaternityChildArchive patMaternityChildArchive)
- {
- patMaternityChildArchive.setCreateTime(DateUtils.getNowDate());
- return patMaternityChildArchiveMapper.insertPatMaternityChildArchive(patMaternityChildArchive);
- }
-
- /**
- * 淇敼濡囧辜妗ｆ
- *
- * @param patMaternityChildArchive 濡囧辜妗ｆ
- * @return 缁撴灉
- */
- @Override
- public int updatePatMaternityChildArchive(PatMaternityChildArchive patMaternityChildArchive)
- {
- patMaternityChildArchive.setUpdateTime(DateUtils.getNowDate());
- return patMaternityChildArchiveMapper.updatePatMaternityChildArchive(patMaternityChildArchive);
- }
-
- /**
- * 鎵归噺鍒犻櫎濡囧辜妗ｆ
- *
- * @param ids 闇�瑕佸垹闄ょ殑濡囧辜妗ｆ涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deletePatMaternityChildArchiveByIds(Long[] ids)
- {
- return patMaternityChildArchiveMapper.deletePatMaternityChildArchiveByIds(ids);
- }
-
- /**
- * 鍒犻櫎濡囧辜妗ｆ淇℃伅
- *
- * @param id 濡囧辜妗ｆ涓婚敭
- * @return 缁撴灉
- */
- @Override
- public int deletePatMaternityChildArchiveById(Long id)
- {
- return patMaternityChildArchiveMapper.deletePatMaternityChildArchiveById(id);
- }
-}
diff --git a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml
similarity index 70%
copy from smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
copy to smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml
index 8d915e9..591f495 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatChildArchiveDetailMapper.xml
@@ -2,25 +2,28 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smartor.mapper.PatMaternityChildArchiveMapper">
+<mapper namespace="com.smartor.mapper.PatChildArchiveDetailMapper">
- <resultMap type="com.smartor.domain.PatMaternityChildArchive" id="PatMaternityChildArchiveResult">
+ <resultMap type="com.smartor.domain.PatChildArchiveDetail" id="PatChildArchiveDetailResult">
<result property="id" column="id"/>
- <result property="type" column="type"/>
+ <result property="archiveid" column="archiveid"/>
<result property="archiveType" column="archive_type"/>
+ <result property="sourceType" column="source_type"/>
<result property="outhospno" column="outhospno"/>
<result property="inhospno" column="inhospno"/>
<result property="serialnum" column="serialnum"/>
<result property="patid" column="patid"/>
<result property="patname" column="patname"/>
<result property="parentname" column="parentname"/>
+ <result property="parentRelation" column="parent_relation"/>
+ <result property="parentPhone" column="parent_phone"/>
+ <result property="parentIdcardno" column="parent_idcardno"/>
+ <result property="parentAddress" column="parent_address"/>
<result property="birthdate" column="birthdate"/>
<result property="idcardno" column="idcardno"/>
<result property="phone" column="phone"/>
<result property="diagTime" column="diag_time"/>
<result property="archiveTime" column="archive_time"/>
- <result property="plannedFollowTime" column="planned_follow_time"/>
- <result property="followupCycleTimes" column="followup_cycle_times"/>
<result property="sex" column="sex"/>
<result property="doctorCode" column="doctor_code"/>
<result property="doctorName" column="doctor_name"/>
@@ -32,15 +35,24 @@
<result property="wardname" column="wardname"/>
<result property="icd10code" column="icd10code"/>
<result property="diagname" column="diagname"/>
- <result property="pregnancySituation" column="pregnancy_situation"/>
- <result property="appointmentSituation" column="appointment_situation"/>
- <result property="closeStatus" column="close_status"/>
<result property="nutritionIcd10Code" column="nutrition_icd10_code"/>
<result property="nutritionDiagName" column="nutrition_diag_name"/>
- <result property="gestationalWeek" column="gestational_week"/>
- <result property="birthWeight" column="birth_weight"/>
+ <result property="ndPhysicalMeasurements" column="nd_physical_measurements"/>
+ <result property="ndDietaryAssessment" column="nd_dietary_assessment"/>
+ <result property="ndInterventionProgram" column="nd_intervention_program"/>
+ <result property="appointmentSituation" column="appointment_situation"/>
+ <result property="ldLearningAbilityAssessment" column="ld_learning_ability_assessment"/>
+ <result property="ldBehavioralAssessment" column="ld_behavioral_assessment"/>
+ <result property="ldInterventionTrainingRecord" column="ld_intervention_training_record"/>
<result property="highRiskChildType" column="high_risk_child_type"/>
<result property="highRiskChildName" column="high_risk_child_name"/>
+ <result property="plannedFollowTime" column="planned_follow_time"/>
+ <result property="hrcGrowthDevelopmentMonitoring" column="hrc_growth_development_monitoring"/>
+ <result property="hrcNeurologicalEvaluation" column="hrc_neurological_evaluation"/>
+ <result property="hrcInterventionRecords" column="hrc_intervention_records"/>
+ <result property="closeStatus" column="close_status"/>
+ <result property="gestationalWeek" column="gestational_week"/>
+ <result property="birthWeight" column="birth_weight"/>
<result property="registerUser" column="register_user"/>
<result property="remark" column="remark"/>
<result property="orgid" column="orgid"/>
@@ -52,23 +64,26 @@
<result property="delFlag" column="del_flag"/>
</resultMap>
- <sql id="selectPatMaternityChildArchiveVo">
+ <sql id="selectPatChildArchiveDetailVo">
select id,
- type,
+ archiveid,
archive_type,
+ source_type,
outhospno,
inhospno,
serialnum,
patid,
patname,
parentname,
+ parent_relation,
+ parent_phone,
+ parent_idcardno,
+ parent_address,
birthdate,
idcardno,
phone,
diag_time,
archive_time,
- planned_follow_time,
- followup_cycle_times,
sex,
doctor_code,
doctor_name,
@@ -80,15 +95,24 @@
wardname,
icd10code,
diagname,
- pregnancy_situation,
- appointment_situation,
- close_status,
nutrition_icd10_code,
nutrition_diag_name,
- gestational_week,
- birth_weight,
+ nd_physical_measurements,
+ nd_dietary_assessment,
+ nd_intervention_program,
+ appointment_situation,
+ ld_learning_ability_assessment,
+ ld_behavioral_assessment,
+ ld_intervention_training_record,
high_risk_child_type,
high_risk_child_name,
+ planned_follow_time,
+ hrc_growth_development_monitoring,
+ hrc_neurological_evaluation,
+ hrc_intervention_records,
+ close_status,
+ gestational_week,
+ birth_weight,
register_user,
remark,
orgid,
@@ -98,28 +122,26 @@
create_by,
create_time,
del_flag
- from pat_maternity_child_archive
+ from pat_child_archive_detail
</sql>
- <select id="selectPatMaternityChildArchiveList" parameterType="com.smartor.domain.PatMaternityChildArchive"
- resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatChildArchiveDetailList" parameterType="com.smartor.domain.PatChildArchiveDetail"
+ resultMap="PatChildArchiveDetailResult">
+ <include refid="selectPatChildArchiveDetailVo"/>
where 1=1
and del_flag = '0'
- <if test="type != null and type != ''">and type = #{type}</if>
+ <if test="archiveid != null">and archiveid = #{archiveid}</if>
<if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
+ <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
<if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
<if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
<if test="patid != null">and patid = #{patid}</if>
<if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
<if test="parentname != null and parentname != ''">and parentname like concat('%', #{parentname}, '%')</if>
- <if test="birthdate != null">and birthdate = #{birthdate}</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="diagTime != null">and diag_time = #{diagTime}</if>
- <if test="plannedFollowTime != null">and planned_follow_time = #{plannedFollowTime}</if>
- <if test="followupCycleTimes != null and followupCycleTimes != ''">and followup_cycle_times = #{followupCycleTimes}</if>
<if test="sex != null">and sex = #{sex}</if>
<if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
<if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
@@ -131,15 +153,13 @@
<if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
<if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
- <if test="pregnancySituation != null and pregnancySituation != ''">and pregnancy_situation = #{pregnancySituation}</if>
- <if test="appointmentSituation != null and appointmentSituation != ''">and appointment_situation = #{appointmentSituation}</if>
- <if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
<if test="nutritionIcd10Code != null and nutritionIcd10Code != ''">and nutrition_icd10_code = #{nutritionIcd10Code}</if>
<if test="nutritionDiagName != null and nutritionDiagName != ''">and nutrition_diag_name like concat('%', #{nutritionDiagName}, '%')</if>
- <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
- <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
<if test="highRiskChildType != null and highRiskChildType != ''">and high_risk_child_type = #{highRiskChildType}</if>
<if test="highRiskChildName != null and highRiskChildName != ''">and high_risk_child_name like concat('%', #{highRiskChildName}, '%')</if>
+ <if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
+ <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
+ <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
<if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
@@ -151,30 +171,33 @@
</if>
</select>
- <select id="selectPatMaternityChildArchiveById" parameterType="Long" resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatChildArchiveDetailById" parameterType="Long" resultMap="PatChildArchiveDetailResult">
+ <include refid="selectPatChildArchiveDetailVo"/>
where id = #{id}
</select>
- <insert id="insertPatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive"
+ <insert id="insertPatChildArchiveDetail" parameterType="com.smartor.domain.PatChildArchiveDetail"
useGeneratedKeys="true" keyProperty="id">
- insert into pat_maternity_child_archive
+ insert into pat_child_archive_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="type != null">type,</if>
+ <if test="archiveid != null">archiveid,</if>
<if test="archiveType != null">archive_type,</if>
+ <if test="sourceType != null">source_type,</if>
<if test="outhospno != null">outhospno,</if>
<if test="inhospno != null">inhospno,</if>
<if test="serialnum != null">serialnum,</if>
<if test="patid != null">patid,</if>
<if test="patname != null">patname,</if>
<if test="parentname != null">parentname,</if>
+ <if test="parentRelation != null">parent_relation,</if>
+ <if test="parentPhone != null">parent_phone,</if>
+ <if test="parentIdcardno != null">parent_idcardno,</if>
+ <if test="parentAddress != null">parent_address,</if>
<if test="birthdate != null">birthdate,</if>
<if test="idcardno != null">idcardno,</if>
<if test="phone != null">phone,</if>
<if test="diagTime != null">diag_time,</if>
<if test="archiveTime != null">archive_time,</if>
- <if test="plannedFollowTime != null">planned_follow_time,</if>
- <if test="followupCycleTimes != null">followup_cycle_times,</if>
<if test="sex != null">sex,</if>
<if test="doctorCode != null">doctor_code,</if>
<if test="doctorName != null">doctor_name,</if>
@@ -186,15 +209,24 @@
<if test="wardname != null">wardname,</if>
<if test="icd10code != null">icd10code,</if>
<if test="diagname != null">diagname,</if>
- <if test="pregnancySituation != null">pregnancy_situation,</if>
- <if test="appointmentSituation != null">appointment_situation,</if>
- <if test="closeStatus != null">close_status,</if>
<if test="nutritionIcd10Code != null">nutrition_icd10_code,</if>
<if test="nutritionDiagName != null">nutrition_diag_name,</if>
- <if test="gestationalWeek != null">gestational_week,</if>
- <if test="birthWeight != null">birth_weight,</if>
+ <if test="ndPhysicalMeasurements != null">nd_physical_measurements,</if>
+ <if test="ndDietaryAssessment != null">nd_dietary_assessment,</if>
+ <if test="ndInterventionProgram != null">nd_intervention_program,</if>
+ <if test="appointmentSituation != null">appointment_situation,</if>
+ <if test="ldLearningAbilityAssessment != null">ld_learning_ability_assessment,</if>
+ <if test="ldBehavioralAssessment != null">ld_behavioral_assessment,</if>
+ <if test="ldInterventionTrainingRecord != null">ld_intervention_training_record,</if>
<if test="highRiskChildType != null">high_risk_child_type,</if>
<if test="highRiskChildName != null">high_risk_child_name,</if>
+ <if test="plannedFollowTime != null">planned_follow_time,</if>
+ <if test="hrcGrowthDevelopmentMonitoring != null">hrc_growth_development_monitoring,</if>
+ <if test="hrcNeurologicalEvaluation != null">hrc_neurological_evaluation,</if>
+ <if test="hrcInterventionRecords != null">hrc_intervention_records,</if>
+ <if test="closeStatus != null">close_status,</if>
+ <if test="gestationalWeek != null">gestational_week,</if>
+ <if test="birthWeight != null">birth_weight,</if>
<if test="registerUser != null">register_user,</if>
<if test="remark != null">remark,</if>
<if test="orgid != null">orgid,</if>
@@ -206,21 +238,24 @@
<if test="delFlag != null and delFlag != ''">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="type != null">#{type},</if>
+ <if test="archiveid != null">#{archiveid},</if>
<if test="archiveType != null">#{archiveType},</if>
+ <if test="sourceType != null">#{sourceType},</if>
<if test="outhospno != null">#{outhospno},</if>
<if test="inhospno != null">#{inhospno},</if>
<if test="serialnum != null">#{serialnum},</if>
<if test="patid != null">#{patid},</if>
<if test="patname != null">#{patname},</if>
<if test="parentname != null">#{parentname},</if>
+ <if test="parentRelation != null">#{parentRelation},</if>
+ <if test="parentPhone != null">#{parentPhone},</if>
+ <if test="parentIdcardno != null">#{parentIdcardno},</if>
+ <if test="parentAddress != null">#{parentAddress},</if>
<if test="birthdate != null">#{birthdate},</if>
<if test="idcardno != null">#{idcardno},</if>
<if test="phone != null">#{phone},</if>
<if test="diagTime != null">#{diagTime},</if>
<if test="archiveTime != null">#{archiveTime},</if>
- <if test="plannedFollowTime != null">#{plannedFollowTime},</if>
- <if test="followupCycleTimes != null">#{followupCycleTimes},</if>
<if test="sex != null">#{sex},</if>
<if test="doctorCode != null">#{doctorCode},</if>
<if test="doctorName != null">#{doctorName},</if>
@@ -232,15 +267,24 @@
<if test="wardname != null">#{wardname},</if>
<if test="icd10code != null">#{icd10code},</if>
<if test="diagname != null">#{diagname},</if>
- <if test="pregnancySituation != null">#{pregnancySituation},</if>
- <if test="appointmentSituation != null">#{appointmentSituation},</if>
- <if test="closeStatus != null">#{closeStatus},</if>
<if test="nutritionIcd10Code != null">#{nutritionIcd10Code},</if>
<if test="nutritionDiagName != null">#{nutritionDiagName},</if>
- <if test="gestationalWeek != null">#{gestationalWeek},</if>
- <if test="birthWeight != null">#{birthWeight},</if>
+ <if test="ndPhysicalMeasurements != null">#{ndPhysicalMeasurements},</if>
+ <if test="ndDietaryAssessment != null">#{ndDietaryAssessment},</if>
+ <if test="ndInterventionProgram != null">#{ndInterventionProgram},</if>
+ <if test="appointmentSituation != null">#{appointmentSituation},</if>
+ <if test="ldLearningAbilityAssessment != null">#{ldLearningAbilityAssessment},</if>
+ <if test="ldBehavioralAssessment != null">#{ldBehavioralAssessment},</if>
+ <if test="ldInterventionTrainingRecord != null">#{ldInterventionTrainingRecord},</if>
<if test="highRiskChildType != null">#{highRiskChildType},</if>
<if test="highRiskChildName != null">#{highRiskChildName},</if>
+ <if test="plannedFollowTime != null">#{plannedFollowTime},</if>
+ <if test="hrcGrowthDevelopmentMonitoring != null">#{hrcGrowthDevelopmentMonitoring},</if>
+ <if test="hrcNeurologicalEvaluation != null">#{hrcNeurologicalEvaluation},</if>
+ <if test="hrcInterventionRecords != null">#{hrcInterventionRecords},</if>
+ <if test="closeStatus != null">#{closeStatus},</if>
+ <if test="gestationalWeek != null">#{gestationalWeek},</if>
+ <if test="birthWeight != null">#{birthWeight},</if>
<if test="registerUser != null">#{registerUser},</if>
<if test="remark != null">#{remark},</if>
<if test="orgid != null">#{orgid},</if>
@@ -253,24 +297,27 @@
</trim>
</insert>
- <update id="updatePatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive">
- update pat_maternity_child_archive
+ <update id="updatePatChildArchiveDetail" parameterType="com.smartor.domain.PatChildArchiveDetail">
+ update pat_child_archive_detail
<trim prefix="SET" suffixOverrides=",">
- <if test="type != null">type = #{type},</if>
+ <if test="archiveid != null">archiveid = #{archiveid},</if>
<if test="archiveType != null">archive_type = #{archiveType},</if>
+ <if test="sourceType != null">source_type = #{sourceType},</if>
<if test="outhospno != null">outhospno = #{outhospno},</if>
<if test="inhospno != null">inhospno = #{inhospno},</if>
<if test="serialnum != null">serialnum = #{serialnum},</if>
<if test="patid != null">patid = #{patid},</if>
<if test="patname != null">patname = #{patname},</if>
<if test="parentname != null">parentname = #{parentname},</if>
+ <if test="parentRelation != null">parent_relation = #{parentRelation},</if>
+ <if test="parentPhone != null">parent_phone = #{parentPhone},</if>
+ <if test="parentIdcardno != null">parent_idcardno = #{parentIdcardno},</if>
+ <if test="parentAddress != null">parent_address = #{parentAddress},</if>
<if test="birthdate != null">birthdate = #{birthdate},</if>
<if test="idcardno != null">idcardno = #{idcardno},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="diagTime != null">diag_time = #{diagTime},</if>
<if test="archiveTime != null">archive_time = #{archiveTime},</if>
- <if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
- <if test="followupCycleTimes != null">followup_cycle_times = #{followupCycleTimes},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="doctorCode != null">doctor_code = #{doctorCode},</if>
<if test="doctorName != null">doctor_name = #{doctorName},</if>
@@ -282,15 +329,24 @@
<if test="wardname != null">wardname = #{wardname},</if>
<if test="icd10code != null">icd10code = #{icd10code},</if>
<if test="diagname != null">diagname = #{diagname},</if>
- <if test="pregnancySituation != null">pregnancy_situation = #{pregnancySituation},</if>
- <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
- <if test="closeStatus != null">close_status = #{closeStatus},</if>
<if test="nutritionIcd10Code != null">nutrition_icd10_code = #{nutritionIcd10Code},</if>
<if test="nutritionDiagName != null">nutrition_diag_name = #{nutritionDiagName},</if>
- <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
- <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
+ <if test="ndPhysicalMeasurements != null">nd_physical_measurements = #{ndPhysicalMeasurements},</if>
+ <if test="ndDietaryAssessment != null">nd_dietary_assessment = #{ndDietaryAssessment},</if>
+ <if test="ndInterventionProgram != null">nd_intervention_program = #{ndInterventionProgram},</if>
+ <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
+ <if test="ldLearningAbilityAssessment != null">ld_learning_ability_assessment = #{ldLearningAbilityAssessment},</if>
+ <if test="ldBehavioralAssessment != null">ld_behavioral_assessment = #{ldBehavioralAssessment},</if>
+ <if test="ldInterventionTrainingRecord != null">ld_intervention_training_record = #{ldInterventionTrainingRecord},</if>
<if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
<if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
+ <if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
+ <if test="hrcGrowthDevelopmentMonitoring != null">hrc_growth_development_monitoring = #{hrcGrowthDevelopmentMonitoring},</if>
+ <if test="hrcNeurologicalEvaluation != null">hrc_neurological_evaluation = #{hrcNeurologicalEvaluation},</if>
+ <if test="hrcInterventionRecords != null">hrc_intervention_records = #{hrcInterventionRecords},</if>
+ <if test="closeStatus != null">close_status = #{closeStatus},</if>
+ <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
+ <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
<if test="registerUser != null">register_user = #{registerUser},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="orgid != null">orgid = #{orgid},</if>
@@ -304,16 +360,16 @@
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveById" parameterType="Long">
- update pat_maternity_child_archive
+ <update id="deletePatChildArchiveDetailById" parameterType="Long">
+ update pat_child_archive_detail
<trim prefix="SET" suffixOverrides=",">
del_flag = '1'
</trim>
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveByIds" parameterType="String">
- update pat_maternity_child_archive set del_flag = '1' where id in
+ <update id="deletePatChildArchiveDetailByIds" parameterType="String">
+ update pat_child_archive_detail set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml
similarity index 72%
copy from smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
copy to smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml
index 8d915e9..4092c18 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatChildArchiveMapper.xml
@@ -2,11 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smartor.mapper.PatMaternityChildArchiveMapper">
+<mapper namespace="com.smartor.mapper.PatChildArchiveMapper">
- <resultMap type="com.smartor.domain.PatMaternityChildArchive" id="PatMaternityChildArchiveResult">
+ <resultMap type="com.smartor.domain.PatChildArchive" id="PatChildArchiveResult">
<result property="id" column="id"/>
- <result property="type" column="type"/>
<result property="archiveType" column="archive_type"/>
<result property="outhospno" column="outhospno"/>
<result property="inhospno" column="inhospno"/>
@@ -32,15 +31,7 @@
<result property="wardname" column="wardname"/>
<result property="icd10code" column="icd10code"/>
<result property="diagname" column="diagname"/>
- <result property="pregnancySituation" column="pregnancy_situation"/>
- <result property="appointmentSituation" column="appointment_situation"/>
<result property="closeStatus" column="close_status"/>
- <result property="nutritionIcd10Code" column="nutrition_icd10_code"/>
- <result property="nutritionDiagName" column="nutrition_diag_name"/>
- <result property="gestationalWeek" column="gestational_week"/>
- <result property="birthWeight" column="birth_weight"/>
- <result property="highRiskChildType" column="high_risk_child_type"/>
- <result property="highRiskChildName" column="high_risk_child_name"/>
<result property="registerUser" column="register_user"/>
<result property="remark" column="remark"/>
<result property="orgid" column="orgid"/>
@@ -52,9 +43,8 @@
<result property="delFlag" column="del_flag"/>
</resultMap>
- <sql id="selectPatMaternityChildArchiveVo">
+ <sql id="selectPatChildArchiveVo">
select id,
- type,
archive_type,
outhospno,
inhospno,
@@ -80,15 +70,7 @@
wardname,
icd10code,
diagname,
- pregnancy_situation,
- appointment_situation,
close_status,
- nutrition_icd10_code,
- nutrition_diag_name,
- gestational_week,
- birth_weight,
- high_risk_child_type,
- high_risk_child_name,
register_user,
remark,
orgid,
@@ -98,15 +80,14 @@
create_by,
create_time,
del_flag
- from pat_maternity_child_archive
+ from pat_child_archive
</sql>
- <select id="selectPatMaternityChildArchiveList" parameterType="com.smartor.domain.PatMaternityChildArchive"
- resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatChildArchiveList" parameterType="com.smartor.domain.PatChildArchive"
+ resultMap="PatChildArchiveResult">
+ <include refid="selectPatChildArchiveVo"/>
where 1=1
and del_flag = '0'
- <if test="type != null and type != ''">and type = #{type}</if>
<if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
<if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
<if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
@@ -131,15 +112,7 @@
<if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
<if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
- <if test="pregnancySituation != null and pregnancySituation != ''">and pregnancy_situation = #{pregnancySituation}</if>
- <if test="appointmentSituation != null and appointmentSituation != ''">and appointment_situation = #{appointmentSituation}</if>
<if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
- <if test="nutritionIcd10Code != null and nutritionIcd10Code != ''">and nutrition_icd10_code = #{nutritionIcd10Code}</if>
- <if test="nutritionDiagName != null and nutritionDiagName != ''">and nutrition_diag_name like concat('%', #{nutritionDiagName}, '%')</if>
- <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
- <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
- <if test="highRiskChildType != null and highRiskChildType != ''">and high_risk_child_type = #{highRiskChildType}</if>
- <if test="highRiskChildName != null and highRiskChildName != ''">and high_risk_child_name like concat('%', #{highRiskChildName}, '%')</if>
<if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
@@ -151,16 +124,15 @@
</if>
</select>
- <select id="selectPatMaternityChildArchiveById" parameterType="Long" resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatChildArchiveById" parameterType="Long" resultMap="PatChildArchiveResult">
+ <include refid="selectPatChildArchiveVo"/>
where id = #{id}
</select>
- <insert id="insertPatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive"
+ <insert id="insertPatChildArchive" parameterType="com.smartor.domain.PatChildArchive"
useGeneratedKeys="true" keyProperty="id">
- insert into pat_maternity_child_archive
+ insert into pat_child_archive
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="type != null">type,</if>
<if test="archiveType != null">archive_type,</if>
<if test="outhospno != null">outhospno,</if>
<if test="inhospno != null">inhospno,</if>
@@ -186,15 +158,7 @@
<if test="wardname != null">wardname,</if>
<if test="icd10code != null">icd10code,</if>
<if test="diagname != null">diagname,</if>
- <if test="pregnancySituation != null">pregnancy_situation,</if>
- <if test="appointmentSituation != null">appointment_situation,</if>
<if test="closeStatus != null">close_status,</if>
- <if test="nutritionIcd10Code != null">nutrition_icd10_code,</if>
- <if test="nutritionDiagName != null">nutrition_diag_name,</if>
- <if test="gestationalWeek != null">gestational_week,</if>
- <if test="birthWeight != null">birth_weight,</if>
- <if test="highRiskChildType != null">high_risk_child_type,</if>
- <if test="highRiskChildName != null">high_risk_child_name,</if>
<if test="registerUser != null">register_user,</if>
<if test="remark != null">remark,</if>
<if test="orgid != null">orgid,</if>
@@ -206,7 +170,6 @@
<if test="delFlag != null and delFlag != ''">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="type != null">#{type},</if>
<if test="archiveType != null">#{archiveType},</if>
<if test="outhospno != null">#{outhospno},</if>
<if test="inhospno != null">#{inhospno},</if>
@@ -232,15 +195,7 @@
<if test="wardname != null">#{wardname},</if>
<if test="icd10code != null">#{icd10code},</if>
<if test="diagname != null">#{diagname},</if>
- <if test="pregnancySituation != null">#{pregnancySituation},</if>
- <if test="appointmentSituation != null">#{appointmentSituation},</if>
<if test="closeStatus != null">#{closeStatus},</if>
- <if test="nutritionIcd10Code != null">#{nutritionIcd10Code},</if>
- <if test="nutritionDiagName != null">#{nutritionDiagName},</if>
- <if test="gestationalWeek != null">#{gestationalWeek},</if>
- <if test="birthWeight != null">#{birthWeight},</if>
- <if test="highRiskChildType != null">#{highRiskChildType},</if>
- <if test="highRiskChildName != null">#{highRiskChildName},</if>
<if test="registerUser != null">#{registerUser},</if>
<if test="remark != null">#{remark},</if>
<if test="orgid != null">#{orgid},</if>
@@ -253,10 +208,9 @@
</trim>
</insert>
- <update id="updatePatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive">
- update pat_maternity_child_archive
+ <update id="updatePatChildArchive" parameterType="com.smartor.domain.PatChildArchive">
+ update pat_child_archive
<trim prefix="SET" suffixOverrides=",">
- <if test="type != null">type = #{type},</if>
<if test="archiveType != null">archive_type = #{archiveType},</if>
<if test="outhospno != null">outhospno = #{outhospno},</if>
<if test="inhospno != null">inhospno = #{inhospno},</if>
@@ -282,15 +236,7 @@
<if test="wardname != null">wardname = #{wardname},</if>
<if test="icd10code != null">icd10code = #{icd10code},</if>
<if test="diagname != null">diagname = #{diagname},</if>
- <if test="pregnancySituation != null">pregnancy_situation = #{pregnancySituation},</if>
- <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
<if test="closeStatus != null">close_status = #{closeStatus},</if>
- <if test="nutritionIcd10Code != null">nutrition_icd10_code = #{nutritionIcd10Code},</if>
- <if test="nutritionDiagName != null">nutrition_diag_name = #{nutritionDiagName},</if>
- <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
- <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
- <if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
- <if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
<if test="registerUser != null">register_user = #{registerUser},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="orgid != null">orgid = #{orgid},</if>
@@ -304,16 +250,16 @@
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveById" parameterType="Long">
- update pat_maternity_child_archive
+ <update id="deletePatChildArchiveById" parameterType="Long">
+ update pat_child_archive
<trim prefix="SET" suffixOverrides=",">
del_flag = '1'
</trim>
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveByIds" parameterType="String">
- update pat_maternity_child_archive set del_flag = '1' where id in
+ <update id="deletePatChildArchiveByIds" parameterType="String">
+ update pat_child_archive set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml
similarity index 64%
copy from smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
copy to smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml
index 8d915e9..731cdac 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveDetailMapper.xml
@@ -2,25 +2,24 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smartor.mapper.PatMaternityChildArchiveMapper">
+<mapper namespace="com.smartor.mapper.PatMaternityArchiveDetailMapper">
- <resultMap type="com.smartor.domain.PatMaternityChildArchive" id="PatMaternityChildArchiveResult">
+ <resultMap type="com.smartor.domain.PatMaternityArchiveDetail" id="PatMaternityArchiveDetailResult">
<result property="id" column="id"/>
- <result property="type" column="type"/>
+ <result property="archiveid" column="archiveid"/>
<result property="archiveType" column="archive_type"/>
+ <result property="sourceType" column="source_type"/>
<result property="outhospno" column="outhospno"/>
<result property="inhospno" column="inhospno"/>
<result property="serialnum" column="serialnum"/>
<result property="patid" column="patid"/>
<result property="patname" column="patname"/>
- <result property="parentname" column="parentname"/>
<result property="birthdate" column="birthdate"/>
<result property="idcardno" column="idcardno"/>
<result property="phone" column="phone"/>
<result property="diagTime" column="diag_time"/>
<result property="archiveTime" column="archive_time"/>
<result property="plannedFollowTime" column="planned_follow_time"/>
- <result property="followupCycleTimes" column="followup_cycle_times"/>
<result property="sex" column="sex"/>
<result property="doctorCode" column="doctor_code"/>
<result property="doctorName" column="doctor_name"/>
@@ -33,15 +32,20 @@
<result property="icd10code" column="icd10code"/>
<result property="diagname" column="diagname"/>
<result property="pregnancySituation" column="pregnancy_situation"/>
- <result property="appointmentSituation" column="appointment_situation"/>
+ <result property="specificSituation" column="specific_situation"/>
+ <result property="handleSuggestion" column="handle_suggestion"/>
<result property="closeStatus" column="close_status"/>
- <result property="nutritionIcd10Code" column="nutrition_icd10_code"/>
- <result property="nutritionDiagName" column="nutrition_diag_name"/>
- <result property="gestationalWeek" column="gestational_week"/>
- <result property="birthWeight" column="birth_weight"/>
- <result property="highRiskChildType" column="high_risk_child_type"/>
- <result property="highRiskChildName" column="high_risk_child_name"/>
+ <result property="isRecordEstablished" column="is_record_established"/>
+ <result property="dueDate" column="due_date"/>
<result property="registerUser" column="register_user"/>
+ <result property="followupPeriod" column="followup_period"/>
+ <result property="epEarlyPregnancyFollowupForm" column="ep_early_pregnancy_followup_form"/>
+ <result property="mhiMenopauseFollowupSystemIssuesForm" column="mhi_menopause_followup_system_issues_form"/>
+ <result property="mhiMhtInitialVisitMedicalRecordForm" column="mhi_mht_initial_visit_medical_record_form"/>
+ <result property="mhiMhtFollowUpMedicalRecordForm" column="mhi_mht_follow_up_medical_record_form"/>
+ <result property="mhiModifiedKuppermanScoringScaleForm" column="mhi_modified_kupperman_scoring_scale_form"/>
+ <result property="mhiMenopauseRatingScaleForm" column="mhi_menopause_rating_scale_form"/>
+ <result property="mhiPittsburghSleepQualityIndexForm" column="mhi_pittsburgh_sleep_quality_index_form"/>
<result property="remark" column="remark"/>
<result property="orgid" column="orgid"/>
<result property="campusid" column="campusid"/>
@@ -52,23 +56,22 @@
<result property="delFlag" column="del_flag"/>
</resultMap>
- <sql id="selectPatMaternityChildArchiveVo">
+ <sql id="selectPatMaternityArchiveDetailVo">
select id,
- type,
+ archiveid,
archive_type,
+ source_type,
outhospno,
inhospno,
serialnum,
patid,
patname,
- parentname,
birthdate,
idcardno,
phone,
diag_time,
archive_time,
planned_follow_time,
- followup_cycle_times,
sex,
doctor_code,
doctor_name,
@@ -81,15 +84,20 @@
icd10code,
diagname,
pregnancy_situation,
- appointment_situation,
+ specific_situation,
+ handle_suggestion,
close_status,
- nutrition_icd10_code,
- nutrition_diag_name,
- gestational_week,
- birth_weight,
- high_risk_child_type,
- high_risk_child_name,
+ is_record_established,
+ due_date,
register_user,
+ followup_period,
+ ep_early_pregnancy_followup_form,
+ mhi_menopause_followup_system_issues_form,
+ mhi_mht_initial_visit_medical_record_form,
+ mhi_mht_follow_up_medical_record_form,
+ mhi_modified_kupperman_scoring_scale_form,
+ mhi_menopause_rating_scale_form,
+ mhi_pittsburgh_sleep_quality_index_form,
remark,
orgid,
campusid,
@@ -98,28 +106,25 @@
create_by,
create_time,
del_flag
- from pat_maternity_child_archive
+ from pat_maternity_archive_detail
</sql>
- <select id="selectPatMaternityChildArchiveList" parameterType="com.smartor.domain.PatMaternityChildArchive"
- resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatMaternityArchiveDetailList" parameterType="com.smartor.domain.PatMaternityArchiveDetail"
+ resultMap="PatMaternityArchiveDetailResult">
+ <include refid="selectPatMaternityArchiveDetailVo"/>
where 1=1
and del_flag = '0'
- <if test="type != null and type != ''">and type = #{type}</if>
+ <if test="archiveid != null">and archiveid = #{archiveid}</if>
<if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
+ <if test="sourceType != null and sourceType != ''">and source_type = #{sourceType}</if>
<if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
<if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
<if test="serialnum != null and serialnum != ''">and serialnum = #{serialnum}</if>
<if test="patid != null">and patid = #{patid}</if>
<if test="patname != null and patname != ''">and patname like concat('%', #{patname}, '%')</if>
- <if test="parentname != null and parentname != ''">and parentname like concat('%', #{parentname}, '%')</if>
- <if test="birthdate != null">and birthdate = #{birthdate}</if>
<if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if>
<if test="phone != null and phone != ''">and phone = #{phone}</if>
<if test="diagTime != null">and diag_time = #{diagTime}</if>
- <if test="plannedFollowTime != null">and planned_follow_time = #{plannedFollowTime}</if>
- <if test="followupCycleTimes != null and followupCycleTimes != ''">and followup_cycle_times = #{followupCycleTimes}</if>
<if test="sex != null">and sex = #{sex}</if>
<if test="doctorCode != null and doctorCode != ''">and doctor_code = #{doctorCode}</if>
<if test="doctorName != null and doctorName != ''">and doctor_name like concat('%', #{doctorName}, '%')</if>
@@ -131,15 +136,8 @@
<if test="wardname != null and wardname != ''">and wardname like concat('%', #{wardname}, '%')</if>
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
<if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
- <if test="pregnancySituation != null and pregnancySituation != ''">and pregnancy_situation = #{pregnancySituation}</if>
- <if test="appointmentSituation != null and appointmentSituation != ''">and appointment_situation = #{appointmentSituation}</if>
<if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
- <if test="nutritionIcd10Code != null and nutritionIcd10Code != ''">and nutrition_icd10_code = #{nutritionIcd10Code}</if>
- <if test="nutritionDiagName != null and nutritionDiagName != ''">and nutrition_diag_name like concat('%', #{nutritionDiagName}, '%')</if>
- <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
- <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
- <if test="highRiskChildType != null and highRiskChildType != ''">and high_risk_child_type = #{highRiskChildType}</if>
- <if test="highRiskChildName != null and highRiskChildName != ''">and high_risk_child_name like concat('%', #{highRiskChildName}, '%')</if>
+ <if test="isRecordEstablished != null and isRecordEstablished != ''">and is_record_established = #{isRecordEstablished}</if>
<if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
@@ -151,30 +149,29 @@
</if>
</select>
- <select id="selectPatMaternityChildArchiveById" parameterType="Long" resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatMaternityArchiveDetailById" parameterType="Long" resultMap="PatMaternityArchiveDetailResult">
+ <include refid="selectPatMaternityArchiveDetailVo"/>
where id = #{id}
</select>
- <insert id="insertPatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive"
+ <insert id="insertPatMaternityArchiveDetail" parameterType="com.smartor.domain.PatMaternityArchiveDetail"
useGeneratedKeys="true" keyProperty="id">
- insert into pat_maternity_child_archive
+ insert into pat_maternity_archive_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="type != null">type,</if>
+ <if test="archiveid != null">archiveid,</if>
<if test="archiveType != null">archive_type,</if>
+ <if test="sourceType != null">source_type,</if>
<if test="outhospno != null">outhospno,</if>
<if test="inhospno != null">inhospno,</if>
<if test="serialnum != null">serialnum,</if>
<if test="patid != null">patid,</if>
<if test="patname != null">patname,</if>
- <if test="parentname != null">parentname,</if>
<if test="birthdate != null">birthdate,</if>
<if test="idcardno != null">idcardno,</if>
<if test="phone != null">phone,</if>
<if test="diagTime != null">diag_time,</if>
<if test="archiveTime != null">archive_time,</if>
<if test="plannedFollowTime != null">planned_follow_time,</if>
- <if test="followupCycleTimes != null">followup_cycle_times,</if>
<if test="sex != null">sex,</if>
<if test="doctorCode != null">doctor_code,</if>
<if test="doctorName != null">doctor_name,</if>
@@ -187,15 +184,20 @@
<if test="icd10code != null">icd10code,</if>
<if test="diagname != null">diagname,</if>
<if test="pregnancySituation != null">pregnancy_situation,</if>
- <if test="appointmentSituation != null">appointment_situation,</if>
+ <if test="specificSituation != null">specific_situation,</if>
+ <if test="handleSuggestion != null">handle_suggestion,</if>
<if test="closeStatus != null">close_status,</if>
- <if test="nutritionIcd10Code != null">nutrition_icd10_code,</if>
- <if test="nutritionDiagName != null">nutrition_diag_name,</if>
- <if test="gestationalWeek != null">gestational_week,</if>
- <if test="birthWeight != null">birth_weight,</if>
- <if test="highRiskChildType != null">high_risk_child_type,</if>
- <if test="highRiskChildName != null">high_risk_child_name,</if>
+ <if test="isRecordEstablished != null">is_record_established,</if>
+ <if test="dueDate != null">due_date,</if>
<if test="registerUser != null">register_user,</if>
+ <if test="followupPeriod != null">followup_period,</if>
+ <if test="epEarlyPregnancyFollowupForm != null">ep_early_pregnancy_followup_form,</if>
+ <if test="mhiMenopauseFollowupSystemIssuesForm != null">mhi_menopause_followup_system_issues_form,</if>
+ <if test="mhiMhtInitialVisitMedicalRecordForm != null">mhi_mht_initial_visit_medical_record_form,</if>
+ <if test="mhiMhtFollowUpMedicalRecordForm != null">mhi_mht_follow_up_medical_record_form,</if>
+ <if test="mhiModifiedKuppermanScoringScaleForm != null">mhi_modified_kupperman_scoring_scale_form,</if>
+ <if test="mhiMenopauseRatingScaleForm != null">mhi_menopause_rating_scale_form,</if>
+ <if test="mhiPittsburghSleepQualityIndexForm != null">mhi_pittsburgh_sleep_quality_index_form,</if>
<if test="remark != null">remark,</if>
<if test="orgid != null">orgid,</if>
<if test="campusid != null">campusid,</if>
@@ -206,21 +208,20 @@
<if test="delFlag != null and delFlag != ''">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="type != null">#{type},</if>
+ <if test="archiveid != null">#{archiveid},</if>
<if test="archiveType != null">#{archiveType},</if>
+ <if test="sourceType != null">#{sourceType},</if>
<if test="outhospno != null">#{outhospno},</if>
<if test="inhospno != null">#{inhospno},</if>
<if test="serialnum != null">#{serialnum},</if>
<if test="patid != null">#{patid},</if>
<if test="patname != null">#{patname},</if>
- <if test="parentname != null">#{parentname},</if>
<if test="birthdate != null">#{birthdate},</if>
<if test="idcardno != null">#{idcardno},</if>
<if test="phone != null">#{phone},</if>
<if test="diagTime != null">#{diagTime},</if>
<if test="archiveTime != null">#{archiveTime},</if>
<if test="plannedFollowTime != null">#{plannedFollowTime},</if>
- <if test="followupCycleTimes != null">#{followupCycleTimes},</if>
<if test="sex != null">#{sex},</if>
<if test="doctorCode != null">#{doctorCode},</if>
<if test="doctorName != null">#{doctorName},</if>
@@ -233,15 +234,20 @@
<if test="icd10code != null">#{icd10code},</if>
<if test="diagname != null">#{diagname},</if>
<if test="pregnancySituation != null">#{pregnancySituation},</if>
- <if test="appointmentSituation != null">#{appointmentSituation},</if>
+ <if test="specificSituation != null">#{specificSituation},</if>
+ <if test="handleSuggestion != null">#{handleSuggestion},</if>
<if test="closeStatus != null">#{closeStatus},</if>
- <if test="nutritionIcd10Code != null">#{nutritionIcd10Code},</if>
- <if test="nutritionDiagName != null">#{nutritionDiagName},</if>
- <if test="gestationalWeek != null">#{gestationalWeek},</if>
- <if test="birthWeight != null">#{birthWeight},</if>
- <if test="highRiskChildType != null">#{highRiskChildType},</if>
- <if test="highRiskChildName != null">#{highRiskChildName},</if>
+ <if test="isRecordEstablished != null">#{isRecordEstablished},</if>
+ <if test="dueDate != null">#{dueDate},</if>
<if test="registerUser != null">#{registerUser},</if>
+ <if test="followupPeriod != null">#{followupPeriod},</if>
+ <if test="epEarlyPregnancyFollowupForm != null">#{epEarlyPregnancyFollowupForm},</if>
+ <if test="mhiMenopauseFollowupSystemIssuesForm != null">#{mhiMenopauseFollowupSystemIssuesForm},</if>
+ <if test="mhiMhtInitialVisitMedicalRecordForm != null">#{mhiMhtInitialVisitMedicalRecordForm},</if>
+ <if test="mhiMhtFollowUpMedicalRecordForm != null">#{mhiMhtFollowUpMedicalRecordForm},</if>
+ <if test="mhiModifiedKuppermanScoringScaleForm != null">#{mhiModifiedKuppermanScoringScaleForm},</if>
+ <if test="mhiMenopauseRatingScaleForm != null">#{mhiMenopauseRatingScaleForm},</if>
+ <if test="mhiPittsburghSleepQualityIndexForm != null">#{mhiPittsburghSleepQualityIndexForm},</if>
<if test="remark != null">#{remark},</if>
<if test="orgid != null">#{orgid},</if>
<if test="campusid != null">#{campusid},</if>
@@ -253,24 +259,23 @@
</trim>
</insert>
- <update id="updatePatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive">
- update pat_maternity_child_archive
+ <update id="updatePatMaternityArchiveDetail" parameterType="com.smartor.domain.PatMaternityArchiveDetail">
+ update pat_maternity_archive_detail
<trim prefix="SET" suffixOverrides=",">
- <if test="type != null">type = #{type},</if>
+ <if test="archiveid != null">archiveid = #{archiveid},</if>
<if test="archiveType != null">archive_type = #{archiveType},</if>
+ <if test="sourceType != null">source_type = #{sourceType},</if>
<if test="outhospno != null">outhospno = #{outhospno},</if>
<if test="inhospno != null">inhospno = #{inhospno},</if>
<if test="serialnum != null">serialnum = #{serialnum},</if>
<if test="patid != null">patid = #{patid},</if>
<if test="patname != null">patname = #{patname},</if>
- <if test="parentname != null">parentname = #{parentname},</if>
<if test="birthdate != null">birthdate = #{birthdate},</if>
<if test="idcardno != null">idcardno = #{idcardno},</if>
<if test="phone != null">phone = #{phone},</if>
<if test="diagTime != null">diag_time = #{diagTime},</if>
<if test="archiveTime != null">archive_time = #{archiveTime},</if>
<if test="plannedFollowTime != null">planned_follow_time = #{plannedFollowTime},</if>
- <if test="followupCycleTimes != null">followup_cycle_times = #{followupCycleTimes},</if>
<if test="sex != null">sex = #{sex},</if>
<if test="doctorCode != null">doctor_code = #{doctorCode},</if>
<if test="doctorName != null">doctor_name = #{doctorName},</if>
@@ -283,15 +288,20 @@
<if test="icd10code != null">icd10code = #{icd10code},</if>
<if test="diagname != null">diagname = #{diagname},</if>
<if test="pregnancySituation != null">pregnancy_situation = #{pregnancySituation},</if>
- <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
+ <if test="specificSituation != null">specific_situation = #{specificSituation},</if>
+ <if test="handleSuggestion != null">handle_suggestion = #{handleSuggestion},</if>
<if test="closeStatus != null">close_status = #{closeStatus},</if>
- <if test="nutritionIcd10Code != null">nutrition_icd10_code = #{nutritionIcd10Code},</if>
- <if test="nutritionDiagName != null">nutrition_diag_name = #{nutritionDiagName},</if>
- <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
- <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
- <if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
- <if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
+ <if test="isRecordEstablished != null">is_record_established = #{isRecordEstablished},</if>
+ <if test="dueDate != null">due_date = #{dueDate},</if>
<if test="registerUser != null">register_user = #{registerUser},</if>
+ <if test="followupPeriod != null">followup_period = #{followupPeriod},</if>
+ <if test="epEarlyPregnancyFollowupForm != null">ep_early_pregnancy_followup_form = #{epEarlyPregnancyFollowupForm},</if>
+ <if test="mhiMenopauseFollowupSystemIssuesForm != null">mhi_menopause_followup_system_issues_form = #{mhiMenopauseFollowupSystemIssuesForm},</if>
+ <if test="mhiMhtInitialVisitMedicalRecordForm != null">mhi_mht_initial_visit_medical_record_form = #{mhiMhtInitialVisitMedicalRecordForm},</if>
+ <if test="mhiMhtFollowUpMedicalRecordForm != null">mhi_mht_follow_up_medical_record_form = #{mhiMhtFollowUpMedicalRecordForm},</if>
+ <if test="mhiModifiedKuppermanScoringScaleForm != null">mhi_modified_kupperman_scoring_scale_form = #{mhiModifiedKuppermanScoringScaleForm},</if>
+ <if test="mhiMenopauseRatingScaleForm != null">mhi_menopause_rating_scale_form = #{mhiMenopauseRatingScaleForm},</if>
+ <if test="mhiPittsburghSleepQualityIndexForm != null">mhi_pittsburgh_sleep_quality_index_form = #{mhiPittsburghSleepQualityIndexForm},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="orgid != null">orgid = #{orgid},</if>
<if test="campusid != null">campusid = #{campusid},</if>
@@ -304,16 +314,16 @@
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveById" parameterType="Long">
- update pat_maternity_child_archive
+ <update id="deletePatMaternityArchiveDetailById" parameterType="Long">
+ update pat_maternity_archive_detail
<trim prefix="SET" suffixOverrides=",">
del_flag = '1'
</trim>
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveByIds" parameterType="String">
- update pat_maternity_child_archive set del_flag = '1' where id in
+ <update id="deletePatMaternityArchiveDetailByIds" parameterType="String">
+ update pat_maternity_archive_detail set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveMapper.xml
similarity index 74%
rename from smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
rename to smartor/src/main/resources/mapper/smartor/PatMaternityArchiveMapper.xml
index 8d915e9..dac32bf 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMaternityChildArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMaternityArchiveMapper.xml
@@ -2,11 +2,10 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smartor.mapper.PatMaternityChildArchiveMapper">
+<mapper namespace="com.smartor.mapper.PatMaternityArchiveMapper">
- <resultMap type="com.smartor.domain.PatMaternityChildArchive" id="PatMaternityChildArchiveResult">
+ <resultMap type="com.smartor.domain.PatMaternityArchive" id="PatMaternityArchiveResult">
<result property="id" column="id"/>
- <result property="type" column="type"/>
<result property="archiveType" column="archive_type"/>
<result property="outhospno" column="outhospno"/>
<result property="inhospno" column="inhospno"/>
@@ -33,14 +32,7 @@
<result property="icd10code" column="icd10code"/>
<result property="diagname" column="diagname"/>
<result property="pregnancySituation" column="pregnancy_situation"/>
- <result property="appointmentSituation" column="appointment_situation"/>
<result property="closeStatus" column="close_status"/>
- <result property="nutritionIcd10Code" column="nutrition_icd10_code"/>
- <result property="nutritionDiagName" column="nutrition_diag_name"/>
- <result property="gestationalWeek" column="gestational_week"/>
- <result property="birthWeight" column="birth_weight"/>
- <result property="highRiskChildType" column="high_risk_child_type"/>
- <result property="highRiskChildName" column="high_risk_child_name"/>
<result property="registerUser" column="register_user"/>
<result property="remark" column="remark"/>
<result property="orgid" column="orgid"/>
@@ -52,9 +44,8 @@
<result property="delFlag" column="del_flag"/>
</resultMap>
- <sql id="selectPatMaternityChildArchiveVo">
+ <sql id="selectPatMaternityArchiveVo">
select id,
- type,
archive_type,
outhospno,
inhospno,
@@ -81,14 +72,7 @@
icd10code,
diagname,
pregnancy_situation,
- appointment_situation,
close_status,
- nutrition_icd10_code,
- nutrition_diag_name,
- gestational_week,
- birth_weight,
- high_risk_child_type,
- high_risk_child_name,
register_user,
remark,
orgid,
@@ -98,15 +82,14 @@
create_by,
create_time,
del_flag
- from pat_maternity_child_archive
+ from pat_maternity_archive
</sql>
- <select id="selectPatMaternityChildArchiveList" parameterType="com.smartor.domain.PatMaternityChildArchive"
- resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatMaternityArchiveList" parameterType="com.smartor.domain.PatMaternityArchive"
+ resultMap="PatMaternityArchiveResult">
+ <include refid="selectPatMaternityArchiveVo"/>
where 1=1
and del_flag = '0'
- <if test="type != null and type != ''">and type = #{type}</if>
<if test="archiveType != null and archiveType != ''">and archive_type = #{archiveType}</if>
<if test="outhospno != null and outhospno != ''">and outhospno = #{outhospno}</if>
<if test="inhospno != null and inhospno != ''">and inhospno = #{inhospno}</if>
@@ -132,14 +115,7 @@
<if test="icd10code != null and icd10code != ''">and icd10code = #{icd10code}</if>
<if test="diagname != null and diagname != ''">and diagname like concat('%', #{diagname}, '%')</if>
<if test="pregnancySituation != null and pregnancySituation != ''">and pregnancy_situation = #{pregnancySituation}</if>
- <if test="appointmentSituation != null and appointmentSituation != ''">and appointment_situation = #{appointmentSituation}</if>
<if test="closeStatus != null and closeStatus != ''">and close_status = #{closeStatus}</if>
- <if test="nutritionIcd10Code != null and nutritionIcd10Code != ''">and nutrition_icd10_code = #{nutritionIcd10Code}</if>
- <if test="nutritionDiagName != null and nutritionDiagName != ''">and nutrition_diag_name like concat('%', #{nutritionDiagName}, '%')</if>
- <if test="gestationalWeek != null">and gestational_week = #{gestationalWeek}</if>
- <if test="birthWeight != null">and birth_weight = #{birthWeight}</if>
- <if test="highRiskChildType != null and highRiskChildType != ''">and high_risk_child_type = #{highRiskChildType}</if>
- <if test="highRiskChildName != null and highRiskChildName != ''">and high_risk_child_name like concat('%', #{highRiskChildName}, '%')</if>
<if test="registerUser != null and registerUser != ''">and register_user = #{registerUser}</if>
<if test="orgid != null and orgid != ''">and orgid = #{orgid}</if>
<if test="campusid != null and campusid != ''">and campusid = #{campusid}</if>
@@ -151,16 +127,15 @@
</if>
</select>
- <select id="selectPatMaternityChildArchiveById" parameterType="Long" resultMap="PatMaternityChildArchiveResult">
- <include refid="selectPatMaternityChildArchiveVo"/>
+ <select id="selectPatMaternityArchiveById" parameterType="Long" resultMap="PatMaternityArchiveResult">
+ <include refid="selectPatMaternityArchiveVo"/>
where id = #{id}
</select>
- <insert id="insertPatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive"
+ <insert id="insertPatMaternityArchive" parameterType="com.smartor.domain.PatMaternityArchive"
useGeneratedKeys="true" keyProperty="id">
- insert into pat_maternity_child_archive
+ insert into pat_maternity_archive
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="type != null">type,</if>
<if test="archiveType != null">archive_type,</if>
<if test="outhospno != null">outhospno,</if>
<if test="inhospno != null">inhospno,</if>
@@ -187,14 +162,7 @@
<if test="icd10code != null">icd10code,</if>
<if test="diagname != null">diagname,</if>
<if test="pregnancySituation != null">pregnancy_situation,</if>
- <if test="appointmentSituation != null">appointment_situation,</if>
<if test="closeStatus != null">close_status,</if>
- <if test="nutritionIcd10Code != null">nutrition_icd10_code,</if>
- <if test="nutritionDiagName != null">nutrition_diag_name,</if>
- <if test="gestationalWeek != null">gestational_week,</if>
- <if test="birthWeight != null">birth_weight,</if>
- <if test="highRiskChildType != null">high_risk_child_type,</if>
- <if test="highRiskChildName != null">high_risk_child_name,</if>
<if test="registerUser != null">register_user,</if>
<if test="remark != null">remark,</if>
<if test="orgid != null">orgid,</if>
@@ -206,7 +174,6 @@
<if test="delFlag != null and delFlag != ''">del_flag,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="type != null">#{type},</if>
<if test="archiveType != null">#{archiveType},</if>
<if test="outhospno != null">#{outhospno},</if>
<if test="inhospno != null">#{inhospno},</if>
@@ -233,14 +200,7 @@
<if test="icd10code != null">#{icd10code},</if>
<if test="diagname != null">#{diagname},</if>
<if test="pregnancySituation != null">#{pregnancySituation},</if>
- <if test="appointmentSituation != null">#{appointmentSituation},</if>
<if test="closeStatus != null">#{closeStatus},</if>
- <if test="nutritionIcd10Code != null">#{nutritionIcd10Code},</if>
- <if test="nutritionDiagName != null">#{nutritionDiagName},</if>
- <if test="gestationalWeek != null">#{gestationalWeek},</if>
- <if test="birthWeight != null">#{birthWeight},</if>
- <if test="highRiskChildType != null">#{highRiskChildType},</if>
- <if test="highRiskChildName != null">#{highRiskChildName},</if>
<if test="registerUser != null">#{registerUser},</if>
<if test="remark != null">#{remark},</if>
<if test="orgid != null">#{orgid},</if>
@@ -253,10 +213,9 @@
</trim>
</insert>
- <update id="updatePatMaternityChildArchive" parameterType="com.smartor.domain.PatMaternityChildArchive">
- update pat_maternity_child_archive
+ <update id="updatePatMaternityArchive" parameterType="com.smartor.domain.PatMaternityArchive">
+ update pat_maternity_archive
<trim prefix="SET" suffixOverrides=",">
- <if test="type != null">type = #{type},</if>
<if test="archiveType != null">archive_type = #{archiveType},</if>
<if test="outhospno != null">outhospno = #{outhospno},</if>
<if test="inhospno != null">inhospno = #{inhospno},</if>
@@ -283,14 +242,7 @@
<if test="icd10code != null">icd10code = #{icd10code},</if>
<if test="diagname != null">diagname = #{diagname},</if>
<if test="pregnancySituation != null">pregnancy_situation = #{pregnancySituation},</if>
- <if test="appointmentSituation != null">appointment_situation = #{appointmentSituation},</if>
<if test="closeStatus != null">close_status = #{closeStatus},</if>
- <if test="nutritionIcd10Code != null">nutrition_icd10_code = #{nutritionIcd10Code},</if>
- <if test="nutritionDiagName != null">nutrition_diag_name = #{nutritionDiagName},</if>
- <if test="gestationalWeek != null">gestational_week = #{gestationalWeek},</if>
- <if test="birthWeight != null">birth_weight = #{birthWeight},</if>
- <if test="highRiskChildType != null">high_risk_child_type = #{highRiskChildType},</if>
- <if test="highRiskChildName != null">high_risk_child_name = #{highRiskChildName},</if>
<if test="registerUser != null">register_user = #{registerUser},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="orgid != null">orgid = #{orgid},</if>
@@ -304,16 +256,16 @@
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveById" parameterType="Long">
- update pat_maternity_child_archive
+ <update id="deletePatMaternityArchiveById" parameterType="Long">
+ update pat_maternity_archive
<trim prefix="SET" suffixOverrides=",">
del_flag = '1'
</trim>
where id = #{id}
</update>
- <update id="deletePatMaternityChildArchiveByIds" parameterType="String">
- update pat_maternity_child_archive set del_flag = '1' where id in
+ <update id="deletePatMaternityArchiveByIds" parameterType="String">
+ update pat_maternity_archive set del_flag = '1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
--
Gitblit v1.9.3