From b1518f44a214e4d37a29d51ca4ee5c7175bc97fa Mon Sep 17 00:00:00 2001 From: youxilong Date: Wed, 28 Feb 2024 13:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=A7=91=E5=AE=A4=E5=8F=8A?= =?UTF-8?q?=E5=85=B6=E4=B8=8B=E5=B1=9E=E8=AF=9D=E6=9C=AF=E3=80=81=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E6=95=B0=E9=87=8F=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=89=8B?= =?UTF-8?q?=E6=9C=AF=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E8=AF=9D=E6=9C=AF=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/DepartmentController.java | 20 ++ .../OperationInfoController.java | 8 +- .../scriptInfo/ScriptInfoController.java | 8 +- .../manage/domain/department/Department.java | 7 + .../manage/domain/scriptInfo/ScriptInfo.java | 16 ++ .../mapper/department/DepartmentMapper.java | 14 + .../mapper/scriptInfo/ScriptInfoMapper.java | 9 +- .../department/IDepartmentService.java | 14 + .../impl/DepartmentServiceImpl.java | 22 ++ .../operationInfo/IOperationInfoService.java | 7 - .../impl/OperationInfoServiceImpl.java | 17 -- .../impl/ScriptInfoServiceImpl.java | 30 +-- .../manage/department/DepartmentMapper.xml | 252 +++++++++++++++--- .../manage/scriptInfo/ScriptInfoMapper.xml | 14 +- 14 files changed, 331 insertions(+), 107 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java index 7aa57024..1b7688e6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java @@ -3,6 +3,7 @@ package com.xinelu.manage.controller.department; 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; @@ -93,4 +94,23 @@ public class DepartmentController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(departmentService.deleteDepartmentByIds(ids)); } + + /** + * 查询科室信息列表及包含话术数量 + */ + @GetMapping("/listScriptNum") + public R> listScriptNum(Department department) { + List list = departmentService.selectDepartmentListScriptNum(department); + return R.ok(list); + } + + /** + * 查询科室信息列表及包含手术数量 + */ + @GetMapping("/listOperationNum") + public R> listOperationNum(Department department) { + List list = departmentService.selectDepartmentListOperationNum(department); + return R.ok(list); + } + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/operationInfo/OperationInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/operationInfo/OperationInfoController.java index 932421af..31e6da59 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/operationInfo/OperationInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/operationInfo/OperationInfoController.java @@ -25,7 +25,7 @@ import java.util.List; */ @Api(tags = "手术信息控制器") @RestController -@RequestMapping("/operationInfo/operationInfo") +@RequestMapping("/manage/operationInfo") public class OperationInfoController extends BaseController { @Resource private IOperationInfoService operationInfoService; @@ -93,9 +93,9 @@ public class OperationInfoController extends BaseController { @ApiOperation("删除手术信息") @PreAuthorize("@ss.hasPermi('operationInfo:operationInfo:remove')") @Log(title = "手术信息", businessType = BusinessType.DELETE) - @DeleteMapping("remove/{id}") - public AjaxResult remove(@PathVariable Long id) { - return toAjax(operationInfoService.deleteOperationInfoById(id)); + @DeleteMapping("remove/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(operationInfoService.deleteOperationInfoByIds(ids)); } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java index 519222b1..049e5c63 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/scriptInfo/ScriptInfoController.java @@ -71,7 +71,7 @@ public class ScriptInfoController extends BaseController { @ApiOperation("新增话术信息") @PreAuthorize("@ss.hasPermi('manage:script:add')") @Log(title = "话术信息", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping(value = "/add") public AjaxResult add(@RequestBody ScriptInfo scriptInfo) { return toAjax(scriptInfoService.insertScriptInfo(scriptInfo)); } @@ -79,9 +79,10 @@ public class ScriptInfoController extends BaseController { /** * 修改话术信息 */ + @ApiOperation("修改话术信息") @PreAuthorize("@ss.hasPermi('manage:script:edit')") @Log(title = "话术信息", businessType = BusinessType.UPDATE) - @PutMapping + @PutMapping(value = "/edit") public AjaxResult edit(@RequestBody ScriptInfo scriptInfo) { return toAjax(scriptInfoService.updateScriptInfo(scriptInfo)); } @@ -89,9 +90,10 @@ public class ScriptInfoController extends BaseController { /** * 删除话术信息 */ + @ApiOperation("删除话术信息") @PreAuthorize("@ss.hasPermi('manage:script:remove')") @Log(title = "话术信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") + @DeleteMapping("remove/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(scriptInfoService.deleteScriptInfoByIds(ids)); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java index af3bae5d..a6c96196 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java @@ -176,6 +176,12 @@ public class Department extends BaseEntity { @Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd") private Date revokeDate; + /** + * 包含附属数量：比如科室下所含话术数量 + */ + @ApiModelProperty(value = "包含附属数量") + private Integer countNum; + @Override public String toString() { @@ -201,6 +207,7 @@ public class Department extends BaseEntity { .append("departmentMail", getDepartmentMail()) .append("establishDate", getEstablishDate()) .append("revokeDate", getRevokeDate()) + .append("countNum", getCountNum()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/scriptInfo/ScriptInfo.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/scriptInfo/ScriptInfo.java index 159fa138..f7a0d7f0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/scriptInfo/ScriptInfo.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/scriptInfo/ScriptInfo.java @@ -2,6 +2,8 @@ package com.xinelu.manage.domain.scriptInfo; import com.xinelu.common.annotation.Excel; import com.xinelu.common.core.domain.BaseEntity; +import com.xinelu.common.custominterface.Insert; +import com.xinelu.common.custominterface.Update; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -10,6 +12,9 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; /** * 话术信息对象 script_info @@ -35,6 +40,7 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "所属科室id") @Excel(name = "所属科室id") + @NotBlank(message = "科室id不能为空") private Long departmentId; /** @@ -42,6 +48,7 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "所属科室名称") @Excel(name = "所属科室名称") + @NotBlank(message = "科室名称不能为空") private String departmentName; /** @@ -63,6 +70,8 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "通用话术名称") @Excel(name = "通用话术名称") + @NotBlank(message = "通用话术名称不能为空", groups = {Insert.class, Update.class}) + @Length(max = 100, message = "通用话术名称名称不能超过100个字符", groups = {Insert.class, Update.class}) private String commonScriptName; /** @@ -70,6 +79,8 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "话术名称") @Excel(name = "话术名称") + @NotBlank(message = "话术名称不能为空", groups = {Insert.class, Update.class}) + @Length(max = 100, message = "话术名称不能超过100个字符", groups = {Insert.class, Update.class}) private String scriptName; /** @@ -77,6 +88,7 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "话术ID") @Excel(name = "话术ID") + @NotBlank(message = "话术ID不能为空", groups = {Insert.class, Update.class}) private String scriptId; /** @@ -84,6 +96,7 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "平台ID") @Excel(name = "平台ID") + @NotBlank(message = "平台ID不能为空", groups = {Insert.class, Update.class}) private String platformId; /** @@ -91,6 +104,7 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "话术状态，正常：NORMAL，下架：OFF_SHELF，暂停：SUSPEND") @Excel(name = "话术状态，正常：NORMAL，下架：OFF_SHELF，暂停：SUSPEND") + @NotBlank(message = "话术状态不能为空", groups = {Insert.class, Update.class}) private String scriptStatus; /** @@ -98,6 +112,8 @@ public class ScriptInfo extends BaseEntity { */ @ApiModelProperty(value = "话术简介") @Excel(name = "话术简介") + @NotBlank(message = "话术简介不能为空", groups = {Insert.class, Update.class}) + @Length(max = 100, message = "话术简介不能超过200个字符", groups = {Insert.class, Update.class}) private String scriptIntroduction; /** diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java index 3c1f7eba..150738dd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java @@ -59,4 +59,18 @@ public interface DepartmentMapper { * @return 结果 */ int deleteDepartmentByIds(Long[] ids); + + /** + * 查询科室信息列表及包含话术数量 + * @param department + * @return + */ + List selectDepartmentListScriptNum(Department department); + + /** + * 查询科室信息列表及包含手术数量 + * @param department + * @return + */ + List selectDepartmentListOperationNum(Department department); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java index 77248bad..2ac04fea 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/scriptInfo/ScriptInfoMapper.java @@ -60,13 +60,10 @@ public interface ScriptInfoMapper { */ public int deleteScriptInfoByIds(Long[] ids); - /** - * 根据通用话术名称和话术ID判断通用话术名称是否存在 - * @param commonScriptName - * @param scriptId + * 判断通用话术名称是否存在 + * @param scriptInfo * @return */ - int countByCommonScriptNameAndScriptId(@Param("commonScriptName") String commonScriptName, @Param("scriptId") String scriptId); - + int countByScriptInfo(ScriptInfo scriptInfo); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java index b71e53f1..45c3405a 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java @@ -59,4 +59,18 @@ public interface IDepartmentService { * @return 结果 */ int deleteDepartmentById(Long id); + + /** + * 查询科室信息列表及包含话术数量 + * @param department + * @return + */ + List selectDepartmentListScriptNum(Department department); + + /** + * 查询科室信息列表及包含手术数量 + * @param department + * @return + */ + List selectDepartmentListOperationNum(Department department); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java index 1d082f87..2d8a55b4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java @@ -88,4 +88,26 @@ public class DepartmentServiceImpl implements IDepartmentService { public int deleteDepartmentById(Long id) { return departmentMapper.deleteDepartmentById(id); } + + /** + * 查询科室信息列表及包含话术数量 + * + * @param department + * @return + */ + @Override + public List selectDepartmentListScriptNum(Department department) { + return departmentMapper.selectDepartmentListScriptNum(department); + } + + /** + * 查询科室信息列表及包含手术数量 + * + * @param department + * @return + */ + @Override + public List selectDepartmentListOperationNum(Department department) { + return departmentMapper.selectDepartmentListOperationNum(department); + } } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/IOperationInfoService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/IOperationInfoService.java index 3a8b5133..1e380567 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/IOperationInfoService.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/IOperationInfoService.java @@ -51,11 +51,4 @@ public interface IOperationInfoService { */ public int deleteOperationInfoByIds(Long[] ids); - /** - * 删除手术信息信息 - * - * @param id 手术信息主键 - * @return 结果 - */ - public int deleteOperationInfoById(Long id); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java index e26a79b7..282e74e7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/operationInfo/impl/OperationInfoServiceImpl.java @@ -111,21 +111,4 @@ public class OperationInfoServiceImpl implements IOperationInfoService { public int deleteOperationInfoByIds(Long[] ids) { return operationInfoMapper.deleteOperationInfoByIds(ids); } - - /** - * 删除手术信息 - * - * @param id 手术信息主键 - * @return 结果 - */ - @Override - public int deleteOperationInfoById(Long id) { - // 根据id查询手术信息是否存在 - OperationInfo operationInfo = operationInfoMapper.selectOperationInfoById(id); - if (ObjectUtils.isEmpty(operationInfo)) { - throw new ServiceException("要删除的手术信息不存在"); - } - return operationInfoMapper.deleteOperationInfoById(id); - } - } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java index 73a2bd78..ee210e3c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java @@ -3,11 +3,9 @@ package com.xinelu.manage.service.scriptInfo.impl; 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.scriptInfo.ScriptInfo; import com.xinelu.manage.mapper.scriptInfo.ScriptInfoMapper; import com.xinelu.manage.service.scriptInfo.IScriptInfoService; -import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -54,28 +52,8 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { */ @Override public int insertScriptInfo(ScriptInfo scriptInfo) { - // 入参非空性判断 - if (StringUtils.isEmpty(scriptInfo.getCommonScriptName())) { - throw new ServiceException("通用话术名称不能为空"); - } - if (StringUtils.isEmpty(scriptInfo.getScriptName())) { - throw new ServiceException("话术名称不能为空"); - } - if (ObjectUtils.isEmpty(scriptInfo.getScriptId())) { - throw new ServiceException("话术ID不能为空"); - } - if (ObjectUtils.isEmpty(scriptInfo.getPlatformId())) { - throw new ServiceException("平台ID不能为空"); - } - if (StringUtils.isEmpty(scriptInfo.getScriptStatus())) { - throw new ServiceException("话术状态不能为空"); - } - if (StringUtils.isEmpty(scriptInfo.getScriptIntroduction())) { - throw new ServiceException("话术简介不能为空"); - } // 判断通用话术名称是否存在 - int existingNameCount = scriptInfoMapper.countByCommonScriptNameAndScriptId(scriptInfo.getCommonScriptName(), scriptInfo.getScriptId()); - if (existingNameCount > 0) { + if (scriptInfoMapper.countByScriptInfo(scriptInfo) > 0) { throw new ServiceException("通用话术名称已存在"); } // 设置创建人与创建时间 @@ -92,6 +70,12 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { */ @Override public int updateScriptInfo(ScriptInfo scriptInfo) { + // 判断通用话术名称是否存在 + if (scriptInfoMapper.countByScriptInfo(scriptInfo) > 0) { + throw new ServiceException("通用话术名称已存在"); + } + // 设置修改人和修改时间 + scriptInfo.setUpdateBy(SecurityUtils.getUsername()); scriptInfo.setUpdateTime(DateUtils.getNowDate()); return scriptInfoMapper.updateScriptInfo(scriptInfo); } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml index dbb979c4..0354e172 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml @@ -65,64 +65,94 @@ - and parent_department_id = #{parentDepartmentId} + and parent_department_id = + #{parentDepartmentId} - and agency_id = #{agencyId} + and agency_id = + #{agencyId} - and agency_name like concat('%', #{agencyName}, '%') + and agency_name like concat('%', + #{agencyName}, + '%' + ) - and department_name like concat('%', #{departmentName}, '%') + and department_name like concat('%', + #{departmentName}, + '%' + ) - and department_code = #{departmentCode} + and department_code = + #{departmentCode} - and department_type = #{departmentType} + and department_type = + #{departmentType} - and department_abbreviation = #{departmentAbbreviation} + and department_abbreviation = + #{departmentAbbreviation} - and department_person_id = #{departmentPersonId} + and department_person_id = + #{departmentPersonId} - and department_person_name like concat('%', #{departmentPersonName}, '%') + and department_person_name like concat('%', + #{departmentPersonName}, + '%' + ) - and node_type = #{nodeType} + and node_type = + #{nodeType} - and provide_service_category = #{provideServiceCategory} + and provide_service_category = + #{provideServiceCategory} - and subdivision_category_id = #{subdivisionCategoryId} + and subdivision_category_id = + #{subdivisionCategoryId} - and subdivision_category_name like concat('%', #{subdivisionCategoryName}, '%') + and subdivision_category_name like concat('%', + #{subdivisionCategoryName}, + '%' + ) - and norm_department_compare_id = #{normDepartmentCompareId} + and norm_department_compare_id = + #{normDepartmentCompareId} - and norm_department_compare_name like concat('%', #{normDepartmentCompareName}, '%') + and norm_department_compare_name like concat('%', + #{normDepartmentCompareName}, + '%' + ) - and prepare_beds_count = #{prepareBedsCount} + and prepare_beds_count = + #{prepareBedsCount} - and department_phone = #{departmentPhone} + and department_phone = + #{departmentPhone} - and department_mail = #{departmentMail} + and department_mail = + #{departmentMail} - and establish_date = #{establishDate} + and establish_date = + #{establishDate} - and revoke_date = #{revokeDate} + and revoke_date = + #{revokeDate} @@ -133,6 +163,140 @@ where id = #{id} + + + + insert into department @@ -242,76 +406,76 @@ update department parent_department_id = - #{parentDepartmentId}, + #{parentDepartmentId}, agency_id = - #{agencyId}, + #{agencyId}, agency_name = - #{agencyName}, + #{agencyName}, department_name = - #{departmentName}, + #{departmentName}, department_code = - #{departmentCode}, + #{departmentCode}, department_type = - #{departmentType}, + #{departmentType}, department_abbreviation = - #{departmentAbbreviation}, + #{departmentAbbreviation}, department_person_id = - #{departmentPersonId}, + #{departmentPersonId}, department_person_name = - #{departmentPersonName}, + #{departmentPersonName}, node_type = - #{nodeType}, + #{nodeType}, provide_service_category = - #{provideServiceCategory}, + #{provideServiceCategory}, subdivision_category_id = - #{subdivisionCategoryId}, + #{subdivisionCategoryId}, subdivision_category_name = - #{subdivisionCategoryName}, + #{subdivisionCategoryName}, norm_department_compare_id = - #{normDepartmentCompareId}, + #{normDepartmentCompareId}, norm_department_compare_name = - #{normDepartmentCompareName}, + #{normDepartmentCompareName}, prepare_beds_count = - #{prepareBedsCount}, + #{prepareBedsCount}, department_phone = - #{departmentPhone}, + #{departmentPhone}, department_mail = - #{departmentMail}, + #{departmentMail}, establish_date = - #{establishDate}, + #{establishDate}, revoke_date = - #{revokeDate}, + #{revokeDate}, create_by = - #{createBy}, + #{createBy}, create_time = - #{createTime}, + #{createTime}, update_by = - #{updateBy}, + #{updateBy}, update_time = - #{updateTime}, + #{updateTime}, where id = #{id} diff --git a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml index 4a0dcb96..af686399 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/scriptInfo/ScriptInfoMapper.xml @@ -112,11 +112,19 @@ where id = #{id} - select count(*) from script_info - where common_script_name = #{commonScriptName} - and script_id = #{scriptId} + + department_id = #{departmentId} + and common_script_name = #{commonScriptName} + + and disease_type_id = + #{diseaseTypeId} + +