diff --git a/postdischarge-admin/src/main/resources/application.yml b/postdischarge-admin/src/main/resources/application.yml index 2fbc1ebf..676b1c28 100644 --- a/postdischarge-admin/src/main/resources/application.yml +++ b/postdischarge-admin/src/main/resources/application.yml @@ -12,6 +12,12 @@ xinelu: profile: D:/postdischarge/uploadPath # 签约知情书上传 sign-informed-file-url: /signInformed + # 素材库封面上传 + propaganda-cover-url: /propagandaCover + # 宣教库封面上传 + materials-cover-url: /materialsCover + # 素材库封面上传 + materials-video-url: /materialsVideo # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 diff --git a/postdischarge-common/src/main/java/com/xinelu/common/config/SystemBusinessConfig.java b/postdischarge-common/src/main/java/com/xinelu/common/config/SystemBusinessConfig.java index 45369b2a..905a5b1c 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/config/SystemBusinessConfig.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/config/SystemBusinessConfig.java @@ -51,6 +51,21 @@ public class SystemBusinessConfig { */ private String signInformedFileUrl; + /** + * 宣教库封面 + */ + private String propagandaCoverUrl; + + /** + * 素材库封面 + */ + private String materialsCoverUrl; + + /** + * 素材库视频地址 + */ + private String materialsVideoUrl; + public String getName() { return name; } @@ -142,4 +157,28 @@ public class SystemBusinessConfig { public void setSignInformedFileUrl(String signInformedFileUrl) { this.signInformedFileUrl = signInformedFileUrl; } + + public String getPropagandaCoverUrl() { + return propagandaCoverUrl; + } + + public void setPropagandaCoverUrl(String propagandaCoverUrl) { + this.propagandaCoverUrl = propagandaCoverUrl; + } + + public String getMaterialsCoverUrl() { + return materialsCoverUrl; + } + + public void setMaterialsCoverUrl(String materialsCoverUrl) { + this.materialsCoverUrl = materialsCoverUrl; + } + + public String getMaterialsVideoUrl() { + return materialsVideoUrl; + } + + public void setMaterialsVideoUrl(String materialsVideoUrl) { + this.materialsVideoUrl = materialsVideoUrl; + } } diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/FileUploadPathConstants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/FileUploadPathConstants.java new file mode 100644 index 00000000..a44a283b --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/FileUploadPathConstants.java @@ -0,0 +1,29 @@ +package com.xinelu.common.constant; + +/** + * @description: 文件上传路径常量 + * @author: haown + * @create: 2024-03-01 10:39 + **/ +public class FileUploadPathConstants { + + /** + * 签约知情书上传路径 + */ + public static final String SIGN_INFORMED_TYPE = "signInformedFileUrl"; + + /** + * 宣教封面上传路径 + */ + public static final String PROPAGANDA_COVER_TYPE = "propagandaCoverUrl"; + + /** + * 素材封面上传路径 + */ + public static final String MATERIALS_COVER_TYPE = "materialsCoverUrl"; + + /** + * 素材库视频上传路径 + */ + public static final String MATERIALS_VIDEO_TYPE = "materialsVideoUrl"; +} diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/SignRecordServiceStatusConstants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/SignRecordServiceStatusConstants.java index 2e0c7a5f..450b16f6 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/constant/SignRecordServiceStatusConstants.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/SignRecordServiceStatusConstants.java @@ -21,6 +21,11 @@ public class SignRecordServiceStatusConstants { */ public static final String SERVICE_END = "SERVICE_END"; + /** + * 待续约 + */ + public static final String WAIT_CONTINUOUS_SIGN = "WAIT_CONTINUOUS_SIGN"; + /** * 在签 */ @@ -37,8 +42,8 @@ public class SignRecordServiceStatusConstants { public static final String SEPARATE_SIGN = "SEPARATE_SIGN"; /** - * 续约 + * 服务到期 */ - public static final String CONTINUOUS_SIGN = "CONTINUOUS_SIGN"; + public static final String EXPIRE_SIGN = "EXPIRE_SIGN"; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/crowdinfo/CrowdInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/crowdinfo/CrowdInfoController.java new file mode 100644 index 00000000..132691e5 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/crowdinfo/CrowdInfoController.java @@ -0,0 +1,112 @@ +package com.xinelu.manage.controller.crowdinfo; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.crowdinfo.CrowdInfo; +import com.xinelu.manage.service.crowdinfo.ICrowdInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 人群信息Controller + * + * @author xinelu + * @date 2024-03-04 + */ +@Api(tags = "人群信息控制器") +@RestController +@RequestMapping("/manage/crowdInfo") +public class CrowdInfoController extends BaseController { + @Resource + private ICrowdInfoService crowdInfoService; + + /** + * 分页查询人群信息列表 + */ + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:list')") + @GetMapping("/list") + public TableDataInfo list(CrowdInfo crowdInfo) { + startPage(); + List list = crowdInfoService.selectCrowdInfoList(crowdInfo); + return getDataTable(list); + } + + /** + * 查询人群信息列表 + */ + @ApiOperation("查询人群信息列表") + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:list')") + @GetMapping("/getList") + public R> getList(CrowdInfo crowdInfo) { + List list = crowdInfoService.selectCrowdInfoList(crowdInfo); + return R.ok(list); + } + + /** + * 导出人群信息列表 + */ + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:export')") + @Log(title = "人群信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, CrowdInfo crowdInfo) { + List list = crowdInfoService.selectCrowdInfoList(crowdInfo); + ExcelUtil util = new ExcelUtil(CrowdInfo. class); + util.exportExcel(response, list, "人群信息数据"); + } + + /** + * 获取人群信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(crowdInfoService.selectCrowdInfoById(id)); + } + + /** + * 新增人群信息 + */ + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:add')") + @Log(title = "人群信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody CrowdInfo crowdInfo) { + return toAjax(crowdInfoService.insertCrowdInfo(crowdInfo)); + } + + /** + * 修改人群信息 + */ + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:edit')") + @Log(title = "人群信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody CrowdInfo crowdInfo) { + return toAjax(crowdInfoService.updateCrowdInfo(crowdInfo)); + } + + /** + * 删除人群信息 + */ + @PreAuthorize("@ss.hasPermi('manage:crowdInfo:remove')") + @Log(title = "人群信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(crowdInfoService.deleteCrowdInfoByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java index 57461157..925c093e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/materialsinfo/MaterialsInfoController.java @@ -7,8 +7,10 @@ import com.xinelu.common.core.page.TableDataInfo; import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto; import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -35,12 +37,13 @@ public class MaterialsInfoController extends BaseController { @Resource private IMaterialsInfoService materialsInfoService; -/** - * 查询素材信息列表 - */ -@PreAuthorize("@ss.hasPermi('manage:materials:list')") -@GetMapping("/list") - public TableDataInfo list(MaterialsInfo materialsInfo) { + /** + * 查询素材信息列表 + */ + @ApiOperation("查询素材信息列表") + @PreAuthorize("@ss.hasPermi('manage:materials:list')") + @GetMapping("/list") + public TableDataInfo list(MaterialsInfoDto materialsInfo) { startPage(); List list = materialsInfoService.selectMaterialsInfoList(materialsInfo); return getDataTable(list); @@ -52,7 +55,7 @@ public class MaterialsInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:materials:export')") @Log(title = "素材信息", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, MaterialsInfo materialsInfo) { + public void export(HttpServletResponse response, MaterialsInfoDto materialsInfo) { List list = materialsInfoService.selectMaterialsInfoList(materialsInfo); ExcelUtil util = new ExcelUtil(MaterialsInfo. class); util.exportExcel(response, list, "素材信息数据"); @@ -61,6 +64,7 @@ public class MaterialsInfoController extends BaseController { /** * 获取素材信息详细信息 */ + @ApiOperation("根据主键id获取素材信息详细信息") @PreAuthorize("@ss.hasPermi('manage:materials:query')") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -70,6 +74,7 @@ public class MaterialsInfoController extends BaseController { /** * 新增素材信息 */ + @ApiOperation("新增素材信息") @PreAuthorize("@ss.hasPermi('manage:materials:add')") @Log(title = "素材信息", businessType = BusinessType.INSERT) @PostMapping @@ -80,6 +85,7 @@ public class MaterialsInfoController extends BaseController { /** * 修改素材信息 */ + @ApiOperation("修改素材信息") @PreAuthorize("@ss.hasPermi('manage:materials:edit')") @Log(title = "素材信息", businessType = BusinessType.UPDATE) @PutMapping @@ -90,6 +96,7 @@ public class MaterialsInfoController extends BaseController { /** * 删除素材信息 */ + @ApiOperation("批量删除素材信息") @PreAuthorize("@ss.hasPermi('manage:materials:remove')") @Log(title = "素材信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java index 25835cd5..e1cdd74c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklist/PatientBlacklistController.java @@ -8,8 +8,10 @@ import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistSaveDto; import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService; import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; +import io.swagger.annotations.Api; import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController; * @author haown * @date 2024-02-27 */ +@Api(tags = "患者-黑明单关系控制器") @RestController @RequestMapping("/manage/blacklist") public class PatientBlacklistController extends BaseController { @@ -73,7 +76,7 @@ public class PatientBlacklistController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:blacklist:add')") @Log(title = "患者-黑明单关系", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody PatientBlacklist patientBlacklist) { + public AjaxResult add(@RequestBody PatientBlacklistSaveDto patientBlacklist) { return toAjax(patientBlacklistService.insertPatientBlacklist(patientBlacklist)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java new file mode 100644 index 00000000..c25477be --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseController.java @@ -0,0 +1,113 @@ +package com.xinelu.manage.controller.patientblacklistabnormalcause; + +import com.xinelu.common.annotation.Log; +import com.xinelu.common.core.controller.BaseController; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; +import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause; +import com.xinelu.manage.service.patientblacklistabnormalcause.IPatientBlacklistAbnormalCauseService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 患者黑名单异常原因Controller + * + * @author haown + * @date 2024-03-01 + */ +@Api(tags = "患者黑名单异常原因控制器") +@RestController +@RequestMapping("/manage/cause") +public class PatientBlacklistAbnormalCauseController extends BaseController { + @Resource + private IPatientBlacklistAbnormalCauseService patientBlacklistAbnormalCauseService; + + /** + * 分页查询患者黑名单异常原因列表 + */ + @ApiOperation("分页查询患者黑名单异常原因列表") + @PreAuthorize("@ss.hasPermi('manage:cause:list')") + @GetMapping("/list") + public TableDataInfo list(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + startPage(); + List list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause); + return getDataTable(list); + } + + /** + * 查询患者黑名单异常原因列表 + */ + @ApiOperation("查询患者黑名单异常原因列表") + @PreAuthorize("@ss.hasPermi('manage:cause:list')") + @GetMapping("/getList") + public R> getList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + List list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause); + return R.ok(list); + } + + /** + * 导出患者黑名单异常原因列表 + */ + @PreAuthorize("@ss.hasPermi('manage:cause:export')") + @Log(title = "患者黑名单异常原因", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + List list = patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause); + ExcelUtil util = new ExcelUtil(PatientBlacklistAbnormalCause. class); + util.exportExcel(response, list, "患者黑名单异常原因数据"); + } + + /** + * 获取患者黑名单异常原因详细信息 + */ + @PreAuthorize("@ss.hasPermi('manage:cause:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(patientBlacklistAbnormalCauseService.selectPatientBlacklistAbnormalCauseById(id)); + } + + /** + * 新增患者黑名单异常原因 + */ + @PreAuthorize("@ss.hasPermi('manage:cause:add')") + @Log(title = "患者黑名单异常原因", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + return toAjax(patientBlacklistAbnormalCauseService.insertPatientBlacklistAbnormalCause(patientBlacklistAbnormalCause)); + } + + /** + * 修改患者黑名单异常原因 + */ + @PreAuthorize("@ss.hasPermi('manage:cause:edit')") + @Log(title = "患者黑名单异常原因", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + return toAjax(patientBlacklistAbnormalCauseService.updatePatientBlacklistAbnormalCause(patientBlacklistAbnormalCause)); + } + + /** + * 删除患者黑名单异常原因 + */ + @PreAuthorize("@ss.hasPermi('manage:cause:remove')") + @Log(title = "患者黑名单异常原因", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(patientBlacklistAbnormalCauseService.deletePatientBlacklistAbnormalCauseByIds(ids)); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java new file mode 100644 index 00000000..378cc845 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/projectrecord/ProjectRecordController.java @@ -0,0 +1,19 @@ +package com.xinelu.manage.controller.projectrecord; + +import com.xinelu.common.core.controller.BaseController; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @description: 检测项目数据记录控制器 + * @author: haown + * @create: 2024-02-29 15:45 + **/ +@Api(tags = "检测项目数据记录控制器") +@RestController +@RequestMapping("/manage/projectRecord") +public class ProjectRecordController extends BaseController { + + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java index efba444c..5aff982f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/propagandainfo/PropagandaInfoController.java @@ -1,28 +1,32 @@ package com.xinelu.manage.controller.propagandainfo; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.security.access.prepost.PreAuthorize; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; import com.xinelu.common.annotation.Log; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.enums.BusinessType; -import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; -import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; -import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.enums.BusinessType; +import com.xinelu.common.utils.poi.ExcelUtil; +import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.dto.department.DepartmentDTO; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; +import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; +import com.xinelu.manage.vo.department.DepartmentVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.List; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 宣教库管理Controller @@ -43,7 +47,7 @@ public class PropagandaInfoController extends BaseController { @ApiOperation("分页查询宣教库管理列表") @PreAuthorize("@ss.hasPermi('manage:propaganda:list')") @GetMapping("/list") - public TableDataInfo list(PropagandaInfo propagandaInfo) { + public TableDataInfo list(PropagandaInfoDto propagandaInfo) { startPage(); List list = propagandaInfoService.selectPropagandaInfoList(propagandaInfo); return getDataTable(list); @@ -55,7 +59,7 @@ public class PropagandaInfoController extends BaseController { @PreAuthorize("@ss.hasPermi('manage:propaganda:export')") @Log(title = "宣教库管理", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, PropagandaInfo propagandaInfo) { + public void export(HttpServletResponse response, PropagandaInfoDto propagandaInfo) { List list = propagandaInfoService.selectPropagandaInfoList(propagandaInfo); ExcelUtil util = new ExcelUtil(PropagandaInfo. class); util.exportExcel(response, list, "宣教库管理数据"); @@ -93,6 +97,29 @@ public class PropagandaInfoController extends BaseController { return toAjax(propagandaInfoService.updatePropagandaInfo(propagandaInfo)); } + /** + * 复制宣教内容 + */ + @ApiOperation("复制宣教内容") + @PreAuthorize("@ss.hasPermi('manage:propaganda:add')") + @GetMapping("/copy/{id}") + public R copy(@PathVariable Long id) { + int flag = propagandaInfoService.copyPropagandaInfo(id); + return flag > 0 ? R.ok() : R.fail(); + } + + /** + * 修改宣教信息状态 + */ + @ApiOperation("修改宣教库信息") + @PreAuthorize("@ss.hasPermi('manage:propaganda:edit')") + @Log(title = "宣教库管理", businessType = BusinessType.UPDATE) + @PostMapping("/updateStatus") + public R updateStatus(@RequestBody PropagandaUpdateDto propagandaInfo) { + int flag = propagandaInfoService.updateStatus(propagandaInfo); + return flag < 0 ? R.fail() : R.ok(); + } + /** * 删除宣教库管理 */ @@ -103,4 +130,14 @@ public class PropagandaInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(propagandaInfoService.deletePropagandaInfoByIds(ids)); } + + /** + * 查询科室信息列表及包含宣教库数量 + */ + @ApiOperation("查询科室信息列表及包含宣教库数量") + @GetMapping("/selectNumByDept") + public R> selectNumByDept(DepartmentDTO departmentDto) { + List list = propagandaInfoService.selectNumByDept(departmentDto); + return R.ok(list); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/FileUploadController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/FileUploadController.java new file mode 100644 index 00000000..4532de5d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/FileUploadController.java @@ -0,0 +1,48 @@ +package com.xinelu.manage.controller.signpatientinformed; + +import com.xinelu.common.constant.Constants; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.manage.service.signpatientinformed.IFileUploadService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import java.util.Objects; +import javax.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +/** + * @description: 文件上传控制器 + * @author: haown + * @create: 2024-03-01 10:30 + **/ +@Api(tags = "文件上传控制器") +@RestController +@RequestMapping("/manage/file") +public class FileUploadController { + + @Resource + private IFileUploadService fileUploadService; + /** + * 文件上传 + */ + @ApiOperation(value = "文件上传", notes = "type:signInformedFileUrl:签约知情书上传,propagandaCoverUrl:宣教库封面上传," + + "materialsCoverUrl:宣教库封面上传,materialsVideoUrl:宣教库视频上传") + @PostMapping("/uploadFile") + public AjaxResult uploadFile(@RequestParam("file") MultipartFile multipartFile, @RequestParam(value = "type") String type) throws Exception { + if (Objects.isNull(multipartFile) || StringUtils.isBlank(multipartFile.getOriginalFilename())) { + return AjaxResult.error("当前文件不存在，无法上传！"); + } + if (multipartFile.getOriginalFilename().contains(Constants.EMPTY)) { + return AjaxResult.error("当前文件名含有空格，请先去除空格在上传！"); + } + if (StringUtils.isBlank(type)) { + return AjaxResult.error("请选择所要上传的路径类型！"); + } + return fileUploadService.uploadFile(multipartFile, type); + } + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java index d5b669ec..6f10d97a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientinformed/SignPatientInformedController.java @@ -1,7 +1,6 @@ package com.xinelu.manage.controller.signpatientinformed; import com.xinelu.common.annotation.Log; -import com.xinelu.common.constant.Constants; import com.xinelu.common.core.controller.BaseController; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; @@ -9,11 +8,10 @@ import com.xinelu.common.enums.BusinessType; import com.xinelu.common.utils.poi.ExcelUtil; import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService; +import io.swagger.annotations.Api; import java.util.List; -import java.util.Objects; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -22,9 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; /** * 签约知情同意书信息Controller @@ -32,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile; * @author xinelu * @date 2024-02-27 */ +@Api(tags = "签约知情同意书控制器") @RestController @RequestMapping("/manage/signInformed") public class SignPatientInformedController extends BaseController { @@ -100,17 +97,4 @@ public class SignPatientInformedController extends BaseController { return toAjax(signPatientInformedService.deleteSignPatientInformedByIds(ids)); } - /** - * 问诊聊天上传文件接口 - */ - @PostMapping("/uploadFile") - public AjaxResult uploadFile(@RequestParam("file") MultipartFile multipartFile) throws Exception { - if (Objects.isNull(multipartFile) || StringUtils.isBlank(multipartFile.getOriginalFilename())) { - return AjaxResult.error("当前文件不存在，无法上传！"); - } - if (multipartFile.getOriginalFilename().contains(Constants.EMPTY)) { - return AjaxResult.error("当前文件名含有空格，请先去除空格在上传！"); - } - return signPatientInformedService.uploadFile(multipartFile); - } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java index eb062237..2d15c929 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientrecord/SignPatientRecordController.java @@ -1,15 +1,16 @@ package com.xinelu.manage.controller.signpatientrecord; import com.xinelu.common.core.controller.BaseController; -import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.core.domain.R; import com.xinelu.common.core.page.TableDataInfo; -import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; -import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import java.util.List; import javax.annotation.Resource; @@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; * @author: haown * @create: 2024-02-28 16:03 **/ +@Api(tags = "患者签约记录控制器") @RestController @RequestMapping("/manage/signRecord") public class SignPatientRecordController extends BaseController { @@ -48,11 +50,12 @@ public class SignPatientRecordController extends BaseController { /** * 签约 */ - @ApiOperation("签约") + @ApiOperation("签约/续约") @PreAuthorize("@ss.hasPermi('manage:signRecord:add')") @PostMapping("/sign") - public AjaxResult sign(@RequestBody SignPatientAddDto body) { - return toAjax(signPatientRecordService.add(body)); + public R sign(@RequestBody SignPatientAddDto body) { + int flag = signPatientRecordService.add(body); + return flag > 0 ? R.ok() : R.fail(); } /** @@ -61,9 +64,9 @@ public class SignPatientRecordController extends BaseController { @ApiOperation("根据患者主键查询签约记录") @PreAuthorize("@ss.hasPermi('manage:signRecord:list')") @GetMapping("/getByPatient/{patientId}") - public AjaxResult getByPatient(@PathVariable("patientId") Long patientId) { + public R> getByPatient(@PathVariable("patientId") Long patientId) { List list = signPatientRecordService.getByPatient(patientId); - return AjaxResult.success(list); + return R.ok(list); } /** @@ -71,10 +74,10 @@ public class SignPatientRecordController extends BaseController { */ @ApiOperation("根据签约记录表主键查询签约详情") @PreAuthorize("@ss.hasPermi('manage:signRecord:list')") - @GetMapping("/getByRecordId/{patientSignRecordId}") - public AjaxResult getByRecordId(@PathVariable("patientSignRecordId") Long patientSignRecordId) { - SignPatientInfoVo signInfo = signPatientRecordService.getByRecordId(patientSignRecordId); - return AjaxResult.success(signInfo); + @GetMapping("/getByRecordId/{id}") + public R getByRecordId(@PathVariable("id") Long id) { + SignPatientInfoVo signInfo = signPatientRecordService.getByRecordId(id); + return R.ok(signInfo); } /** @@ -83,8 +86,8 @@ public class SignPatientRecordController extends BaseController { @ApiOperation("解约") @PreAuthorize("@ss.hasPermi('manage:signRecord:edit')") @PostMapping("/updateSignStatus") - public AjaxResult updateSignStatus(@RequestBody SignPatientStatusDto updateSignStatus) { + public R updateSignStatus(@RequestBody SignPatientStatusDto updateSignStatus) { int flag = signPatientRecordService.updateSignStatus(updateSignStatus); - return flag < 0 ? AjaxResult.error() : AjaxResult.success(); + return flag < 0 ? R.fail() : R.ok(); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/crowdinfo/CrowdInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/crowdinfo/CrowdInfo.java new file mode 100644 index 00000000..739b0191 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/crowdinfo/CrowdInfo.java @@ -0,0 +1,76 @@ +package com.xinelu.manage.domain.crowdinfo; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 人群信息对象 crowd_info + * + * @author xinelu + * @date 2024-03-04 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "人群信息对象", description = "crowd_info") +public class CrowdInfo extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** 主键 */ + private Long id; + + /** 人群名称 */ + @ApiModelProperty(value = "人群名称") + @Excel(name = "人群名称") + private String crowdName; + + /** 最小适合年龄 */ + @ApiModelProperty(value = "最小适合年龄") + @Excel(name = "最小适合年龄") + private Long minSuitableAge; + + /** 最大适合年龄 */ + @ApiModelProperty(value = "最大适合年龄") + @Excel(name = "最大适合年龄") + private Long maxSuitableAge; + + /** 适合性别，全部：ALL，男：MALE，女：FEMALE，未知：UNKNOWN */ + @ApiModelProperty(value = "适合性别，全部：ALL，男：MALE，女：FEMALE，未知：UNKNOWN") + @Excel(name = "适合性别，全部：ALL，男：MALE，女：FEMALE，未知：UNKNOWN") + private String suitableGender; + + /** 人群类型，默认：DEFAULT，慢病：CHRONIC_DISEASE，特殊人群：SPECIAL_POPULATIONS，重点人群：KEY_GROUPS */ + @ApiModelProperty(value = "人群类型，默认：DEFAULT，慢病：CHRONIC_DISEASE，特殊人群：SPECIAL_POPULATIONS，重点人群：KEY_GROUPS") + @Excel(name = "人群类型，默认：DEFAULT，慢病：CHRONIC_DISEASE，特殊人群：SPECIAL_POPULATIONS，重点人群：KEY_GROUPS") + private String crowdType; + + /** 特殊人群（1：65岁及以上老年人 2：60-64岁老年人 3：0-6岁儿童 4：孕产妇 5：残疾人 6：优抚对象； +慢病人群（20：高血压 21：二型糖尿病 22：高血压合并糖尿病 23：冠心病 24：脑卒中康复期）； +其他重点人群（40：严重精神障碍 41：结核病 42：肿瘤病 43：贫困人口 44：计划生育特殊家庭） */ + @ApiModelProperty(value = "特殊人群") + @Excel(name = "特殊人群", readConverterExp = "1=：65岁及以上老年人,2=：60-64岁老年人,3=：0-6岁儿童,4=：孕产妇,5=：残疾人,6=：优抚对象；慢病人群（20：高血压,2=1：二型糖尿病,2=2：高血压合并糖尿病,2=3：冠心病,2=4：脑卒中康复期") + private String specialType; + + /** 是否禁用，0：否，1：是 */ + @ApiModelProperty(value = "是否禁用，0：否，1：是") + @Excel(name = "是否禁用，0：否，1：是") + private Integer whetherDisable; + + /** 排序 */ + @ApiModelProperty(value = "排序") + @Excel(name = "排序") + private Long sort; + + /** 删除标识，0：正常，1：已删除 */ + private Integer delFlag; + + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java index 5b6e1f9a..1bd68273 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/materialsinfo/MaterialsInfo.java @@ -22,9 +22,10 @@ import lombok.NoArgsConstructor; @ApiModel(value = "素材信息对象", description = "materials_info") public class MaterialsInfo extends BaseEntity { -private static final long serialVersionUID=1L; + private static final long serialVersionUID=1L; /** 主键id */ + @ApiModelProperty(value = "主键id") private Long id; /** 素材名称 */ @@ -104,7 +105,7 @@ private static final long serialVersionUID=1L; /** 素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED */ @ApiModelProperty(value = "素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED") - @Excel(name = "素材状态，全部：ALL，已上架：LISTED，未上架：NOT_LISTED") + @Excel(name = "素材状态，已上架：LISTED，未上架：NOT_LISTED") private String materialsStatus; /** 素材备注 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java index 6be55243..81526fd2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklist/PatientBlacklist.java @@ -5,6 +5,7 @@ import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -16,6 +17,7 @@ import lombok.NoArgsConstructor; * @date 2024-02-27 */ @Data +@Builder @AllArgsConstructor @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -30,6 +32,31 @@ public class PatientBlacklist extends BaseEntity { /** 患者id */ private Long patientId; + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + private String hospitalAgencyName; + + /** 所属院区id */ + @ApiModelProperty(value = "所属院区id") + private Long campusAgencyId; + + /** 所属院区名称 */ + @ApiModelProperty(value = "所属院区名称") + @Excel(name = "所属院区名称") + private String campusAgencyName; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + private String departmentName; + /** 异常原因字典表id */ @ApiModelProperty(value = "异常原因字典表id") @Excel(name = "异常原因字典表id") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklistabnormalcause/PatientBlacklistAbnormalCause.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklistabnormalcause/PatientBlacklistAbnormalCause.java new file mode 100644 index 00000000..286770d9 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientblacklistabnormalcause/PatientBlacklistAbnormalCause.java @@ -0,0 +1,57 @@ +package com.xinelu.manage.domain.patientblacklistabnormalcause; + +import com.xinelu.common.annotation.Excel; +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +/** + * 患者黑名单异常原因对象 patient_blacklist_abnormal_cause + * + * @author haown + * @date 2024-03-01 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper = true) +@ApiModel(value = "患者黑名单异常原因对象", description = "patient_blacklist_abnormal_cause") +public class PatientBlacklistAbnormalCause extends BaseEntity { + private static final long serialVersionUID=1L; + + /** 主键 */ + private Long id; + + /** 上级id */ + @ApiModelProperty(value = "上级id") + @Excel(name = "上级id") + private Long parentId; + + /** 异常原因代码 */ + @ApiModelProperty(value = "异常原因代码") + @Excel(name = "异常原因代码") + private String abnormalCauseCode; + + /** 异常原因描述 */ + @ApiModelProperty(value = "异常原因描述") + @Excel(name = "异常原因描述") + private String abnormalCauseValue; + + /** 异常原因级别（异常原因：ABNORMAL_CAUSE，补充说明：SUPPLEMENT） */ + @ApiModelProperty(value = "异常原因级别,（异常原因：ABNORMAL_CAUSE，补充说明：SUPPLEMENT）") + @Excel(name = "异常原因级别", readConverterExp = "异=常原因：ABNORMAL_CAUSE，补充说明：SUPPLEMENT") + private String abnormalCauseLevel; + + /** 状态（0正常 1停用） */ + @ApiModelProperty(value = "状态") + @Excel(name = "状态", readConverterExp = "0=正常,1=停用") + private String status; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java index 5723d877..c34f68ae 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java @@ -67,10 +67,20 @@ public class PatientInfo extends BaseEntity { @ApiModelProperty(value = "患者类型，预住院患者：PRE_HOSPITALIZED_PATIENT，在院患者：IN_HOSPITAL_PATIENT，门诊患者：OUTPATIENT，出院患者：DISCHARGED_PATIENT，签约患者：CONTRACTED_PATIENT") private String patientType; - /** 签约状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN */ - @ApiModelProperty(value = "签约状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN") - @Excel(name = "签约状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN") - private String signStatus; + /** + * 签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 服务到期：EXPIRE_SIGN + */ + @ApiModelProperty(value = "签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN") + private String signStatus; + + @ApiModelProperty(value = "签约记录表id") + private Long signPatientRecordId; + + /** + * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END + */ + @ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END") + private String serviceStatus; /** 签约时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java new file mode 100644 index 00000000..67050ea9 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/project/Project.java @@ -0,0 +1,107 @@ +package com.xinelu.manage.domain.project; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 检测项目表 + * @TableName project + */ +@ApiModel("检测项目表") +@Data +public class Project extends BaseEntity { + /** + * 主键id + */ + @ApiModelProperty("主键id") + private Long id; + + /** + * 所属分组id + */ + @ApiModelProperty("所属分组id") + private Long groupId; + + /** + * 分组名称 + */ + @ApiModelProperty("分组名称") + private String groupName; + + /** + * 项目名称 + */ + @ApiModelProperty("项目名称") + private String projectName; + + /** + * 项目编码 + */ + @ApiModelProperty("项目编码") + private String projectCode; + + /** + * 项目别名 + */ + @ApiModelProperty("项目别名") + private String projectAlias; + + /** + * 是否启用，0：是，1：否 + */ + @ApiModelProperty("是否启用，0：是，1：否") + private Integer enableStatus; + + /** + * 判断模式，定量：QUANTIFY，定性：QUALITATIVE + */ + @ApiModelProperty("判断模式，定量：QUANTIFY，定性：QUALITATIVE") + private String judgeMode; + + /** + * 项目指标最大值 + */ + @ApiModelProperty("项目指标最大值") + private Integer maxValue; + + /** + * 项目指标最小值 + */ + @ApiModelProperty("项目指标最小值") + private Integer minValue; + + /** + * 项目指标默认值 + */ + @ApiModelProperty("项目指标默认值") + private String defaultValue; + + /** + * LIS对照 + */ + @ApiModelProperty("LIS对照") + private String lisCompare; + + /** + * 排序 + */ + @ApiModelProperty("排序") + private Integer projectSort; + + /** + * 备注信息 + */ + @ApiModelProperty("备注信息") + private String projectRemark; + + /** + * 删除标识，0：未删除，1：已删除 + */ + @ApiModelProperty("删除标识，0：未删除，1：已删除") + private Integer delFlag; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java new file mode 100644 index 00000000..9ed1bb3d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectdevice/ProjectDevice.java @@ -0,0 +1,82 @@ +package com.xinelu.manage.domain.projectdevice; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import java.util.Date; +import lombok.Data; + +/** + * 检测项目设备表 + * @TableName project_device + */ +@ApiModel("检测项目设备表") +@Data +public class ProjectDevice extends BaseEntity { + /** + * 主键id + */ + private Long id; + + /** + * 患者id + */ + private Long patientId; + + /** + * 患者姓名 + */ + private String patientName; + + /** + * 身份证号 + */ + private String cardNo; + + /** + * 设备类型，血糖仪：GLUCOSE_METER，血压计：BLOOD_PRESSURE_DEVICE + */ + private String deviceType; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 设备状态 + */ + private String deviceStatus; + + /** + * 备注信息 + */ + private String deviceRemark; + + /** + * 设备绑定时间 + */ + private Date deviceBindTime; + + /** + * 设备解绑时间 + */ + private Date deviceUnbindTime; + + /** + * 设备IP地址 + */ + private String deviceIp; + + /** + * 设备端口 + */ + private Integer devicePort; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java new file mode 100644 index 00000000..61fb6477 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectgroup/ProjectGroup.java @@ -0,0 +1,56 @@ +package com.xinelu.manage.domain.projectgroup; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * 检测项目分组表 + * @TableName project_group + */ +@ApiModel("检测项目分组表") +@Data +public class ProjectGroup extends BaseEntity { + /** + * 主键id + */ + private Long id; + + /** + * 上级分组id + */ + private Long parentId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 分组编码 + */ + private String groupCode; + + /** + * 是否启用，0：是，1：否 + */ + private Integer enableStatus; + + /** + * 排序 + */ + private Integer groupSort; + + /** + * 备注信息 + */ + private String groupRemark; + + /** + * 删除标识，0：未删除，1：已删除 + */ + private Integer delFlag; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java new file mode 100644 index 00000000..1b31ec66 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastrecord/ProjectLastRecord.java @@ -0,0 +1,122 @@ +package com.xinelu.manage.domain.projectlastrecord; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import java.util.Date; +import lombok.Data; + +/** + * 最近一次检测项目数据记录表 + * @TableName project_last_record + */ +@ApiModel("最近一次检测项目数据记录表") +@Data +public class ProjectLastRecord extends BaseEntity { + /** + * 主键id + */ + private Long id; + + /** + * 患者id + */ + private Long patientId; + + /** + * 患者姓名 + */ + private String patientName; + + /** + * 患者身份证号 + */ + private String cardNo; + + /** + * 分组id + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 项目id + */ + private Long projectId; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 检测设备id + */ + private Long deviceId; + + /** + * 检测设备名称 + */ + private String deviceName; + + /** + * 项目别名 + */ + private String projectAlias; + + /** + * 判断模式，定量：QUANTIFY，定性：QUALITATIVE + */ + private String judgeMode; + + /** + * 检测结果，数字或文字描述 + */ + private String measureResult; + + /** + * 项目指标最大值 + */ + private Integer maxValue; + + /** + * 项目指标最小值 + */ + private Integer minValue; + + /** + * 项目指标默认值 + */ + private String defaultValue; + + /** + * LIS对照 + */ + private String lisCompare; + + /** + * 检测时间 + */ + private Date measureTime; + + /** + * 检测人姓名，自动上传时为空，手动上传为上传人姓名 + */ + private String measureName; + + /** + * 备注信息 + */ + private String recordRemark; + + /** + * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED + */ + private String qualifiedSign; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java new file mode 100644 index 00000000..3f1f4591 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecord/ProjectRecord.java @@ -0,0 +1,122 @@ +package com.xinelu.manage.domain.projectrecord; + +import com.xinelu.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import java.util.Date; +import lombok.Data; + +/** + * 检测项目数据记录表 + * @TableName project_record + */ +@ApiModel("检测项目数据记录表") +@Data +public class ProjectRecord extends BaseEntity { + /** + * 主键id + */ + private Long id; + + /** + * 患者id + */ + private Long patientId; + + /** + * 患者姓名 + */ + private String patientName; + + /** + * 患者身份证号 + */ + private String cardNo; + + /** + * 分组id + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 项目id + */ + private Long projectId; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 检测设备id + */ + private Long deviceId; + + /** + * 检测设备名称 + */ + private String deviceName; + + /** + * 项目别名 + */ + private String projectAlias; + + /** + * 判断模式，定量：QUANTIFY，定性：QUALITATIVE + */ + private String judgeMode; + + /** + * 检测结果，数字或文字描述 + */ + private String measureResult; + + /** + * 项目指标最大值 + */ + private Integer maxValue; + + /** + * 项目指标最小值 + */ + private Integer minValue; + + /** + * 项目指标默认值 + */ + private String defaultValue; + + /** + * LIS对照 + */ + private String lisCompare; + + /** + * 检测时间 + */ + private Date measureTime; + + /** + * 检测人姓名，自动上传时为空，手动上传为上传人姓名 + */ + private String measureName; + + /** + * 备注信息 + */ + private String recordRemark; + + /** + * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED + */ + private String qualifiedSign; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java new file mode 100644 index 00000000..5e52355d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectrecordfile/ProjectRecordFile.java @@ -0,0 +1,111 @@ +package com.xinelu.manage.domain.projectrecordfile; + +import com.xinelu.common.core.domain.BaseEntity; +import java.util.Date; +import lombok.Data; + +/** + * 检测项目数据记录附件表（存储检测结果既含有报告又含有指标数据的检测项） + * @TableName project_record_file + */ +@Data +public class ProjectRecordFile extends BaseEntity { + /** + * 主键id + */ + private Long id; + + /** + * 患者id + */ + private Long patientId; + + /** + * 患者姓名 + */ + private String patientName; + + /** + * 患者身份证号 + */ + private String cardNo; + + /** + * 分组id + */ + private Long groupId; + + /** + * 分组名称 + */ + private String groupName; + + /** + * 项目id + */ + private Long projectId; + + /** + * 项目名称 + */ + private String projectName; + + /** + * 检测设备id + */ + private Long deviceId; + + /** + * 检测设备名称 + */ + private String deviceName; + + /** + * 项目别名 + */ + private String projectAlias; + + /** + * 检测结果附件路径 + */ + private String filePath; + + /** + * 检测时间 + */ + private Date measureTime; + + /** + * 检测人姓名，自动上传时为空，手动上传为上传人姓名 + */ + private String measureName; + + /** + * 项目指标最大值 + */ + private Integer maxValue; + + /** + * 项目指标最小值 + */ + private Integer minValue; + + /** + * 项目指标默认值 + */ + private String defaultValue; + + /** + * 合格标识，合格：QUALIFIED，不合格：NOT_QUALIFIED + */ + private String qualifiedSign; + + + /** + * 修改时间 + */ + private Date updateTime; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java index 746f6bed..6faf54aa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/propagandainfo/PropagandaInfo.java @@ -20,14 +20,15 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) @ApiModel(value = "宣教库管理对象", description = "propaganda_info") -public class PropagandaInfo extends BaseEntity - { -private static final long serialVersionUID=1L; +public class PropagandaInfo extends BaseEntity { + + private static final long serialVersionUID=1L; /** 主键id */ private Long id; /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") private Long hospitalAgencyId; /** 所属医院名称 */ @@ -36,6 +37,7 @@ private static final long serialVersionUID=1L; private String hospitalAgencyName; /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") private Long departmentId; /** 所属科室名称 */ @@ -55,6 +57,7 @@ private static final long serialVersionUID=1L; private String propagandaType; /** 宣教ID */ + @ApiModelProperty(value = "宣教ID") private String propagandaCode; /** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */ @@ -63,28 +66,38 @@ private static final long serialVersionUID=1L; private String propagandaStatus; /** 宣教正文内容 */ + @ApiModelProperty(value = "宣教正文内容") private String propagandaContent; /** 宣教封面文件存放地址 */ + @ApiModelProperty(value = "宣教封面文件存放地址") private String propagandaCoverPath; /** 宣教文章摘要 */ + @ApiModelProperty(value = "宣教文章摘要") private String articleSummary; /** 语音播报 */ + @ApiModelProperty(value = "语音播报") private String voicebroadcast; /** 所属病种id */ + @ApiModelProperty(value = "所属病种id") private Long diseaseTypeId; /** 所属病种名称 */ - @ApiModelProperty(value = "所属病种名称") - @Excel(name = "所属病种名称") + @ApiModelProperty(value = "所属病种名称") + @Excel(name = "所属病种名称") private String diseaseTypeName; /** 宣教链接 */ + @ApiModelProperty(value = "宣教链接") private String propagandaLink; /** 宣教二维码图片存放地址 */ + @ApiModelProperty(value = "宣教二维码图片存放地址") private String propagandaBarcodePath; + + /** 删除标识，0：未删除，1：已删除 */ + private Integer delFlag; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java index 1602fdb7..3bb7a867 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java @@ -1,5 +1,6 @@ package com.xinelu.manage.domain.signpatientrecord; +import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -50,10 +51,20 @@ public class SignPatientRecord extends BaseEntity { @ApiModelProperty(value = "身份证号") private String cardNo; + /** 性别 */ + @ApiModelProperty(value = "性别") + private String sex; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthDate; + /** * 签约时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signTime; /** @@ -116,6 +127,9 @@ public class SignPatientRecord extends BaseEntity { @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; + @ApiModelProperty(value = "住院/门诊号") + private String inHospitalNumber; + /** * 签约时诊断 */ @@ -135,15 +149,15 @@ public class SignPatientRecord extends BaseEntity { private String serviceStatus; /** - * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN + * 签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 服务过期：EXPIRE_SIGN */ - @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN") + @ApiModelProperty(value = "签约状态，未签约：UN_SIGN,在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN") private String signStatus; /** * 意向来源（意向签约，字典枚举） */ - @ApiModelProperty(value = "意向来源（意向签约，字典枚举）") + @ApiModelProperty(value = "意向来源（意向签约，字典枚举）,DOCTOR_BILLING:医生开单") private String intentionalSource; /** @@ -164,6 +178,11 @@ public class SignPatientRecord extends BaseEntity { @ApiModelProperty(value = "开单医生姓名（意向签约）") private String billingDoctorName; + /** + * 提交时间（待续签） + */ + @ApiModelProperty(value = "提交时间（待续签）") + private Date submissionTime; /** * 金额 */ @@ -176,6 +195,12 @@ public class SignPatientRecord extends BaseEntity { @ApiModelProperty(value = "缴费状态，已缴费：PAID，未交费：UNPAID_FEES") private String paymentStatus; + /** + * 解约原因 + */ + @ApiModelProperty(value = "解约原因") + private String separateReason; + /** * 删除标识，0：未删除，1：已删除 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java new file mode 100644 index 00000000..aab54f8e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java @@ -0,0 +1,39 @@ +package com.xinelu.manage.dto.materialsinfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * @description: 素材库查询传输对象 + * @author: haown + * @create: 2024-03-04 14:02 + **/ +@ApiModel +@Data +public class MaterialsInfoDto { + + @ApiModelProperty(value = "创建时间开始，yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTimeStart; + + @ApiModelProperty(value = "创建时间结束，yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTimeEnd; + + /** 素材状态，已上架：LISTED，未上架：NOT_LISTED */ + @ApiModelProperty(value = "素材状态,已上架：LISTED，未上架：NOT_LISTED") + private String materialsStatus; + + /** 素材名称 */ + @ApiModelProperty(value = "素材名称") + private String materialsName; + + /** 素材类型，图文：IMAGE_TEXT，视频：VIDEO */ + @ApiModelProperty(value = "素材类型，图文：IMAGE_TEXT，视频：VIDEO") + @Excel(name = "素材类型，图文：IMAGE_TEXT，视频：VIDEO") + private String materialsType; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistSaveDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistSaveDto.java new file mode 100644 index 00000000..b4e2f76b --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistSaveDto.java @@ -0,0 +1,81 @@ +package com.xinelu.manage.dto.patientblacklist; + +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 患者黑名单保存传输对象 + * @author: haown + * @create: 2024-03-01 15:19 + **/ +@Data +@ApiModel("患者黑名单保存传输对象") +public class PatientBlacklistSaveDto { + + /** 患者姓名 */ + @ApiModelProperty(value = "患者姓名") + @Excel(name = "患者姓名") + private String patientName; + + /** 患者电话 */ + @ApiModelProperty(value = "患者电话") + @Excel(name = "患者电话") + private String patientPhone; + + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** 所属医院名称 */ + @ApiModelProperty(value = "所属医院名称") + private String hospitalAgencyName; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 所属院区id */ + @ApiModelProperty(value = "所属院区id") + private Long campusAgencyId; + + /** 所属院区名称 */ + @ApiModelProperty(value = "所属院区名称") + @Excel(name = "所属院区名称") + private String campusAgencyName; + + /** 所属科室名称 */ + @ApiModelProperty(value = "所属科室名称") + private String departmentName; + + /** 异常原因字典表id */ + @ApiModelProperty(value = "异常原因字典表id") + @Excel(name = "异常原因字典表id") + private Long abnormalCauseId; + + /** 异常原因字典表值 */ + @ApiModelProperty(value = "异常原因字典表值") + @Excel(name = "异常原因字典表值") + private String abnormalCauseValue; + + /** 补充说明字典表id */ + private Long supplementIllustrateId; + + /** 补充说明字典表值 */ + private String supplementIllustrateValue; + + /** 功能限制（具体来源未知？） */ + private String functionLimitation; + + /** + * 来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑, MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接) + */ + @ApiModelProperty(value = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)") + @Excel(name = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)") + private String blacklistSource; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistUpdateDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistUpdateDto.java new file mode 100644 index 00000000..61be33c4 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientblacklist/PatientBlacklistUpdateDto.java @@ -0,0 +1,45 @@ +package com.xinelu.manage.dto.patientblacklist; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 黑名单列表修改传输对象 + * @author: haown + * @create: 2024-03-01 17:03 + **/ +@ApiModel("黑名单列表修改传输对象") +@Data +public class PatientBlacklistUpdateDto { + + /** 主键id */ + @ApiModelProperty(value = "患者电话") + private Long id; + + /** 异常原因字典表id */ + @ApiModelProperty(value = "异常原因字典表id") + private Long abnormalCauseId; + + /** 异常原因字典表值 */ + @ApiModelProperty(value = "异常原因字典表值") + private String abnormalCauseValue; + + /** 补充说明字典表id */ + @ApiModelProperty(value = "补充说明字典表id") + private Long supplementIllustrateId; + + /** 补充说明字典表值 */ + @ApiModelProperty(value = "补充说明字典表值") + private String supplementIllustrateValue; + + /** 功能限制（具体来源未知？） */ + @ApiModelProperty(value = "功能限制") + private String functionLimitation; + + /** + * 来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑, MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接) + */ + @ApiModelProperty(value = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)") + private String blacklistSource; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java index 9e6297de..6bb3b936 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java @@ -21,6 +21,10 @@ public class PatientInfoDto { @ApiModelProperty(value = "患者电话") private String patientPhone; + /** 身份证号 */ + @ApiModelProperty(value = "身份证号") + private String cardNo; + /** 主要诊断 */ @ApiModelProperty(value = "主要诊断") private String mainDiagnosis; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java new file mode 100644 index 00000000..93a12824 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java @@ -0,0 +1,40 @@ +package com.xinelu.manage.dto.projectrecord; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * @description: 测量记录查询传输对象 + * @author: haown + * @create: 2024-03-01 08:52 + **/ +@ApiModel("测量记录查询传输对象") +@Data +public class ProjectRecordDto { + + /** + * 项目编码 + */ + @ApiModelProperty("项目编码") + private String projectCode; + + /** + * 患者id + */ + @ApiModelProperty("患者id") + private Long patientId; + + /** + * 检测时间 + */ + @ApiModelProperty("检测时间开始") + private Date measureTimeStart; + + /** + * 检测时间 + */ + @ApiModelProperty("检测时间结束") + private Date measureTimeEnd; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java new file mode 100644 index 00000000..187cd252 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java @@ -0,0 +1,67 @@ +package com.xinelu.manage.dto.propagandainfo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * @description: 宣教库查询传输对象 + * @author: haown + * @create: 2024-03-01 09:29 + **/ +@ApiModel("宣教库查询传输对象") +@Data +public class PropagandaInfoDto { + + /** 所属医院id */ + @ApiModelProperty(value = "所属医院id") + private Long hospitalAgencyId; + + /** 所属科室id */ + @ApiModelProperty(value = "所属科室id") + private Long departmentId; + + /** 宣教标题（宣教名称） */ + @ApiModelProperty(value = "宣教标题") + @Excel(name = "宣教标题", readConverterExp = "宣=教名称") + private String propagandaTitle; + + /** 宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE， + 定制内容：CUSTOMIZED_CONTENT */ + @ApiModelProperty(value = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT") + @Excel(name = "宣教类型，用药知识：MEDICATION_KNOWLEDGE，疾病科普：DISEASE_POPULARIZATION，运动营养：SPORT_NUTRITION，其他知识：OTHER_KNOWLEDGE，定制内容：CUSTOMIZED_CONTENT") + private String propagandaType; + + + /** 宣教ID */ + @ApiModelProperty(value = "宣教ID") + private String propagandaCode; + + /** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */ + @ApiModelProperty(value = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + @Excel(name = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + private String propagandaStatus; + + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间开始") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTimeStart; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间结束") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date createTimeEnd; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaUpdateDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaUpdateDto.java new file mode 100644 index 00000000..5932367d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaUpdateDto.java @@ -0,0 +1,26 @@ +package com.xinelu.manage.dto.propagandainfo; + +import com.xinelu.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: 宣教库修改传输对象 + * @author: haown + * @create: 2024-03-01 11:11 + **/ +@ApiModel("宣教库修改传输对象") +@Data +public class PropagandaUpdateDto { + + /** 主键id */ + @ApiModelProperty("主键id") + private Long id; + + /** 宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED */ + @ApiModelProperty(value = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + @Excel(name = "宣教状态，创作中：CREATE_PROCESS，创作完成：CREATE_COMPLETE，审核中：IN_REVIEW，审核通过：APPROVED，审核不通过：REVIEW_FAILED") + private String propagandaStatus; + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java index b6e66322..31971f04 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java @@ -23,6 +23,6 @@ public class SignPatientAddDto { private List devices; - private SignPatientInformed signPatientInformed; + private List informeds; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java index 3a2d50c8..9932bf1c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java @@ -1,5 +1,6 @@ package com.xinelu.manage.dto.signpatientrecord; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; @@ -88,14 +89,23 @@ public class SignPatientListDto { private Long wardId; /** - * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN + * 签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN */ - @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN") + @ApiModelProperty(value = "签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN") private String signStatus; /** - * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END + * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，待续签：WAIT_CONTINUOUS_SIGN */ - @ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END") + @ApiModelProperty(value = "服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END，待续签：WAIT_CONTINUOUS_SIGN") private String serviceStatus; + + @ApiModelProperty(value = "服务结束时间开始") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date serviceEndTimeStart; + + @ApiModelProperty(value = "服务结束时间结束") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date serviceEndTimeEnd; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java index 1992d7a7..ae5facdb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientStatusDto.java @@ -13,6 +13,9 @@ public class SignPatientStatusDto { private Long id; + @ApiModelProperty(value = "患者表主键") + private Long patientId; + /** * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END */ @@ -20,8 +23,14 @@ public class SignPatientStatusDto { private String serviceStatus; /** - * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN + * 签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN */ - @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN") + @ApiModelProperty(value = "签约状态，在签：IN_SIGN,解约：SEPARATE_SIGN, 过期：EXPIRE_SIGN") private String signStatus; + + /** + * 解约原因 + */ + @ApiModelProperty(value = "解约原因") + private String separateReason; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/crowdinfo/CrowdInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/crowdinfo/CrowdInfoMapper.java new file mode 100644 index 00000000..9c4eaee8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/crowdinfo/CrowdInfoMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.crowdinfo; + +import com.xinelu.manage.domain.crowdinfo.CrowdInfo; +import java.util.List; + + +/** + * 人群信息Mapper接口 + * + * @author xinelu + * @date 2024-03-04 + */ +public interface CrowdInfoMapper { + /** + * 查询人群信息 + * + * @param id 人群信息主键 + * @return 人群信息 + */ + public CrowdInfo selectCrowdInfoById(Long id); + + /** + * 查询人群信息列表 + * + * @param crowdInfo 人群信息 + * @return 人群信息集合 + */ + public List selectCrowdInfoList(CrowdInfo crowdInfo); + + /** + * 新增人群信息 + * + * @param crowdInfo 人群信息 + * @return 结果 + */ + public int insertCrowdInfo(CrowdInfo crowdInfo); + + /** + * 修改人群信息 + * + * @param crowdInfo 人群信息 + * @return 结果 + */ + public int updateCrowdInfo(CrowdInfo crowdInfo); + + /** + * 删除人群信息 + * + * @param id 人群信息主键 + * @return 结果 + */ + public int deleteCrowdInfoById(Long id); + + /** + * 批量删除人群信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteCrowdInfoByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java index 7ea98fee..6ff8158a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/materialsinfo/MaterialsInfoMapper.java @@ -1,8 +1,8 @@ package com.xinelu.manage.mapper.materialsinfo; -import java.util.List; - import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto; +import java.util.List; /** * 素材信息Mapper接口 @@ -25,7 +25,7 @@ public interface MaterialsInfoMapper { * @param materialsInfo 素材信息 * @return 素材信息集合 */ - public List selectMaterialsInfoList(MaterialsInfo materialsInfo); + public List selectMaterialsInfoList(MaterialsInfoDto materialsInfo); /** * 新增素材信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java index 62c9ac6b..f477b709 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklist/PatientBlacklistMapper.java @@ -18,7 +18,7 @@ public interface PatientBlacklistMapper { * @param id 患者-黑明单关系主键 * @return 患者-黑明单关系 */ - public PatientBlacklist selectPatientBlacklistById(Long id); + public PatientBlacklistVo selectPatientBlacklistById(Long id); /** * 查询患者-黑明单关系列表 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.java new file mode 100644 index 00000000..63ac5ec5 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.mapper.patientblacklistabnormalcause; + +import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause; +import java.util.List; + + +/** + * 患者黑名单异常原因Mapper接口 + * + * @author haown + * @date 2024-03-01 + */ +public interface PatientBlacklistAbnormalCauseMapper { + /** + * 查询患者黑名单异常原因 + * + * @param id 患者黑名单异常原因主键 + * @return 患者黑名单异常原因 + */ + public PatientBlacklistAbnormalCause selectPatientBlacklistAbnormalCauseById(Long id); + + /** + * 查询患者黑名单异常原因列表 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 患者黑名单异常原因集合 + */ + public List selectPatientBlacklistAbnormalCauseList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause); + + /** + * 新增患者黑名单异常原因 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 结果 + */ + public int insertPatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause); + + /** + * 修改患者黑名单异常原因 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 结果 + */ + public int updatePatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause); + + /** + * 删除患者黑名单异常原因 + * + * @param id 患者黑名单异常原因主键 + * @return 结果 + */ + public int deletePatientBlacklistAbnormalCauseById(Long id); + + /** + * 批量删除患者黑名单异常原因 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deletePatientBlacklistAbnormalCauseByIds(Long[] ids); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java new file mode 100644 index 00000000..76e3d275 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/project/ProjectMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.project; + +import com.xinelu.manage.domain.project.Project; + +/** +* @author haown +* @description 针对表【project(检测项目表)】的数据库操作Mapper +* @createDate 2024-03-05 16:33:33 +* @Entity com.xinelu.manage.domain.project.Project +*/ +public interface ProjectMapper { + + int deleteByPrimaryKey(Long id); + + int insert(Project record); + + int insertSelective(Project record); + + Project selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(Project record); + + int updateByPrimaryKey(Project record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java new file mode 100644 index 00000000..226ab16a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectdevice/ProjectDeviceMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectdevice; + +import com.xinelu.manage.domain.projectdevice.ProjectDevice; + +/** +* @author haown +* @description 针对表【project_device(检测项目设备表)】的数据库操作Mapper +* @createDate 2024-03-05 17:14:06 +* @Entity com.xinelu.manage.domain.projectdevice.ProjectDevice +*/ +public interface ProjectDeviceMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectDevice record); + + int insertSelective(ProjectDevice record); + + ProjectDevice selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectDevice record); + + int updateByPrimaryKey(ProjectDevice record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java new file mode 100644 index 00000000..3b2cd63a --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectgroup/ProjectGroupMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectgroup; + +import com.xinelu.manage.domain.projectgroup.ProjectGroup; + +/** +* @author haown +* @description 针对表【project_group(检测项目分组表)】的数据库操作Mapper +* @createDate 2024-03-05 16:34:58 +* @Entity com.xinelu.manage.domain.projectgroup.ProjectGroup +*/ +public interface ProjectGroupMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectGroup record); + + int insertSelective(ProjectGroup record); + + ProjectGroup selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectGroup record); + + int updateByPrimaryKey(ProjectGroup record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java new file mode 100644 index 00000000..757d6a91 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectlastrecord/ProjectLastRecordMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectlastrecord; + +import com.xinelu.manage.domain.projectlastrecord.ProjectLastRecord; + +/** +* @author haown +* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Mapper +* @createDate 2024-03-05 17:09:28 +* @Entity com.xinelu.manage.domain.projectlastrecord.ProjectLastRecord +*/ +public interface ProjectLastRecordMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectLastRecord record); + + int insertSelective(ProjectLastRecord record); + + ProjectLastRecord selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectLastRecord record); + + int updateByPrimaryKey(ProjectLastRecord record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java new file mode 100644 index 00000000..987b9252 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecord/ProjectRecordMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectrecord; + +import com.xinelu.manage.domain.projectrecord.ProjectRecord; + +/** +* @author haown +* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Mapper +* @createDate 2024-03-05 17:09:04 +* @Entity com.xinelu.manage.domain.projectrecord.ProjectRecord +*/ +public interface ProjectRecordMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectRecord record); + + int insertSelective(ProjectRecord record); + + ProjectRecord selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectRecord record); + + int updateByPrimaryKey(ProjectRecord record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java new file mode 100644 index 00000000..b3831d6c --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/projectrecordfile/ProjectRecordFileMapper.java @@ -0,0 +1,25 @@ +package com.xinelu.manage.mapper.projectrecordfile; + +import com.xinelu.manage.domain.projectrecordfile.ProjectRecordFile; + +/** +* @author haown +* @description 针对表【project_record_file(检测项目数据记录附件表（存储检测结果既含有报告又含有指标数据的检测项）)】的数据库操作Mapper +* @createDate 2024-03-05 16:36:32 +* @Entity com.xinelu.manage.domain.projectrecordfile.ProjectRecordFile +*/ +public interface ProjectRecordFileMapper { + + int deleteByPrimaryKey(Long id); + + int insert(ProjectRecordFile record); + + int insertSelective(ProjectRecordFile record); + + ProjectRecordFile selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(ProjectRecordFile record); + + int updateByPrimaryKey(ProjectRecordFile record); + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java index ba3a25ec..5684ed53 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/propagandainfo/PropagandaInfoMapper.java @@ -1,8 +1,10 @@ package com.xinelu.manage.mapper.propagandainfo; -import java.util.List; - import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.dto.department.DepartmentDTO; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.vo.department.DepartmentVO; +import java.util.List; /** * 宣教库管理Mapper接口 @@ -25,7 +27,7 @@ public interface PropagandaInfoMapper { * @param propagandaInfo 宣教库管理 * @return 宣教库管理集合 */ - public List selectPropagandaInfoList(PropagandaInfo propagandaInfo); + public List selectPropagandaInfoList(PropagandaInfoDto propagandaInfo); /** * 新增宣教库管理 @@ -58,4 +60,13 @@ public interface PropagandaInfoMapper { * @return 结果 */ public int deletePropagandaInfoByIds(Long[] ids); + + /** + * 查询科室信息列表及包含宣教库数量 + * + * @param departmentDto + * @return + */ + List selectNumByDept(DepartmentDTO departmentDto); + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java index a5a60ee8..1ac29b8b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java @@ -29,7 +29,7 @@ public interface SignPatientRecordMapper { List selectList(SignPatientListDto signPatientRecord); - SignPatientInfoVo getByRecordId(Long patientSignRecordId); + SignPatientInfoVo getByRecordId(Long id); List getByPatient(Long patientId); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/ICrowdInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/ICrowdInfoService.java new file mode 100644 index 00000000..ca1abe16 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/ICrowdInfoService.java @@ -0,0 +1,60 @@ +package com.xinelu.manage.service.crowdinfo; + +import com.xinelu.manage.domain.crowdinfo.CrowdInfo; +import java.util.List; + +/** + * 人群信息Service接口 + * + * @author xinelu + * @date 2024-03-04 + */ +public interface ICrowdInfoService { + /** + * 查询人群信息 + * + * @param id 人群信息主键 + * @return 人群信息 + */ + public CrowdInfo selectCrowdInfoById(Long id); + + /** + * 查询人群信息列表 + * + * @param crowdInfo 人群信息 + * @return 人群信息集合 + */ + public List selectCrowdInfoList(CrowdInfo crowdInfo); + + /** + * 新增人群信息 + * + * @param crowdInfo 人群信息 + * @return 结果 + */ + public int insertCrowdInfo(CrowdInfo crowdInfo); + + /** + * 修改人群信息 + * + * @param crowdInfo 人群信息 + * @return 结果 + */ + public int updateCrowdInfo(CrowdInfo crowdInfo); + + /** + * 批量删除人群信息 + * + * @param ids 需要删除的人群信息主键集合 + * @return 结果 + */ + public int deleteCrowdInfoByIds(Long[] ids); + + /** + * 删除人群信息信息 + * + * @param id 人群信息主键 + * @return 结果 + */ + public int deleteCrowdInfoById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java new file mode 100644 index 00000000..0ad4a235 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/crowdinfo/impl/CrowdInfoServiceImpl.java @@ -0,0 +1,92 @@ +package com.xinelu.manage.service.crowdinfo.impl; + +import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.manage.domain.crowdinfo.CrowdInfo; +import com.xinelu.manage.mapper.crowdinfo.CrowdInfoMapper; +import com.xinelu.manage.service.crowdinfo.ICrowdInfoService; +import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 人群信息Service业务层处理 + * + * @author xinelu + * @date 2024-03-04 + */ +@Service +public class CrowdInfoServiceImpl implements ICrowdInfoService { + @Resource + private CrowdInfoMapper crowdInfoMapper; + + /** + * 查询人群信息 + * + * @param id 人群信息主键 + * @return 人群信息 + */ + @Override + public CrowdInfo selectCrowdInfoById(Long id) { + return crowdInfoMapper.selectCrowdInfoById(id); + } + + /** + * 查询人群信息列表 + * + * @param crowdInfo 人群信息 + * @return 人群信息 + */ + @Override + public List selectCrowdInfoList(CrowdInfo crowdInfo) { + return crowdInfoMapper.selectCrowdInfoList(crowdInfo); + } + + /** + * 新增人群信息 + * + * @param crowdInfo 人群信息 + * @return 结果 + */ + @Override + public int insertCrowdInfo(CrowdInfo crowdInfo) { + crowdInfo.setCreateTime(DateUtils.getNowDate()); + crowdInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + return crowdInfoMapper.insertCrowdInfo(crowdInfo); + } + + /** + * 修改人群信息 + * + * @param crowdInfo 人群信息 + * @return 结果 + */ + @Override + public int updateCrowdInfo(CrowdInfo crowdInfo) { + crowdInfo.setUpdateTime(DateUtils.getNowDate()); + crowdInfo.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + return crowdInfoMapper.updateCrowdInfo(crowdInfo); + } + + /** + * 批量删除人群信息 + * + * @param ids 需要删除的人群信息主键 + * @return 结果 + */ + @Override + public int deleteCrowdInfoByIds(Long[] ids) { + return crowdInfoMapper.deleteCrowdInfoByIds(ids); + } + + /** + * 删除人群信息信息 + * + * @param id 人群信息主键 + * @return 结果 + */ + @Override + public int deleteCrowdInfoById(Long id) { + return crowdInfoMapper.deleteCrowdInfoById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java index 51a848ad..b5526038 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/IMaterialsInfoService.java @@ -1,8 +1,8 @@ package com.xinelu.manage.service.materialsinfo; -import java.util.List; - import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto; +import java.util.List; /** * 素材信息Service接口 @@ -25,7 +25,7 @@ public interface IMaterialsInfoService { * @param materialsInfo 素材信息 * @return 素材信息集合 */ - public List selectMaterialsInfoList(MaterialsInfo materialsInfo); + public List selectMaterialsInfoList(MaterialsInfoDto materialsInfo); /** * 新增素材信息 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java index bbf5ec33..cd0b6512 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/materialsinfo/impl/MaterialsInfoServiceImpl.java @@ -1,12 +1,13 @@ package com.xinelu.manage.service.materialsinfo.impl; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; +import com.xinelu.manage.dto.materialsinfo.MaterialsInfoDto; +import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper; +import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService; import java.util.List; - import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.materialsinfo.MaterialsInfoMapper; -import com.xinelu.manage.domain.materialsinfo.MaterialsInfo; -import com.xinelu.manage.service.materialsinfo.IMaterialsInfoService; /** * 素材信息Service业务层处理 @@ -37,7 +38,7 @@ public class MaterialsInfoServiceImpl implements IMaterialsInfoService { * @return 素材信息 */ @Override - public List selectMaterialsInfoList(MaterialsInfo materialsInfo) { + public List selectMaterialsInfoList(MaterialsInfoDto materialsInfo) { return materialsInfoMapper.selectMaterialsInfoList(materialsInfo); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java index 27a2578e..71ca65a3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/IPatientBlacklistService.java @@ -2,6 +2,7 @@ package com.xinelu.manage.service.patientblacklist; import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistSaveDto; import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; import java.util.List; @@ -18,7 +19,7 @@ public interface IPatientBlacklistService { * @param id 患者-黑明单关系主键 * @return 患者-黑明单关系 */ - public PatientBlacklist selectPatientBlacklistById(Long id); + public PatientBlacklistVo selectPatientBlacklistById(Long id); /** * 查询患者-黑明单关系列表 @@ -31,10 +32,10 @@ public interface IPatientBlacklistService { /** * 新增患者-黑明单关系 * - * @param patientBlacklist 患者-黑明单关系 + * @param blacklistSaveDto 患者-黑明单关系 * @return 结果 */ - public int insertPatientBlacklist(PatientBlacklist patientBlacklist); + public int insertPatientBlacklist(PatientBlacklistSaveDto blacklistSaveDto); /** * 修改患者-黑明单关系 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java index ae2a4d41..675c0f9f 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklist/impl/PatientBlacklistServiceImpl.java @@ -1,15 +1,22 @@ package com.xinelu.manage.service.patientblacklist.impl; +import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.manage.domain.patientblacklist.PatientBlacklist; +import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.dto.patientblacklist.PatientBlacklistDto; +import com.xinelu.manage.dto.patientblacklist.PatientBlacklistSaveDto; +import com.xinelu.manage.dto.patientinfo.PatientInfoDto; import com.xinelu.manage.mapper.patientblacklist.PatientBlacklistMapper; +import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.service.patientblacklist.IPatientBlacklistService; import com.xinelu.manage.vo.patientblacklist.PatientBlacklistVo; import java.util.Date; import java.util.List; import javax.annotation.Resource; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** * 患者-黑明单关系Service业务层处理 @@ -22,6 +29,9 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService { @Resource private PatientBlacklistMapper patientBlacklistMapper; + @Resource + private PatientInfoMapper patientInfoMapper; + /** * 查询患者-黑明单关系 * @@ -29,7 +39,7 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService { * @return 患者-黑明单关系 */ @Override - public PatientBlacklist selectPatientBlacklistById(Long id) { + public PatientBlacklistVo selectPatientBlacklistById(Long id) { return patientBlacklistMapper.selectPatientBlacklistById(id); } @@ -47,11 +57,26 @@ public class PatientBlacklistServiceImpl implements IPatientBlacklistService { /** * 新增患者-黑明单关系 * - * @param patientBlacklist 患者-黑明单关系 + * @param blacklistSaveDto 患者-黑明单关系 * @return 结果 */ @Override - public int insertPatientBlacklist(PatientBlacklist patientBlacklist) { + public int insertPatientBlacklist(PatientBlacklistSaveDto blacklistSaveDto) { + // 根据患者姓名、身份证号查询患者 + PatientInfoDto patientInfoDto = new PatientInfoDto(); + patientInfoDto.setPatientName(blacklistSaveDto.getPatientName()); + patientInfoDto.setPatientPhone(blacklistSaveDto.getPatientPhone()); + patientInfoDto.setCardNo(blacklistSaveDto.getCardNo()); + List patientList = patientInfoMapper.selectPatientInfoList(patientInfoDto); + if (CollectionUtils.isEmpty(patientList)) { + throw new ServiceException("未找到该患者，请确认姓名身份证号手机号是否正确"); + } + if (patientList.size() > 1) { + throw new ServiceException("找到多名患者信息，请确认姓名身份证号手机号是否正确"); + } + PatientBlacklist patientBlacklist = new PatientBlacklist(); + BeanUtils.copyBeanProp(patientBlacklist, blacklistSaveDto); + patientBlacklist.setPatientId(patientList.get(0).getId()); patientBlacklist.setDelFlag(0); patientBlacklist.setCreateTime(DateUtils.getNowDate()); return patientBlacklistMapper.insertPatientBlacklist(patientBlacklist); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/IPatientBlacklistAbnormalCauseService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/IPatientBlacklistAbnormalCauseService.java new file mode 100644 index 00000000..90f6a530 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/IPatientBlacklistAbnormalCauseService.java @@ -0,0 +1,61 @@ +package com.xinelu.manage.service.patientblacklistabnormalcause; + +import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause; +import java.util.List; + + +/** + * 患者黑名单异常原因Service接口 + * + * @author haown + * @date 2024-03-01 + */ +public interface IPatientBlacklistAbnormalCauseService { + /** + * 查询患者黑名单异常原因 + * + * @param id 患者黑名单异常原因主键 + * @return 患者黑名单异常原因 + */ + public PatientBlacklistAbnormalCause selectPatientBlacklistAbnormalCauseById(Long id); + + /** + * 查询患者黑名单异常原因列表 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 患者黑名单异常原因集合 + */ + public List selectPatientBlacklistAbnormalCauseList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause); + + /** + * 新增患者黑名单异常原因 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 结果 + */ + public int insertPatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause); + + /** + * 修改患者黑名单异常原因 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 结果 + */ + public int updatePatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause); + + /** + * 批量删除患者黑名单异常原因 + * + * @param ids 需要删除的患者黑名单异常原因主键集合 + * @return 结果 + */ + public int deletePatientBlacklistAbnormalCauseByIds(Long[] ids); + + /** + * 删除患者黑名单异常原因信息 + * + * @param id 患者黑名单异常原因主键 + * @return 结果 + */ + public int deletePatientBlacklistAbnormalCauseById(Long id); +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/impl/PatientBlacklistAbnormalCauseServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/impl/PatientBlacklistAbnormalCauseServiceImpl.java new file mode 100644 index 00000000..01491851 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientblacklistabnormalcause/impl/PatientBlacklistAbnormalCauseServiceImpl.java @@ -0,0 +1,89 @@ +package com.xinelu.manage.service.patientblacklistabnormalcause.impl; + +import com.xinelu.common.utils.DateUtils; +import com.xinelu.manage.domain.patientblacklistabnormalcause.PatientBlacklistAbnormalCause; +import com.xinelu.manage.mapper.patientblacklistabnormalcause.PatientBlacklistAbnormalCauseMapper; +import com.xinelu.manage.service.patientblacklistabnormalcause.IPatientBlacklistAbnormalCauseService; +import java.util.List; +import javax.annotation.Resource; +import org.springframework.stereotype.Service; + +/** + * 患者黑名单异常原因Service业务层处理 + * + * @author haown + * @date 2024-03-01 + */ +@Service +public class PatientBlacklistAbnormalCauseServiceImpl implements IPatientBlacklistAbnormalCauseService { + @Resource + private PatientBlacklistAbnormalCauseMapper patientBlacklistAbnormalCauseMapper; + + /** + * 查询患者黑名单异常原因 + * + * @param id 患者黑名单异常原因主键 + * @return 患者黑名单异常原因 + */ + @Override + public PatientBlacklistAbnormalCause selectPatientBlacklistAbnormalCauseById(Long id) { + return patientBlacklistAbnormalCauseMapper.selectPatientBlacklistAbnormalCauseById(id); + } + + /** + * 查询患者黑名单异常原因列表 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 患者黑名单异常原因 + */ + @Override + public List selectPatientBlacklistAbnormalCauseList(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + return patientBlacklistAbnormalCauseMapper.selectPatientBlacklistAbnormalCauseList(patientBlacklistAbnormalCause); + } + + /** + * 新增患者黑名单异常原因 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 结果 + */ + @Override + public int insertPatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + patientBlacklistAbnormalCause.setCreateTime(DateUtils.getNowDate()); + return patientBlacklistAbnormalCauseMapper.insertPatientBlacklistAbnormalCause(patientBlacklistAbnormalCause); + } + + /** + * 修改患者黑名单异常原因 + * + * @param patientBlacklistAbnormalCause 患者黑名单异常原因 + * @return 结果 + */ + @Override + public int updatePatientBlacklistAbnormalCause(PatientBlacklistAbnormalCause patientBlacklistAbnormalCause) { + patientBlacklistAbnormalCause.setUpdateTime(DateUtils.getNowDate()); + return patientBlacklistAbnormalCauseMapper.updatePatientBlacklistAbnormalCause(patientBlacklistAbnormalCause); + } + + /** + * 批量删除患者黑名单异常原因 + * + * @param ids 需要删除的患者黑名单异常原因主键 + * @return 结果 + */ + @Override + public int deletePatientBlacklistAbnormalCauseByIds(Long[] ids) { + return patientBlacklistAbnormalCauseMapper.deletePatientBlacklistAbnormalCauseByIds(ids); + } + + /** + * 删除患者黑名单异常原因信息 + * + * @param id 患者黑名单异常原因主键 + * @return 结果 + */ + @Override + public int deletePatientBlacklistAbnormalCauseById(Long id) { + return patientBlacklistAbnormalCauseMapper.deletePatientBlacklistAbnormalCauseById(id); + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java new file mode 100644 index 00000000..fb47bbb7 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/IProjectService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.project; + +/** +* @author haown +* @description 针对表【project(检测项目表)】的数据库操作Service +* @createDate 2024-02-29 15:10:38 +*/ +public interface IProjectService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java new file mode 100644 index 00000000..1fd2f0f8 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/project/impl/ProjectServiceImpl.java @@ -0,0 +1,14 @@ +package com.xinelu.manage.service.project.impl; + +import com.xinelu.manage.service.project.IProjectService; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【project(检测项目表)】的数据库操作Service实现 +* @createDate 2024-02-29 15:10:38 +*/ +@Service +public class ProjectServiceImpl implements IProjectService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java new file mode 100644 index 00000000..7a5aa2c7 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/IProjectDeviceService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.projectdevice; + +/** +* @author haown +* @description 针对表【project_device(检测项目设备表)】的数据库操作Service +* @createDate 2024-02-29 15:15:14 +*/ +public interface IProjectDeviceService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java new file mode 100644 index 00000000..7d752099 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectdevice/impl/ProjectDeviceServiceImpl.java @@ -0,0 +1,14 @@ +package com.xinelu.manage.service.projectdevice.impl; + +import com.xinelu.manage.service.projectdevice.IProjectDeviceService; +import org.springframework.stereotype.Service; + +/** +* @author Administrator +* @description 针对表【project_device(检测项目设备表)】的数据库操作Service实现 +* @createDate 2024-02-29 15:15:14 +*/ +@Service +public class ProjectDeviceServiceImpl implements IProjectDeviceService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java new file mode 100644 index 00000000..da067932 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/IProjectGroupService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.projectgroup; + +/** +* @author haown +* @description 针对表【project_group(检测项目分组表)】的数据库操作Service +* @createDate 2024-02-29 15:19:16 +*/ +public interface IProjectGroupService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java new file mode 100644 index 00000000..07f790ba --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectgroup/impl/ProjectGroupServiceImpl.java @@ -0,0 +1,14 @@ +package com.xinelu.manage.service.projectgroup.impl; + +import com.xinelu.manage.service.projectgroup.IProjectGroupService; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【project_group(检测项目分组表)】的数据库操作Service实现 +* @createDate 2024-02-29 15:19:16 +*/ +@Service +public class ProjectGroupServiceImpl implements IProjectGroupService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java new file mode 100644 index 00000000..d87f2d1d --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/IProjectLastRecordService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.projectlastrecord; + +/** +* @author haown +* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Service +* @createDate 2024-02-29 15:20:41 +*/ +public interface IProjectLastRecordService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java new file mode 100644 index 00000000..bb9f777e --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectlastrecord/impl/ProjectLastRecordServiceImpl.java @@ -0,0 +1,14 @@ +package com.xinelu.manage.service.projectlastrecord.impl; + +import com.xinelu.manage.service.projectlastrecord.IProjectLastRecordService; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【project_last_record(最近一次检测项目数据记录表)】的数据库操作Service实现 +* @createDate 2024-02-29 15:20:41 +*/ +@Service +public class ProjectLastRecordServiceImpl implements IProjectLastRecordService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java new file mode 100644 index 00000000..85cb8919 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/IProjectRecordService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.projectrecord; + +/** +* @author haown +* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Service +* @createDate 2024-02-29 15:22:15 +*/ +public interface IProjectRecordService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java new file mode 100644 index 00000000..0bfa281b --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecord/impl/ProjectRecordServiceImpl.java @@ -0,0 +1,14 @@ +package com.xinelu.manage.service.projectrecord.impl; + +import com.xinelu.manage.service.projectrecord.IProjectRecordService; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【project_record(检测项目数据记录表)】的数据库操作Service实现 +* @createDate 2024-02-29 15:22:15 +*/ +@Service +public class ProjectRecordServiceImpl implements IProjectRecordService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java new file mode 100644 index 00000000..cd42f07c --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/IProjectRecordFileService.java @@ -0,0 +1,10 @@ +package com.xinelu.manage.service.projectrecordfile; + +/** +* @author haown +* @description 针对表【project_record_file(检测项目数据记录附件表（扩展）)】的数据库操作Service +* @createDate 2024-02-29 15:23:25 +*/ +public interface IProjectRecordFileService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java new file mode 100644 index 00000000..c071974f --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/projectrecordfile/impl/ProjectRecordFileServiceImpl.java @@ -0,0 +1,14 @@ +package com.xinelu.manage.service.projectrecordfile.impl; + +import com.xinelu.manage.service.projectrecordfile.IProjectRecordFileService; +import org.springframework.stereotype.Service; + +/** +* @author haown +* @description 针对表【project_record_file(检测项目数据记录附件表（扩展）)】的数据库操作Service实现 +* @createDate 2024-02-29 15:23:25 +*/ +@Service +public class ProjectRecordFileServiceImpl implements IProjectRecordFileService { + +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java index d19da141..2d1294ec 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/IPropagandaInfoService.java @@ -1,8 +1,11 @@ package com.xinelu.manage.service.propagandainfo; -import java.util.List; - import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.dto.department.DepartmentDTO; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; +import com.xinelu.manage.vo.department.DepartmentVO; +import java.util.List; /** * 宣教库管理Service接口 @@ -25,7 +28,7 @@ public interface IPropagandaInfoService { * @param propagandaInfo 宣教库管理 * @return 宣教库管理集合 */ - public List selectPropagandaInfoList(PropagandaInfo propagandaInfo); + public List selectPropagandaInfoList(PropagandaInfoDto propagandaInfo); /** * 新增宣教库管理 @@ -43,6 +46,22 @@ public interface IPropagandaInfoService { */ public int updatePropagandaInfo(PropagandaInfo propagandaInfo); + /** + * 复制宣教库管理 + * + * @param id 宣教库id + * @return 结果 + */ + public int copyPropagandaInfo(Long id); + + /** + * 修改宣教库管理 + * + * @param propagandaInfo 宣教库管理 + * @return 结果 + */ + public int updateStatus(PropagandaUpdateDto propagandaInfo); + /** * 批量删除宣教库管理 * @@ -58,4 +77,12 @@ public interface IPropagandaInfoService { * @return 结果 */ public int deletePropagandaInfoById(Long id); + + /** + * 查询科室信息列表及包含宣教信息数量 + * + * @param departmentDto + * @return + */ + List selectNumByDept(DepartmentDTO departmentDto); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java index 3b2d89ab..c6058075 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/propagandainfo/impl/PropagandaInfoServiceImpl.java @@ -1,12 +1,17 @@ package com.xinelu.manage.service.propagandainfo.impl; +import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; +import com.xinelu.manage.dto.department.DepartmentDTO; +import com.xinelu.manage.dto.propagandainfo.PropagandaInfoDto; +import com.xinelu.manage.dto.propagandainfo.PropagandaUpdateDto; +import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper; +import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; +import com.xinelu.manage.vo.department.DepartmentVO; import java.util.List; - import com.xinelu.common.utils.DateUtils; import javax.annotation.Resource; import org.springframework.stereotype.Service; -import com.xinelu.manage.mapper.propagandainfo.PropagandaInfoMapper; -import com.xinelu.manage.domain.propagandainfo.PropagandaInfo; -import com.xinelu.manage.service.propagandainfo.IPropagandaInfoService; /** * 宣教库管理Service业务层处理 @@ -37,7 +42,7 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { * @return 宣教库管理 */ @Override - public List selectPropagandaInfoList(PropagandaInfo propagandaInfo) { + public List selectPropagandaInfoList(PropagandaInfoDto propagandaInfo) { return propagandaInfoMapper.selectPropagandaInfoList(propagandaInfo); } @@ -61,11 +66,30 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { */ @Override public int updatePropagandaInfo(PropagandaInfo propagandaInfo) { - propagandaInfo.setUpdateTime(DateUtils.getNowDate()); + propagandaInfo.setUpdateTime(DateUtils.getNowDate()); return propagandaInfoMapper.updatePropagandaInfo(propagandaInfo); } - /** + @Override public int copyPropagandaInfo(Long id) { + PropagandaInfo propagandaInfo = propagandaInfoMapper.selectPropagandaInfoById(id); + propagandaInfo.setId(null); + propagandaInfo.setCreateTime(DateUtils.getNowDate()); + propagandaInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName()); + propagandaInfo.setUpdateTime(null); + propagandaInfo.setUpdateBy(null); + propagandaInfo.setPropagandaCode(propagandaInfo.getPropagandaCode() + "-COPY"); + propagandaInfo.setPropagandaStatus("CREATE_COMPLETE"); + return propagandaInfoMapper.insertPropagandaInfo(propagandaInfo); + } + + @Override public int updateStatus(PropagandaUpdateDto propagandaInfo) { + PropagandaInfo body = new PropagandaInfo(); + body.setId(propagandaInfo.getId()); + body.setPropagandaStatus(propagandaInfo.getPropagandaStatus()); + return propagandaInfoMapper.updatePropagandaInfo(body); + } + + /** * 批量删除宣教库管理 * * @param ids 需要删除的宣教库管理主键 @@ -86,4 +110,8 @@ public class PropagandaInfoServiceImpl implements IPropagandaInfoService { public int deletePropagandaInfoById(Long id) { return propagandaInfoMapper.deletePropagandaInfoById(id); } + + @Override public List selectNumByDept(DepartmentDTO departmentDto) { + return propagandaInfoMapper.selectNumByDept(departmentDto); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/IFileUploadService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/IFileUploadService.java new file mode 100644 index 00000000..134dc3f6 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/IFileUploadService.java @@ -0,0 +1,20 @@ +package com.xinelu.manage.service.signpatientinformed; + +import com.xinelu.common.core.domain.AjaxResult; +import org.springframework.web.multipart.MultipartFile; + +/** + * 文件上传Service接口 + * + * @author xinelu + * @date 2024-02-27 + */ +public interface IFileUploadService { + /** + * 文件上传接口 + * + * @param multipartFile 文件 + * @return + **/ + AjaxResult uploadFile(MultipartFile multipartFile, String type) throws Exception; +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java index 2d0248b2..942fb6a5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/ISignPatientInformedService.java @@ -1,11 +1,7 @@ package com.xinelu.manage.service.signpatientinformed; -import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.exception.file.InvalidExtensionException; import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; -import java.io.IOException; import java.util.List; -import org.springframework.web.multipart.MultipartFile; /** * 签约知情同意书信息Service接口 @@ -62,6 +58,5 @@ public interface ISignPatientInformedService { */ public int deleteSignPatientInformedById(Long id); - AjaxResult uploadFile(MultipartFile multipartFile) throws IOException, InvalidExtensionException; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/FileUplooadServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/FileUplooadServiceImpl.java new file mode 100644 index 00000000..6a8e3616 --- /dev/null +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/FileUplooadServiceImpl.java @@ -0,0 +1,66 @@ +package com.xinelu.manage.service.signpatientinformed.impl; + +import com.xinelu.common.config.SystemBusinessConfig; +import com.xinelu.common.constant.FileUploadPathConstants; +import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.exception.ServiceException; +import com.xinelu.common.utils.file.FileUploadUtils; +import com.xinelu.common.utils.file.MimeTypeUtils; +import com.xinelu.manage.service.signpatientinformed.IFileUploadService; +import javax.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +/** + * @description: 文件上传Service业务层处理 + * @author: haown + * @create: 2024-03-01 10:36 + **/ +@Service +public class FileUplooadServiceImpl implements IFileUploadService { + + @Resource + private SystemBusinessConfig systemBusinessConfig; + + @Override public AjaxResult uploadFile(MultipartFile multipartFile, String type) throws Exception { + //获取不同的文件路径 + String uploadPathUrl = ""; + switch (type) { + // 签约知情书 + case FileUploadPathConstants.SIGN_INFORMED_TYPE: + uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getSignInformedFileUrl(); + break; + //护理宣教库封面路径上传 + case FileUploadPathConstants.PROPAGANDA_COVER_TYPE: + uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getPropagandaCoverUrl(); + break; + //素材库封面图片路径上传 + case FileUploadPathConstants.MATERIALS_COVER_TYPE: + uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getMaterialsCoverUrl(); + break; + //素材库视频路径上传 + case FileUploadPathConstants.MATERIALS_VIDEO_TYPE: + uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getMaterialsVideoUrl(); + break; + default: + break; + } + if (StringUtils.isBlank(uploadPathUrl)) { + return AjaxResult.success(); + } + //上传 + String pictureName = ""; + if (StringUtils.equals(type, FileUploadPathConstants.MATERIALS_VIDEO_TYPE)) { + pictureName = FileUploadUtils.upload(uploadPathUrl, multipartFile, MimeTypeUtils.VIDEO_EXTENSION); + } else { + pictureName = FileUploadUtils.upload(uploadPathUrl, multipartFile, MimeTypeUtils.IMAGE_EXTENSION); + } + if (StringUtils.isBlank(pictureName)) { + throw new ServiceException("图片上传失败，请联系管理员！"); + } + AjaxResult ajax = AjaxResult.success("上传成功！"); + ajax.put("imgUrl", pictureName); + return ajax; + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java index 43a45406..02194ac4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientinformed/impl/SignPatientInformedServiceImpl.java @@ -1,21 +1,12 @@ package com.xinelu.manage.service.signpatientinformed.impl; -import com.xinelu.common.config.SystemBusinessConfig; -import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.exception.ServiceException; -import com.xinelu.common.exception.file.InvalidExtensionException; import com.xinelu.common.utils.DateUtils; -import com.xinelu.common.utils.file.FileUploadUtils; -import com.xinelu.common.utils.file.MimeTypeUtils; import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper; import com.xinelu.manage.service.signpatientinformed.ISignPatientInformedService; -import java.io.IOException; import java.util.List; import javax.annotation.Resource; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; /** * 签约知情同意书信息Service业务层处理 @@ -27,8 +18,6 @@ import org.springframework.web.multipart.MultipartFile; public class SignPatientInformedServiceImpl implements ISignPatientInformedService { @Resource private SignPatientInformedMapper signPatientInformedMapper; - @Resource - private SystemBusinessConfig systemBusinessConfig; /** * 查询签约知情同意书信息 @@ -98,19 +87,4 @@ public class SignPatientInformedServiceImpl implements ISignPatientInformedServi return signPatientInformedMapper.deleteSignPatientInformedById(id); } - @Override public AjaxResult uploadFile(MultipartFile multipartFile) throws IOException, InvalidExtensionException { - //获取不同的文件路径 - String uploadPathUrl = SystemBusinessConfig.getProfile() + systemBusinessConfig.getSignInformedFileUrl(); - if (StringUtils.isBlank(uploadPathUrl)) { - return AjaxResult.success(); - } - //上传 - String pictureName = FileUploadUtils.uploadSystemBusinessPath(uploadPathUrl, multipartFile, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION); - if (StringUtils.isBlank(pictureName)) { - throw new ServiceException("文件上传失败，请联系管理员！"); - } - AjaxResult ajax = AjaxResult.success("上传成功！"); - ajax.put("fileUrl", pictureName); - return ajax; - } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java index e03e6792..e8332221 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/ISignPatientRecordService.java @@ -19,10 +19,10 @@ public interface ISignPatientRecordService { /** * 根据签约编号查询居民签约信息 - * @param patientSignRecordId + * @param id * @return */ - SignPatientInfoVo getByRecordId(Long patientSignRecordId); + SignPatientInfoVo getByRecordId(Long id); /** * 根据患者主键查询患者签约记录列表 diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java index cd562ac0..c71e99b1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java @@ -4,25 +4,32 @@ import com.xinelu.common.constant.PaymentStatusConstants; import com.xinelu.common.constant.SignRecordServiceStatusConstants; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.DateUtils; +import com.xinelu.common.utils.SecurityUtils; +import com.xinelu.common.utils.StringUtils; +import com.xinelu.manage.domain.patientinfo.PatientInfo; import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; import com.xinelu.manage.domain.signpatientpackage.SignPatientPackage; import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord; -import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientAddDto; import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto; +import com.xinelu.manage.dto.signpatientrecord.SignPatientStatusDto; +import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper; import com.xinelu.manage.mapper.signpatientinformed.SignPatientInformedMapper; -import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper; import com.xinelu.manage.mapper.signpatientpackage.SignPatientPackageMapper; +import com.xinelu.manage.mapper.signpatientpackagehardware.SignPatientPackageHardwareMapper; import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper; import com.xinelu.manage.service.signpatientrecord.ISignPatientRecordService; import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo; -import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo; +import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo; +import java.util.Calendar; import java.util.List; import javax.annotation.Resource; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.time.DateFormatUtils; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; /** @@ -42,29 +49,54 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { private SignPatientPackageHardwareMapper hardwareMapper; @Resource private SignPatientInformedMapper informedMapper; + @Resource + private PatientInfoMapper patientInfoMapper; + @Resource + private SignPatientPackageHardwareMapper signPatientPackageHardwareMapper; + @Resource + private SignPatientInformedMapper signPatientInformedMapper; @Override public List selectList(SignPatientListDto signPatientRecord) { return signPatientRecordMapper.selectList(signPatientRecord); } - @Override public SignPatientInfoVo getByRecordId(Long patientSignRecordId) { - return signPatientRecordMapper.getByRecordId(patientSignRecordId); + @Override public SignPatientInfoVo getByRecordId(Long id) { + SignPatientInfoVo signPatientInfoVo = signPatientRecordMapper.getByRecordId(id); + // 根据签约记录主键查询设备列表 + SignPatientPackageHardware queryDevice = new SignPatientPackageHardware(); + queryDevice.setSignPatientRecordId(id); + List devices = signPatientPackageHardwareMapper.selectSignPatientPackageHardwareList(queryDevice); + signPatientInfoVo.setSignDevices(devices); + + SignPatientInformed signPatientInformed = new SignPatientInformed(); + signPatientInformed.setSignPatientRecordId(id); + List informeds = signPatientInformedMapper.selectSignPatientInformedList(signPatientInformed); + signPatientInfoVo.setSignPatientInformeds(informeds); + return signPatientInfoVo; } @Override public List getByPatient(Long patientId) { return signPatientRecordMapper.getByPatient(patientId); } - @Override public int add(SignPatientAddDto body) { + @Override + @Transactional(rollbackFor = Exception.class) + public int add(SignPatientAddDto body) { SignPatientPackage signPatientPackage = body.getSignPackage(); if (ObjectUtils.isNotEmpty(body.getRecord())) { SignPatientRecord signPatientRecord = body.getRecord(); + signPatientRecord.setId(null); if (signPatientRecord.getPatientId() == null) { throw new ServiceException("数据错误"); } + PatientInfo patient = patientInfoMapper.selectPatientInfoById(signPatientRecord.getPatientId()); + if (ObjectUtils.isEmpty(patient)) { + throw new ServiceException("请选择签约居民"); + } signPatientRecord.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER); signPatientRecord.setDelFlag(0); signPatientRecord.setPaymentStatus(PaymentStatusConstants.UNPAID_FEES); + signPatientRecord.setSignTime(DateUtils.getNowDate()); signPatientRecord.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN); if (signPatientPackage != null) { @@ -72,7 +104,12 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { } else { throw new ServiceException("请选择服务包"); } - + // 签约信息保存到患者表 + patient.setSignPatientRecordId(signPatientRecord.getId()); + patient.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN); + patient.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER); + patient.setSignTime(DateUtils.getNowDate()); + patientInfoMapper.updatePatientInfo(patient); // 保存签约记录 int flag = signPatientRecordMapper.insert(signPatientRecord); if (flag > 0) { @@ -81,22 +118,48 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { signPatientPackage.setSignPatientRecordId(signPatientRecord.getId()); signPatientPackage.setPatientId(signPatientRecord.getPatientId()); signPatientPackage.setPackagePaymentStatus(PaymentStatusConstants.UNPAID_FEES); - signPatientPackageMapper.insertSignPatientPackage(signPatientPackage); - // 保存硬件 - if (!CollectionUtils.isEmpty(body.getDevices())) { - for(SignPatientPackageHardware hardware : body.getDevices()) { - hardware.setSignPatientRecordId(signPatientRecord.getId()); - hardwareMapper.insertSignPatientPackageHardware(hardware); + if (signPatientPackage.getServiceStartTime() == null) { + signPatientPackage.setServiceStartTime(DateUtils.parseDate(DateFormatUtils.format(DateUtils.getNowDate(), "yyyy-MM-dd") + " 00:00:00")); + Calendar calendar = Calendar.getInstance(); + // 将日期设置为1号（每次计算都从第一天开始） + calendar.setTime(DateUtils.getNowDate()); + // 添加一个月 + calendar.add(Calendar.MONTH, signPatientPackage.getServiceCycle()); + // 再减去一天 + calendar.add(Calendar.DATE, -1); + signPatientPackage.setServiceEndTime(DateUtils.parseDate(DateFormatUtils.format(calendar.getTime(), "yyyy-MM-dd") + " 23:59:59")); + } else { + signPatientPackage.setServiceStartTime(DateUtils.parseDate(DateFormatUtils.format(signPatientPackage.getServiceStartTime(), "yyyy-MM-dd") + " 00:00:00")); + if (signPatientPackage.getServiceStartTime() == null) { + Calendar calendar = Calendar.getInstance(); + // 将日期设置为1号（每次计算都从第一天开始） + calendar.setTime(signPatientPackage.getServiceStartTime()); + // 添加一个月 + calendar.add(Calendar.MONTH, signPatientPackage.getServiceCycle()); + // 再减去一天 + calendar.add(Calendar.DATE, -1); + signPatientPackage.setServiceEndTime(DateUtils.parseDate(DateFormatUtils.format(calendar.getTime(), "yyyy-MM-dd") + " 23:59:59")); + } else { + signPatientPackage.setServiceEndTime(DateUtils.parseDate(DateFormatUtils.format(signPatientPackage.getServiceEndTime(), "yyyy-MM-dd") + " 23:59:59")); } } + signPatientPackageMapper.insertSignPatientPackage(signPatientPackage); + } + // 保存硬件 + if (!CollectionUtils.isEmpty(body.getDevices())) { + for(SignPatientPackageHardware hardware : body.getDevices()) { + hardware.setSignPatientRecordId(signPatientRecord.getId()); + hardwareMapper.insertSignPatientPackageHardware(hardware); + } } // 保存告知书 - if (body.getSignPatientInformed() != null) { - SignPatientInformed informed = new SignPatientInformed(); - informed.setSignPatientRecordId(signPatientRecord.getId()); - informed.setPatientId(signPatientRecord.getPatientId()); - informedMapper.insertSignPatientInformed(informed); + if (!CollectionUtils.isEmpty(body.getInformeds())) { + for (SignPatientInformed informed : body.getInformeds()) { + informed.setSignPatientRecordId(signPatientRecord.getId()); + informed.setPatientId(signPatientRecord.getPatientId()); + informedMapper.insertSignPatientInformed(informed); + } } } return flag; @@ -104,14 +167,30 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService { return 0; } - @Override public int updateSignStatus(SignPatientStatusDto patientCancelSignDto) { + @Override + @Transactional(rollbackFor = Exception.class) + public int updateSignStatus(SignPatientStatusDto patientCancelSignDto) { + if (patientCancelSignDto.getPatientId() == null) { + throw new ServiceException("居民主键不能为空"); + } // 修改签约记录状态 SignPatientRecord signRecord = new SignPatientRecord(); signRecord.setId(patientCancelSignDto.getId()); signRecord.setSignStatus(patientCancelSignDto.getSignStatus()); signRecord.setServiceStatus(patientCancelSignDto.getServiceStatus()); + signRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName()); signRecord.setUpdateTime(DateUtils.getNowDate()); + signRecord.setSeparateReason(patientCancelSignDto.getSeparateReason()); + if (StringUtils.equals(SignRecordServiceStatusConstants.SEPARATE_SIGN, patientCancelSignDto.getSignStatus())) { + + PatientInfo patient = patientInfoMapper.selectPatientInfoById(patientCancelSignDto.getPatientId()); + // 签约信息保存到患者表 + patient.setSignStatus(patientCancelSignDto.getSignStatus()); + patient.setServiceStatus(patientCancelSignDto.getServiceStatus()); + patientInfoMapper.updatePatientInfo(patient); + } int flag = signPatientRecordMapper.updateByPrimaryKeySelective(signRecord); return flag; } + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java index 231866b4..758c1d31 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java @@ -67,12 +67,21 @@ public class PatientBlacklistVo { @ApiModelProperty(value = "异常原因字典表值") private String abnormalCauseValue; + /** 补充说明字典表id */ + private Long supplementIllustrateId; + + /** 补充说明字典表值 */ + private String supplementIllustrateValue; + /** * 来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑, MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接) */ @ApiModelProperty(value = "来源(CALL_DETECTION：通话检测，MANUAL_BLACKOUT：手动拉黑,MANUAL_ADDITION：手动添加，HIS_CONNECT：HIS对接)") private String blacklistSource; + /** 功能限制（具体来源未知？） */ + private String functionLimitation; + /** * 创建时间 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java index afb7cc4c..63356a13 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java @@ -2,6 +2,7 @@ package com.xinelu.manage.vo.signpatientrecord; import com.fasterxml.jackson.annotation.JsonFormat; import com.xinelu.common.annotation.Excel; +import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed; import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHardware; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,10 +47,20 @@ public class SignPatientInfoVo { @ApiModelProperty(value = "身份证号") private String cardNo; + /** 性别 */ + @ApiModelProperty(value = "性别") + private String sex; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthDate; + /** * 签约时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signTime; /** @@ -88,6 +99,9 @@ public class SignPatientInfoVo { @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; + @ApiModelProperty(value = "住院/门诊号") + private String inHospitalNumber; + /** * 签约时诊断 */ @@ -107,7 +121,7 @@ public class SignPatientInfoVo { private String serviceStatus; /** - * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN + * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN */ @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN") private String signStatus; @@ -149,4 +163,7 @@ public class SignPatientInfoVo { @ApiModelProperty(value = "签约硬件设备列表") private List signDevices; + @ApiModelProperty(value = "签约知情书列表") + private List signPatientInformeds; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java index aa1e32b6..97e153df 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java @@ -1,5 +1,6 @@ package com.xinelu.manage.vo.signpatientrecord; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.math.BigDecimal; @@ -43,10 +44,20 @@ public class SignPatientListVo { @ApiModelProperty(value = "身份证号") private String cardNo; + /** 性别 */ + @ApiModelProperty(value = "性别") + private String sex; + + /** 出生日期，格式：yyyy-MM-dd */ + @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthDate; + /** * 签约时间，格式：yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date signTime; /** @@ -85,6 +96,21 @@ public class SignPatientListVo { @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL") private String visitMethod; + @ApiModelProperty(value = "住院/门诊号") + private String inHospitalNumber; + + /** + * 签约时诊断 + */ + @ApiModelProperty(value = "签约时诊断") + private String signDiagnosis; + + /** + * 审核后诊断 + */ + @ApiModelProperty(value = "审核后诊断") + private String reviewDiagnosis; + /** * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END */ @@ -92,9 +118,9 @@ public class SignPatientListVo { private String serviceStatus; /** - * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN + * 签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN */ - @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN") + @ApiModelProperty(value = "签约状态，在签：IN_SIGN，忽略：IGNORE_SIGN，解约：SEPARATE_SIGN，续约：CONTINUOUS_SIGN，过期：EXPIRE_SIGN") private String signStatus; /** @@ -107,6 +133,7 @@ public class SignPatientListVo { * 加入意向时间（意向签约） */ @ApiModelProperty(value = "加入意向时间（意向签约）") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date intentionalTime; /** diff --git a/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml new file mode 100644 index 00000000..c5b248a6 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, crowd_name, min_suitable_age, max_suitable_age, suitable_gender, crowd_type, special_type, whether_disable, remark, sort, del_flag, create_by, create_time, update_by, update_time from crowd_info + + + + + + + + insert into crowd_info + + crowd_name, + + min_suitable_age, + + max_suitable_age, + + suitable_gender, + + crowd_type, + + special_type, + + whether_disable, + + remark, + + sort, + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{crowdName}, + + #{minSuitableAge}, + + #{maxSuitableAge}, + + #{suitableGender}, + + #{crowdType}, + + #{specialType}, + + #{whetherDisable}, + + #{remark}, + + #{sort}, + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update crowd_info + + crowd_name = + #{crowdName}, + + min_suitable_age = + #{minSuitableAge}, + + max_suitable_age = + #{maxSuitableAge}, + + suitable_gender = + #{suitableGender}, + + crowd_type = + #{crowdType}, + + special_type = + #{specialType}, + + whether_disable = + #{whetherDisable}, + + remark = + #{remark}, + + sort = + #{sort}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from crowd_info where id = #{id} + + + + delete from crowd_info where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml index f3e8413f..59e6dbaf 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/materialsinfo/MaterialsInfoMapper.xml @@ -34,18 +34,24 @@ select id, materials_name, materials_type, materials_option, materials_file_path, video_cover_type, video_cover_file_path, materials_abstract, indications, applicable_diseases, drug_name, surgical_name, check_items, inspection_items, crowd_id, crow_name, materials_status, materials_remark, materials_sort, create_by, create_time, update_by, update_time from materials_info - - - and materials_name like concat('%', #{materialsName}, '%') - - - and materials_status = #{materialsStatus} - - - and create_time between #{params.beginCreateTime} and #{params.endCreateTime} - + + and materials_name like concat('%', #{materialsName}, '%') + + + and materials_status = #{materialsStatus} + + + and materials_type = #{materialsType} + + + and create_time >= #{createTimeStart} + + + and create_time <= #{createTimeEnd} + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml index 13dbd887..ef3b4b29 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklist/PatientBlacklistMapper.xml @@ -7,6 +7,12 @@ + + + + + + @@ -21,16 +27,18 @@ - select id, patient_id, abnormal_cause_id, abnormal_cause_value, supplement_illustrate_id, supplement_illustrate_value, - function_limitation, blacklist_source, del_flag, create_by, create_time, update_by, update_time from patient_blacklist + select id, patient_id, hospital_agency_id,hospital_agency_name,campus_agency_id,campus_agency_name,department_id, department_name, + abnormal_cause_id, abnormal_cause_value, supplement_illustrate_id, supplement_illustrate_value, + function_limitation, blacklist_source, del_flag, create_by, create_time, update_by, update_time from patient_blacklist - + select b.id, b.patient_id,b.hospital_agency_id, b.hospital_agency_name,b.campus_agency_id,b.campus_agency_name, + b.department_id, b.department_name, b.abnormal_cause_id, b.abnormal_cause_value, b.supplement_illustrate_id, b.supplement_illustrate_value, b.function_limitation, b.blacklist_source, - b.create_time, p.patient_name, - p.patient_phone, p.card_no, p.hospital_agency_id, p.hospital_agency_name, p.campus_agency_id, p.campus_agency_name, - p.department_id, p.department_name from patient_blacklist b left join patient_info p on b.patient_id = p.id + b.create_time, p.patient_name, p.patient_phone, p.card_no from patient_blacklist b + left join patient_info p on b.patient_id = p.id b.del_flag = 0 @@ -55,109 +63,149 @@ insert into patient_blacklist - patient_id, - - abnormal_cause_id, - - abnormal_cause_value, - - supplement_illustrate_id, - - supplement_illustrate_value, - - function_limitation, - - blacklist_source, - - - del_flag, - - create_by, - - create_time, - - update_by, - - update_time, - + patient_id, + + hospital_agency_id, + + hospital_agency_name, + + campus_agency_id, + + campus_agency_name, + + department_id, + + department_name, + + abnormal_cause_id, + + abnormal_cause_value, + + supplement_illustrate_id, + + supplement_illustrate_value, + + function_limitation, + + blacklist_source, + + + del_flag, + + create_by, + + create_time, + + update_by, + + update_time, + - #{patientId}, - - #{abnormalCauseId}, - - #{abnormalCauseValue}, - - #{supplementIllustrateId}, - - #{supplementIllustrateValue}, - - #{functionLimitation}, - - #{blacklistSource}, - - - #{delFlag}, - - #{createBy}, - - #{createTime}, - - #{updateBy}, - - #{updateTime}, - + #{patientId}, + + #{hospitalAgencyId}, + + #{hospitalAgencyName}, + + #{campusAgencyId}, + + #{campusAgencyName}, + + #{departmentId}, + + #{departmentName}, + + #{abnormalCauseId}, + + #{abnormalCauseValue}, + + #{supplementIllustrateId}, + + #{supplementIllustrateValue}, + + #{functionLimitation}, + + #{blacklistSource}, + + + #{delFlag}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + update patient_blacklist - patient_id = - #{patientId}, - - abnormal_cause_id = - #{abnormalCauseId}, - - abnormal_cause_value = - #{abnormalCauseValue}, - - supplement_illustrate_id = - #{supplementIllustrateId}, - - supplement_illustrate_value = - #{supplementIllustrateValue}, - - function_limitation = - #{functionLimitation}, - - blacklist_source = - #{blacklistSource}, - - del_flag = - #{delFlag}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - + patient_id = + #{patientId}, + + hospital_agency_id = #{hospitalAgencyId}, + + hospital_agency_name = #{hospitalAgencyName}, + + campus_agency_id = #{campusAgencyId}, + + campus_agency_name = #{campusAgencyName}, + + department_id = #{departmentId}, + + department_name = #{departmentName}, + + abnormal_cause_id = + #{abnormalCauseId}, + + abnormal_cause_value = + #{abnormalCauseValue}, + + supplement_illustrate_id = + #{supplementIllustrateId}, + + supplement_illustrate_value = + #{supplementIllustrateValue}, + + function_limitation = + #{functionLimitation}, + + blacklist_source = + #{blacklistSource}, + + del_flag = + #{delFlag}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + where id = #{id} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.xml new file mode 100644 index 00000000..3f0f8602 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientblacklistabnormalcause/PatientBlacklistAbnormalCauseMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + select id, parent_id, abnormal_cause_code, abnormal_cause_value, abnormal_cause_level, status, del_flag, remark, create_by, create_time, update_by, update_time from patient_blacklist_abnormal_cause + + + + + + + + insert into patient_blacklist_abnormal_cause + + parent_id, + + abnormal_cause_code, + + abnormal_cause_value, + + abnormal_cause_level, + + status, + + del_flag, + + remark, + + create_by, + + create_time, + + update_by, + + update_time, + + + + #{parentId}, + + #{abnormalCauseCode}, + + #{abnormalCauseValue}, + + #{abnormalCauseLevel}, + + #{status}, + + #{delFlag}, + + #{remark}, + + #{createBy}, + + #{createTime}, + + #{updateBy}, + + #{updateTime}, + + + + + + update patient_blacklist_abnormal_cause + + parent_id = + #{parentId}, + + abnormal_cause_code = + #{abnormalCauseCode}, + + abnormal_cause_value = + #{abnormalCauseValue}, + + abnormal_cause_level = + #{abnormalCauseLevel}, + + status = + #{status}, + + del_flag = + #{delFlag}, + + remark = + #{remark}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + + + where id = #{id} + + + + delete from patient_blacklist_abnormal_cause where id = #{id} + + + + delete from patient_blacklist_abnormal_cause where id in + + #{id} + + + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml index ff0babc9..44a50ec8 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml @@ -14,6 +14,8 @@ + + @@ -77,11 +79,14 @@ del_flag = 0 - and patient_name like concat('%', #{patientName}, '%') + and patient_name = #{patientName} and patient_phone like concat('%', #{patientPhone}, '%') + + and card_no = #{cardNo} + @@ -183,6 +188,10 @@ sign_status, + sign_patient_record_id, + + service_status, + sign_time, certificate_issuing_doctor, @@ -279,6 +288,10 @@ #{signStatus}, + #{signPatientRecordId}, + + #{serviceStatus}, + #{signTime}, #{certificateIssuingDoctor}, @@ -382,6 +395,10 @@ sign_status = #{signStatus}, + sign_patient_record_id = #{signPatientRecordId}, + + service_status = #{serviceStatus}, + sign_time = #{signTime}, diff --git a/postdischarge-manage/src/main/resources/mapper/manage/project/ProjectMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/project/ProjectMapper.xml new file mode 100644 index 00000000..b753b344 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/project/ProjectMapper.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,group_id,group_name, + project_name,project_code,project_alias, + enable_status,judge_mode,max_value, + min_value,default_value,lis_compare, + project_sort,project_remark,del_flag, + create_by,create_time,update_by, + update_time + + + + + + delete from project + where id = #{id,jdbcType=BIGINT} + + + insert into project + ( id,group_id,group_name + ,project_name,project_code,project_alias + ,enable_status,judge_mode,max_value + ,min_value,default_value,lis_compare + ,project_sort,project_remark,del_flag + ,create_by,create_time,update_by + ,update_time) + values (#{id,jdbcType=BIGINT},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} + ,#{projectName,jdbcType=VARCHAR},#{projectCode,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR} + ,#{enableStatus,jdbcType=TINYINT},#{judgeMode,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER} + ,#{minValue,jdbcType=INTEGER},#{defaultValue,jdbcType=VARCHAR},#{lisCompare,jdbcType=VARCHAR} + ,#{projectSort,jdbcType=INTEGER},#{projectRemark,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT} + ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} + ,#{updateTime,jdbcType=TIMESTAMP}) + + + insert into project + + id, + group_id, + group_name, + project_name, + project_code, + project_alias, + enable_status, + judge_mode, + max_value, + min_value, + default_value, + lis_compare, + project_sort, + project_remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{groupId,jdbcType=BIGINT}, + #{groupName,jdbcType=VARCHAR}, + #{projectName,jdbcType=VARCHAR}, + #{projectCode,jdbcType=VARCHAR}, + #{projectAlias,jdbcType=VARCHAR}, + #{enableStatus,jdbcType=TINYINT}, + #{judgeMode,jdbcType=VARCHAR}, + #{maxValue,jdbcType=INTEGER}, + #{minValue,jdbcType=INTEGER}, + #{defaultValue,jdbcType=VARCHAR}, + #{lisCompare,jdbcType=VARCHAR}, + #{projectSort,jdbcType=INTEGER}, + #{projectRemark,jdbcType=VARCHAR}, + #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project + + + group_id = #{groupId,jdbcType=BIGINT}, + + + group_name = #{groupName,jdbcType=VARCHAR}, + + + project_name = #{projectName,jdbcType=VARCHAR}, + + + project_code = #{projectCode,jdbcType=VARCHAR}, + + + project_alias = #{projectAlias,jdbcType=VARCHAR}, + + + enable_status = #{enableStatus,jdbcType=TINYINT}, + + + judge_mode = #{judgeMode,jdbcType=VARCHAR}, + + + max_value = #{maxValue,jdbcType=INTEGER}, + + + min_value = #{minValue,jdbcType=INTEGER}, + + + default_value = #{defaultValue,jdbcType=VARCHAR}, + + + lis_compare = #{lisCompare,jdbcType=VARCHAR}, + + + project_sort = #{projectSort,jdbcType=INTEGER}, + + + project_remark = #{projectRemark,jdbcType=VARCHAR}, + + + del_flag = #{delFlag,jdbcType=TINYINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project + set + group_id = #{groupId,jdbcType=BIGINT}, + group_name = #{groupName,jdbcType=VARCHAR}, + project_name = #{projectName,jdbcType=VARCHAR}, + project_code = #{projectCode,jdbcType=VARCHAR}, + project_alias = #{projectAlias,jdbcType=VARCHAR}, + enable_status = #{enableStatus,jdbcType=TINYINT}, + judge_mode = #{judgeMode,jdbcType=VARCHAR}, + max_value = #{maxValue,jdbcType=INTEGER}, + min_value = #{minValue,jdbcType=INTEGER}, + default_value = #{defaultValue,jdbcType=VARCHAR}, + lis_compare = #{lisCompare,jdbcType=VARCHAR}, + project_sort = #{projectSort,jdbcType=INTEGER}, + project_remark = #{projectRemark,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=TINYINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml new file mode 100644 index 00000000..b1b1fef2 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectdevice/ProjectDeviceMapper.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, + card_no,device_type,device_name, + device_code,device_status,device_remark, + device_bind_time,device_unbind_time,device_ip, + device_port,create_by,create_time, + update_by,update_time + + + + + + delete from project_device + where id = #{id,jdbcType=BIGINT} + + + insert into project_device + ( id,patient_id,patient_name + ,card_no,device_type,device_name + ,device_code,device_status,device_remark + ,device_bind_time,device_unbind_time,device_ip + ,device_port,create_by,create_time + ,update_by,update_time) + values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} + ,#{cardNo,jdbcType=VARCHAR},#{deviceType,jdbcType=VARCHAR},#{deviceName,jdbcType=VARCHAR} + ,#{deviceCode,jdbcType=VARCHAR},#{deviceStatus,jdbcType=VARCHAR},#{deviceRemark,jdbcType=VARCHAR} + ,#{deviceBindTime,jdbcType=TIMESTAMP},#{deviceUnbindTime,jdbcType=TIMESTAMP},#{deviceIp,jdbcType=VARCHAR} + ,#{devicePort,jdbcType=INTEGER},#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP} + ,#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP}) + + + insert into project_device + + id, + patient_id, + patient_name, + card_no, + device_type, + device_name, + device_code, + device_status, + device_remark, + device_bind_time, + device_unbind_time, + device_ip, + device_port, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{cardNo,jdbcType=VARCHAR}, + #{deviceType,jdbcType=VARCHAR}, + #{deviceName,jdbcType=VARCHAR}, + #{deviceCode,jdbcType=VARCHAR}, + #{deviceStatus,jdbcType=VARCHAR}, + #{deviceRemark,jdbcType=VARCHAR}, + #{deviceBindTime,jdbcType=TIMESTAMP}, + #{deviceUnbindTime,jdbcType=TIMESTAMP}, + #{deviceIp,jdbcType=VARCHAR}, + #{devicePort,jdbcType=INTEGER}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project_device + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + device_type = #{deviceType,jdbcType=VARCHAR}, + + + device_name = #{deviceName,jdbcType=VARCHAR}, + + + device_code = #{deviceCode,jdbcType=VARCHAR}, + + + device_status = #{deviceStatus,jdbcType=VARCHAR}, + + + device_remark = #{deviceRemark,jdbcType=VARCHAR}, + + + device_bind_time = #{deviceBindTime,jdbcType=TIMESTAMP}, + + + device_unbind_time = #{deviceUnbindTime,jdbcType=TIMESTAMP}, + + + device_ip = #{deviceIp,jdbcType=VARCHAR}, + + + device_port = #{devicePort,jdbcType=INTEGER}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project_device + set + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + card_no = #{cardNo,jdbcType=VARCHAR}, + device_type = #{deviceType,jdbcType=VARCHAR}, + device_name = #{deviceName,jdbcType=VARCHAR}, + device_code = #{deviceCode,jdbcType=VARCHAR}, + device_status = #{deviceStatus,jdbcType=VARCHAR}, + device_remark = #{deviceRemark,jdbcType=VARCHAR}, + device_bind_time = #{deviceBindTime,jdbcType=TIMESTAMP}, + device_unbind_time = #{deviceUnbindTime,jdbcType=TIMESTAMP}, + device_ip = #{deviceIp,jdbcType=VARCHAR}, + device_port = #{devicePort,jdbcType=INTEGER}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml new file mode 100644 index 00000000..fcd52673 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectgroup/ProjectGroupMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + id,parent_id,group_name, + group_code,enable_status,group_sort, + group_remark,del_flag,create_by, + create_time,update_by,update_time + + + + + + delete from project_group + where id = #{id,jdbcType=BIGINT} + + + insert into project_group + ( id,parent_id,group_name + ,group_code,enable_status,group_sort + ,group_remark,del_flag,create_by + ,create_time,update_by,update_time + ) + values (#{id,jdbcType=BIGINT},#{parentId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} + ,#{groupCode,jdbcType=VARCHAR},#{enableStatus,jdbcType=TINYINT},#{groupSort,jdbcType=INTEGER} + ,#{groupRemark,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT},#{createBy,jdbcType=VARCHAR} + ,#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR},#{updateTime,jdbcType=TIMESTAMP} + ) + + + insert into project_group + + id, + parent_id, + group_name, + group_code, + enable_status, + group_sort, + group_remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{parentId,jdbcType=BIGINT}, + #{groupName,jdbcType=VARCHAR}, + #{groupCode,jdbcType=VARCHAR}, + #{enableStatus,jdbcType=TINYINT}, + #{groupSort,jdbcType=INTEGER}, + #{groupRemark,jdbcType=VARCHAR}, + #{delFlag,jdbcType=TINYINT}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project_group + + + parent_id = #{parentId,jdbcType=BIGINT}, + + + group_name = #{groupName,jdbcType=VARCHAR}, + + + group_code = #{groupCode,jdbcType=VARCHAR}, + + + enable_status = #{enableStatus,jdbcType=TINYINT}, + + + group_sort = #{groupSort,jdbcType=INTEGER}, + + + group_remark = #{groupRemark,jdbcType=VARCHAR}, + + + del_flag = #{delFlag,jdbcType=TINYINT}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project_group + set + parent_id = #{parentId,jdbcType=BIGINT}, + group_name = #{groupName,jdbcType=VARCHAR}, + group_code = #{groupCode,jdbcType=VARCHAR}, + enable_status = #{enableStatus,jdbcType=TINYINT}, + group_sort = #{groupSort,jdbcType=INTEGER}, + group_remark = #{groupRemark,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=TINYINT}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectlastrecord/ProjectLastRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectlastrecord/ProjectLastRecordMapper.xml new file mode 100644 index 00000000..1dc6dfc7 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectlastrecord/ProjectLastRecordMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, + card_no,group_id,group_name, + project_id,project_name,device_id, + device_name,project_alias,judge_mode, + measure_result,max_value,min_value, + default_value,lis_compare,measure_time, + measure_name,record_remark,qualified_sign, + create_by,create_time,update_by, + update_time + + + + + + delete from project_last_record + where id = #{id,jdbcType=BIGINT} + + + insert into project_last_record + ( id,patient_id,patient_name + ,card_no,group_id,group_name + ,project_id,project_name,device_id + ,device_name,project_alias,judge_mode + ,measure_result,max_value,min_value + ,default_value,lis_compare,measure_time + ,measure_name,record_remark,qualified_sign + ,create_by,create_time,update_by + ,update_time) + values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} + ,#{cardNo,jdbcType=VARCHAR},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} + ,#{projectId,jdbcType=BIGINT},#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT} + ,#{deviceName,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR},#{judgeMode,jdbcType=VARCHAR} + ,#{measureResult,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER},#{minValue,jdbcType=INTEGER} + ,#{defaultValue,jdbcType=VARCHAR},#{lisCompare,jdbcType=VARCHAR},#{measureTime,jdbcType=TIMESTAMP} + ,#{measureName,jdbcType=VARCHAR},#{recordRemark,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} + ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} + ,#{updateTime,jdbcType=TIMESTAMP}) + + + insert into project_last_record + + id, + patient_id, + patient_name, + card_no, + group_id, + group_name, + project_id, + project_name, + device_id, + device_name, + project_alias, + judge_mode, + measure_result, + max_value, + min_value, + default_value, + lis_compare, + measure_time, + measure_name, + record_remark, + qualified_sign, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{cardNo,jdbcType=VARCHAR}, + #{groupId,jdbcType=BIGINT}, + #{groupName,jdbcType=VARCHAR}, + #{projectId,jdbcType=BIGINT}, + #{projectName,jdbcType=VARCHAR}, + #{deviceId,jdbcType=BIGINT}, + #{deviceName,jdbcType=VARCHAR}, + #{projectAlias,jdbcType=VARCHAR}, + #{judgeMode,jdbcType=VARCHAR}, + #{measureResult,jdbcType=VARCHAR}, + #{maxValue,jdbcType=INTEGER}, + #{minValue,jdbcType=INTEGER}, + #{defaultValue,jdbcType=VARCHAR}, + #{lisCompare,jdbcType=VARCHAR}, + #{measureTime,jdbcType=TIMESTAMP}, + #{measureName,jdbcType=VARCHAR}, + #{recordRemark,jdbcType=VARCHAR}, + #{qualifiedSign,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project_last_record + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + group_id = #{groupId,jdbcType=BIGINT}, + + + group_name = #{groupName,jdbcType=VARCHAR}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + project_name = #{projectName,jdbcType=VARCHAR}, + + + device_id = #{deviceId,jdbcType=BIGINT}, + + + device_name = #{deviceName,jdbcType=VARCHAR}, + + + project_alias = #{projectAlias,jdbcType=VARCHAR}, + + + judge_mode = #{judgeMode,jdbcType=VARCHAR}, + + + measure_result = #{measureResult,jdbcType=VARCHAR}, + + + max_value = #{maxValue,jdbcType=INTEGER}, + + + min_value = #{minValue,jdbcType=INTEGER}, + + + default_value = #{defaultValue,jdbcType=VARCHAR}, + + + lis_compare = #{lisCompare,jdbcType=VARCHAR}, + + + measure_time = #{measureTime,jdbcType=TIMESTAMP}, + + + measure_name = #{measureName,jdbcType=VARCHAR}, + + + record_remark = #{recordRemark,jdbcType=VARCHAR}, + + + qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project_last_record + set + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + card_no = #{cardNo,jdbcType=VARCHAR}, + group_id = #{groupId,jdbcType=BIGINT}, + group_name = #{groupName,jdbcType=VARCHAR}, + project_id = #{projectId,jdbcType=BIGINT}, + project_name = #{projectName,jdbcType=VARCHAR}, + device_id = #{deviceId,jdbcType=BIGINT}, + device_name = #{deviceName,jdbcType=VARCHAR}, + project_alias = #{projectAlias,jdbcType=VARCHAR}, + judge_mode = #{judgeMode,jdbcType=VARCHAR}, + measure_result = #{measureResult,jdbcType=VARCHAR}, + max_value = #{maxValue,jdbcType=INTEGER}, + min_value = #{minValue,jdbcType=INTEGER}, + default_value = #{defaultValue,jdbcType=VARCHAR}, + lis_compare = #{lisCompare,jdbcType=VARCHAR}, + measure_time = #{measureTime,jdbcType=TIMESTAMP}, + measure_name = #{measureName,jdbcType=VARCHAR}, + record_remark = #{recordRemark,jdbcType=VARCHAR}, + qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml new file mode 100644 index 00000000..746e88ae --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectrecord/ProjectRecordMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, + card_no,group_id,group_name, + project_id,project_name,device_id, + device_name,project_alias,judge_mode, + measure_result,max_value,min_value, + default_value,lis_compare,measure_time, + measure_name,record_remark,qualified_sign, + create_by,create_time,update_by, + update_time + + + + + + delete from project_record + where id = #{id,jdbcType=BIGINT} + + + insert into project_record + ( id,patient_id,patient_name + ,card_no,group_id,group_name + ,project_id,project_name,device_id + ,device_name,project_alias,judge_mode + ,measure_result,max_value,min_value + ,default_value,lis_compare,measure_time + ,measure_name,record_remark,qualified_sign + ,create_by,create_time,update_by + ,update_time) + values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} + ,#{cardNo,jdbcType=VARCHAR},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} + ,#{projectId,jdbcType=BIGINT},#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT} + ,#{deviceName,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR},#{judgeMode,jdbcType=VARCHAR} + ,#{measureResult,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER},#{minValue,jdbcType=INTEGER} + ,#{defaultValue,jdbcType=VARCHAR},#{lisCompare,jdbcType=VARCHAR},#{measureTime,jdbcType=TIMESTAMP} + ,#{measureName,jdbcType=VARCHAR},#{recordRemark,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} + ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} + ,#{updateTime,jdbcType=TIMESTAMP}) + + + insert into project_record + + id, + patient_id, + patient_name, + card_no, + group_id, + group_name, + project_id, + project_name, + device_id, + device_name, + project_alias, + judge_mode, + measure_result, + max_value, + min_value, + default_value, + lis_compare, + measure_time, + measure_name, + record_remark, + qualified_sign, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{cardNo,jdbcType=VARCHAR}, + #{groupId,jdbcType=BIGINT}, + #{groupName,jdbcType=VARCHAR}, + #{projectId,jdbcType=BIGINT}, + #{projectName,jdbcType=VARCHAR}, + #{deviceId,jdbcType=BIGINT}, + #{deviceName,jdbcType=VARCHAR}, + #{projectAlias,jdbcType=VARCHAR}, + #{judgeMode,jdbcType=VARCHAR}, + #{measureResult,jdbcType=VARCHAR}, + #{maxValue,jdbcType=INTEGER}, + #{minValue,jdbcType=INTEGER}, + #{defaultValue,jdbcType=VARCHAR}, + #{lisCompare,jdbcType=VARCHAR}, + #{measureTime,jdbcType=TIMESTAMP}, + #{measureName,jdbcType=VARCHAR}, + #{recordRemark,jdbcType=VARCHAR}, + #{qualifiedSign,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project_record + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + group_id = #{groupId,jdbcType=BIGINT}, + + + group_name = #{groupName,jdbcType=VARCHAR}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + project_name = #{projectName,jdbcType=VARCHAR}, + + + device_id = #{deviceId,jdbcType=BIGINT}, + + + device_name = #{deviceName,jdbcType=VARCHAR}, + + + project_alias = #{projectAlias,jdbcType=VARCHAR}, + + + judge_mode = #{judgeMode,jdbcType=VARCHAR}, + + + measure_result = #{measureResult,jdbcType=VARCHAR}, + + + max_value = #{maxValue,jdbcType=INTEGER}, + + + min_value = #{minValue,jdbcType=INTEGER}, + + + default_value = #{defaultValue,jdbcType=VARCHAR}, + + + lis_compare = #{lisCompare,jdbcType=VARCHAR}, + + + measure_time = #{measureTime,jdbcType=TIMESTAMP}, + + + measure_name = #{measureName,jdbcType=VARCHAR}, + + + record_remark = #{recordRemark,jdbcType=VARCHAR}, + + + qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project_record + set + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + card_no = #{cardNo,jdbcType=VARCHAR}, + group_id = #{groupId,jdbcType=BIGINT}, + group_name = #{groupName,jdbcType=VARCHAR}, + project_id = #{projectId,jdbcType=BIGINT}, + project_name = #{projectName,jdbcType=VARCHAR}, + device_id = #{deviceId,jdbcType=BIGINT}, + device_name = #{deviceName,jdbcType=VARCHAR}, + project_alias = #{projectAlias,jdbcType=VARCHAR}, + judge_mode = #{judgeMode,jdbcType=VARCHAR}, + measure_result = #{measureResult,jdbcType=VARCHAR}, + max_value = #{maxValue,jdbcType=INTEGER}, + min_value = #{minValue,jdbcType=INTEGER}, + default_value = #{defaultValue,jdbcType=VARCHAR}, + lis_compare = #{lisCompare,jdbcType=VARCHAR}, + measure_time = #{measureTime,jdbcType=TIMESTAMP}, + measure_name = #{measureName,jdbcType=VARCHAR}, + record_remark = #{recordRemark,jdbcType=VARCHAR}, + qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml new file mode 100644 index 00000000..b65108d5 --- /dev/null +++ b/postdischarge-manage/src/main/resources/mapper/manage/projectrecordfile/ProjectRecordFileMapper.xml @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,patient_id,patient_name, + card_no,group_id,group_name, + project_id,project_name,device_id, + device_name,project_alias,file_path, + measure_time,measure_name,max_value, + min_value,default_value,qualified_sign, + create_by,create_time,update_by, + update_time + + + + + + delete from project_record_file + where id = #{id,jdbcType=BIGINT} + + + insert into project_record_file + ( id,patient_id,patient_name + ,card_no,group_id,group_name + ,project_id,project_name,device_id + ,device_name,project_alias,file_path + ,measure_time,measure_name,max_value + ,min_value,default_value,qualified_sign + ,create_by,create_time,update_by + ,update_time) + values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} + ,#{cardNo,jdbcType=VARCHAR},#{groupId,jdbcType=BIGINT},#{groupName,jdbcType=VARCHAR} + ,#{projectId,jdbcType=BIGINT},#{projectName,jdbcType=VARCHAR},#{deviceId,jdbcType=BIGINT} + ,#{deviceName,jdbcType=VARCHAR},#{projectAlias,jdbcType=VARCHAR},#{filePath,jdbcType=VARCHAR} + ,#{measureTime,jdbcType=TIMESTAMP},#{measureName,jdbcType=VARCHAR},#{maxValue,jdbcType=INTEGER} + ,#{minValue,jdbcType=INTEGER},#{defaultValue,jdbcType=VARCHAR},#{qualifiedSign,jdbcType=VARCHAR} + ,#{createBy,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateBy,jdbcType=VARCHAR} + ,#{updateTime,jdbcType=TIMESTAMP}) + + + insert into project_record_file + + id, + patient_id, + patient_name, + card_no, + group_id, + group_name, + project_id, + project_name, + device_id, + device_name, + project_alias, + file_path, + measure_time, + measure_name, + max_value, + min_value, + default_value, + qualified_sign, + create_by, + create_time, + update_by, + update_time, + + + #{id,jdbcType=BIGINT}, + #{patientId,jdbcType=BIGINT}, + #{patientName,jdbcType=VARCHAR}, + #{cardNo,jdbcType=VARCHAR}, + #{groupId,jdbcType=BIGINT}, + #{groupName,jdbcType=VARCHAR}, + #{projectId,jdbcType=BIGINT}, + #{projectName,jdbcType=VARCHAR}, + #{deviceId,jdbcType=BIGINT}, + #{deviceName,jdbcType=VARCHAR}, + #{projectAlias,jdbcType=VARCHAR}, + #{filePath,jdbcType=VARCHAR}, + #{measureTime,jdbcType=TIMESTAMP}, + #{measureName,jdbcType=VARCHAR}, + #{maxValue,jdbcType=INTEGER}, + #{minValue,jdbcType=INTEGER}, + #{defaultValue,jdbcType=VARCHAR}, + #{qualifiedSign,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + + + + update project_record_file + + + patient_id = #{patientId,jdbcType=BIGINT}, + + + patient_name = #{patientName,jdbcType=VARCHAR}, + + + card_no = #{cardNo,jdbcType=VARCHAR}, + + + group_id = #{groupId,jdbcType=BIGINT}, + + + group_name = #{groupName,jdbcType=VARCHAR}, + + + project_id = #{projectId,jdbcType=BIGINT}, + + + project_name = #{projectName,jdbcType=VARCHAR}, + + + device_id = #{deviceId,jdbcType=BIGINT}, + + + device_name = #{deviceName,jdbcType=VARCHAR}, + + + project_alias = #{projectAlias,jdbcType=VARCHAR}, + + + file_path = #{filePath,jdbcType=VARCHAR}, + + + measure_time = #{measureTime,jdbcType=TIMESTAMP}, + + + measure_name = #{measureName,jdbcType=VARCHAR}, + + + max_value = #{maxValue,jdbcType=INTEGER}, + + + min_value = #{minValue,jdbcType=INTEGER}, + + + default_value = #{defaultValue,jdbcType=VARCHAR}, + + + qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + where id = #{id,jdbcType=BIGINT} + + + update project_record_file + set + patient_id = #{patientId,jdbcType=BIGINT}, + patient_name = #{patientName,jdbcType=VARCHAR}, + card_no = #{cardNo,jdbcType=VARCHAR}, + group_id = #{groupId,jdbcType=BIGINT}, + group_name = #{groupName,jdbcType=VARCHAR}, + project_id = #{projectId,jdbcType=BIGINT}, + project_name = #{projectName,jdbcType=VARCHAR}, + device_id = #{deviceId,jdbcType=BIGINT}, + device_name = #{deviceName,jdbcType=VARCHAR}, + project_alias = #{projectAlias,jdbcType=VARCHAR}, + file_path = #{filePath,jdbcType=VARCHAR}, + measure_time = #{measureTime,jdbcType=TIMESTAMP}, + measure_name = #{measureName,jdbcType=VARCHAR}, + max_value = #{maxValue,jdbcType=INTEGER}, + min_value = #{minValue,jdbcType=INTEGER}, + default_value = #{defaultValue,jdbcType=VARCHAR}, + qualified_sign = #{qualifiedSign,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP} + where id = #{id,jdbcType=BIGINT} + + diff --git a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml index af450261..a84f2fc0 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/propagandainfo/PropagandaInfoMapper.xml @@ -32,30 +32,36 @@ select id, hospital_agency_id, hospital_agency_name, department_id, department_name, propaganda_title, propaganda_type, propaganda_code, propaganda_status, propaganda_content, propaganda_cover_path, article_summary, voicebroadcast, disease_type_id, disease_type_name, propaganda_link, propaganda_barcode_path, create_by, create_time, update_by, update_time from propaganda_info - - - and hospital_agency_id = #{hospitalAgencyId} - - - and department_id = #{departmentId} - - - and propaganda_title = #{propagandaTitle} - - - and propaganda_type = #{propagandaType} - - - and propaganda_status = #{propagandaStatus} - - - and propaganda_content = #{propagandaContent} - - - and disease_type_id = #{diseaseTypeId} - + + and hospital_agency_id = #{hospitalAgencyId} + + + and department_id = #{departmentId} + + + and propaganda_title = #{propagandaTitle} + + + and propaganda_type = #{propagandaType} + + + and propaganda_code = #{propagandaCode} + + + and propaganda_status = #{propagandaStatus} + + + and create_by = #{createBy} + + + and create_time >= #{createTimeStart} + + + and create_time <= #{createTimeEnd} + @@ -157,66 +163,66 @@ update propaganda_info - hospital_agency_id = - #{hospitalAgencyId}, - - hospital_agency_name = - #{hospitalAgencyName}, - - department_id = - #{departmentId}, - - department_name = - #{departmentName}, - - propaganda_title = - #{propagandaTitle}, - - propaganda_type = - #{propagandaType}, - - propaganda_code = - #{propagandaCode}, - - propaganda_status = - #{propagandaStatus}, - - propaganda_content = - #{propagandaContent}, - - propaganda_cover_path = - #{propagandaCoverPath}, - - article_summary = - #{articleSummary}, - - voicebroadcast = - #{voicebroadcast}, - - disease_type_id = - #{diseaseTypeId}, - - disease_type_name = - #{diseaseTypeName}, - - propaganda_link = - #{propagandaLink}, - - propaganda_barcode_path = - #{propagandaBarcodePath}, - - create_by = - #{createBy}, - - create_time = - #{createTime}, - - update_by = - #{updateBy}, - - update_time = - #{updateTime}, - + hospital_agency_id = + #{hospitalAgencyId}, + + hospital_agency_name = + #{hospitalAgencyName}, + + department_id = + #{departmentId}, + + department_name = + #{departmentName}, + + propaganda_title = + #{propagandaTitle}, + + propaganda_type = + #{propagandaType}, + + propaganda_code = + #{propagandaCode}, + + propaganda_status = + #{propagandaStatus}, + + propaganda_content = + #{propagandaContent}, + + propaganda_cover_path = + #{propagandaCoverPath}, + + article_summary = + #{articleSummary}, + + voicebroadcast = + #{voicebroadcast}, + + disease_type_id = + #{diseaseTypeId}, + + disease_type_name = + #{diseaseTypeName}, + + propaganda_link = + #{propagandaLink}, + + propaganda_barcode_path = + #{propagandaBarcodePath}, + + create_by = + #{createBy}, + + create_time = + #{createTime}, + + update_by = + #{updateBy}, + + update_time = + #{updateTime}, + where id = #{id} @@ -231,4 +237,17 @@ #{id} + \ No newline at end of file diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml index 5388a215..ee08244a 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml @@ -5,37 +5,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,6 +47,8 @@ + + @@ -51,6 +56,7 @@ + @@ -62,24 +68,15 @@ - - - - - - - - - id,patient_id,patient_name, - patient_phone,card_no,sign_time, + patient_phone,card_no,sex,birth_date,sign_time, hospital_agency_id,hospital_agency_name,campus_agency_id, campus_agency_name,department_id,department_name, ward_id,ward_name,visit_serial_number, - visit_method,sign_diagnosis,review_diagnosis, + visit_method,in_hospital_number,sign_diagnosis,review_diagnosis, service_status,sign_status,intentional_source, intentional_time,billing_doctor_id,billing_doctor_name, price,payment_status,del_flag, @@ -101,22 +98,22 @@ insert into sign_patient_record ( id,patient_id,patient_name - ,patient_phone,card_no,sign_time + ,patient_phone,card_no,sex,birth_date,sign_time ,hospital_agency_id,hospital_agency_name,campus_agency_id ,campus_agency_name,department_id,department_name ,ward_id,ward_name,visit_serial_number - ,visit_method,sign_diagnosis,review_diagnosis + ,visit_method,in_hospital_number,sign_diagnosis,review_diagnosis ,service_status,sign_status,intentional_source ,intentional_time,billing_doctor_id,billing_doctor_name ,price,payment_status,del_flag ,create_by,create_time,update_by ,update_time) values (#{id,jdbcType=BIGINT},#{patientId,jdbcType=BIGINT},#{patientName,jdbcType=VARCHAR} - ,#{patientPhone,jdbcType=VARCHAR},#{cardNo,jdbcType=VARCHAR},#{signTime,jdbcType=TIMESTAMP} + ,#{patientPhone,jdbcType=VARCHAR},#{cardNo,jdbcType=VARCHAR},#{sex,jdbcType=VARCHAR},#{birthDate,jdbcType=DATE},#{signTime,jdbcType=TIMESTAMP} ,#{hospitalAgencyId,jdbcType=BIGINT},#{hospitalAgencyName,jdbcType=VARCHAR},#{campusAgencyId,jdbcType=BIGINT} ,#{campusAgencyName,jdbcType=VARCHAR},#{departmentId,jdbcType=BIGINT},#{departmentName,jdbcType=VARCHAR} ,#{wardId,jdbcType=BIGINT},#{wardName,jdbcType=VARCHAR},#{visitSerialNumber,jdbcType=VARCHAR} - ,#{visitMethod,jdbcType=VARCHAR},#{signDiagnosis,jdbcType=VARCHAR},#{reviewDiagnosis,jdbcType=VARCHAR} + ,#{visitMethod,jdbcType=VARCHAR},#{inHospitalNumber,jdbcType=VARCHAR},#{signDiagnosis,jdbcType=VARCHAR},#{reviewDiagnosis,jdbcType=VARCHAR} ,#{serviceStatus,jdbcType=VARCHAR},#{signStatus,jdbcType=VARCHAR},#{intentionalSource,jdbcType=VARCHAR} ,#{intentionalTime,jdbcType=TIMESTAMP},#{billingDoctorId,jdbcType=BIGINT},#{billingDoctorName,jdbcType=VARCHAR} ,#{price,jdbcType=DECIMAL},#{paymentStatus,jdbcType=VARCHAR},#{delFlag,jdbcType=TINYINT} @@ -131,6 +128,8 @@ patient_name, patient_phone, card_no, + sex, + birth_date, sign_time, hospital_agency_id, hospital_agency_name, @@ -142,6 +141,7 @@ ward_name, visit_serial_number, visit_method, + in_hospital_number, sign_diagnosis, review_diagnosis, service_status, @@ -164,6 +164,8 @@ #{patientName,jdbcType=VARCHAR}, #{patientPhone,jdbcType=VARCHAR}, #{cardNo,jdbcType=VARCHAR}, + #{sex,jdbcType=VARCHAR}, + #{birthDate,jdbcType=DATE}, #{signTime,jdbcType=TIMESTAMP}, #{hospitalAgencyId,jdbcType=BIGINT}, #{hospitalAgencyName,jdbcType=VARCHAR}, @@ -175,6 +177,7 @@ #{wardName,jdbcType=VARCHAR}, #{visitSerialNumber,jdbcType=VARCHAR}, #{visitMethod,jdbcType=VARCHAR}, + #{inHospitalNumber,jdbcType=VARCHAR}, #{signDiagnosis,jdbcType=VARCHAR}, #{reviewDiagnosis,jdbcType=VARCHAR}, #{serviceStatus,jdbcType=VARCHAR}, @@ -207,6 +210,12 @@ card_no = #{cardNo,jdbcType=VARCHAR}, + + sex = #{sex,jdbcType=VARCHAR}, + + + birth_date = #{birthDate,jdbcType=DATE}, + sign_time = #{signTime,jdbcType=TIMESTAMP}, @@ -240,6 +249,9 @@ visit_method = #{visitMethod,jdbcType=VARCHAR}, + + in_hospital_number = #{inHospitalNumber,jdbcType=VARCHAR}, + sign_diagnosis = #{signDiagnosis,jdbcType=VARCHAR}, @@ -295,6 +307,8 @@ patient_name = #{patientName,jdbcType=VARCHAR}, patient_phone = #{patientPhone,jdbcType=VARCHAR}, card_no = #{cardNo,jdbcType=VARCHAR}, + sex = #{sex,jdbcType=VARCHAR}, + birth_date = #{birthDate,jdbcType=DATE}, sign_time = #{signTime,jdbcType=TIMESTAMP}, hospital_agency_id = #{hospitalAgencyId,jdbcType=BIGINT}, hospital_agency_name = #{hospitalAgencyName,jdbcType=VARCHAR}, @@ -306,6 +320,7 @@ ward_name = #{wardName,jdbcType=VARCHAR}, visit_serial_number = #{visitSerialNumber,jdbcType=VARCHAR}, visit_method = #{visitMethod,jdbcType=VARCHAR}, + in_hospital_number = #{inHospitalNumber,jdbcType=VARCHAR}, sign_diagnosis = #{signDiagnosis,jdbcType=VARCHAR}, review_diagnosis = #{reviewDiagnosis,jdbcType=VARCHAR}, service_status = #{serviceStatus,jdbcType=VARCHAR}, @@ -323,20 +338,26 @@ update_time = #{updateTime,jdbcType=TIMESTAMP} where id = #{id,jdbcType=BIGINT} - select + patient.service_status,patient.sign_status, sign.id,sign.patient_id,sign.patient_name, - sign.patient_phone,sign.card_no, sign.sign_time, + sign.patient_phone,sign.card_no,sign.sex,sign.birth_date, sign.sign_time, sign.hospital_agency_id,sign.hospital_agency_name, sign.campus_agency_name,sign.department_name, sign.ward_name,sign.visit_serial_number, - sign.visit_method,sign.sign_diagnosis,sign.review_diagnosis, + sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, sign.service_status,sign.sign_status,sign.intentional_source, - sign.intentional_time,sign.billing_doctor_name,sign.payment_status,sign.price - p.package_name, p.serviceEndTime, p.serviceCycle - from sign_patient_record sign left join sign_patient_package p on sign.patient_id = p.id + sign.intentional_time,sign.billing_doctor_name,sign.payment_status,sign.price, + p.package_name, p.service_end_time, p.service_cycle + from patient_info patient + left join sign_patient_record sign on patient.sign_patient_record_id = sign.id + left join sign_patient_package p on sign.id = p.sign_patient_record_id - sign.del_flag = 0 + patient.del_flag = 0 and sign.del_flag = 0 + + and patient.service_status = #{serviceStatus} + and sign.patient_name like concat('%', #{patientName}, '%') @@ -379,35 +400,34 @@ and sign.sign_status = #{signStatus} - - and sign.service_status = #{serviceStatus} + + and p.service_end_time >= #{serviceEndTimeStart} + + + and p.service_end_time <= #{serviceEndTimeEnd} - select sign.id,sign.patient_id,sign.patient_name, - sign.patient_phone,sign.card_no, sign.sign_time, + sign.patient_phone,sign.card_no,sign.sex, sign.birth_date,sign.sign_time, sign.hospital_agency_id,sign.hospital_agency_name, sign.campus_agency_name,sign.department_name, sign.ward_name,sign.visit_serial_number, - sign.visit_method,sign.sign_diagnosis,sign.review_diagnosis, - sign.service_status,sign.sign_status,sign.payment_status,sign.price - p.package_name, p.package_payment_status, p.package_price, p.service_start_time, p.service_end_time, p.service_cycle, - device.hardware_type, device.sn_code, device.hardware_price, device.hardware_status, device.hardware_manufacturer, device.hardware_introduce, - informed.informed_file_name, informed.informed_file_path + sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis, + sign.service_status,sign.sign_status,sign.payment_status,sign.price, + p.service_package_id, p.package_name, p.package_payment_status, p.package_price, p.service_start_time, p.service_end_time, p.service_cycle from sign_patient_record sign left join sign_patient_package p on p.sign_patient_record_id = sign.id - left join sign_patient_package_hardware device on device.sign_patient_record_id = sign.id - left join sign_patient_informed informed on informed.sign_patient_record_id = sign.id - sign.del_flag = 0 and sign.id = #{patientSignRecordId} + sign.del_flag = 0 and sign.id = #{id}