xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 0418_小程序开发

Browse Source
This commit is contained in:
zhangheng 2024-04-22 15:03:55 +08:00
commit b37ede6bcb
21 changed files with 292 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postdischarge-admin/src/main/java/com/xinelu/web/controller/system/SysUserController.java
View File

@ -141,7 +141,7 @@ public class SysUserController extends BaseController {
*/
@PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping
@PutMapping("/edit")
public AjaxResult edit(@Validated @RequestBody SysUser user) {
userService.checkUserAllowed(user);
userService.checkUserDataScope(user.getUserId());

BIN
postdischarge-admin/src/main/resources/template/科室信息导入表.xlsx
View File

Binary file not shown.

15
postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
View File

@ -194,6 +194,16 @@ public class Constants {
*/
public static final String TASK_STATUS_CODE = "TSC";
/**
* 任务状态编码
*/
public static final String AGENCY_CODE = "AYC";
/**
* 任务状态编码
*/
public static final String DEPARTMENT_CODE = "DTC";
/**
* 门诊患者
*/
@ -323,9 +333,4 @@ public class Constants {
* 资讯编码前缀
*/
public static final String INFO_CODE = "IC";
/**
* 科室编码前缀
*/
public static final String DEPARTMENT_CODE = "HDC";
}

2
postdischarge-manage/src/main/java/com/xinelu/manage/domain/department/Department.java
View File

@ -165,7 +165,6 @@ public class Department extends BaseEntity {
*/
@ApiModelProperty(value = "成立日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "成立日期", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate establishDate;
/**
@ -173,7 +172,6 @@ public class Department extends BaseEntity {
*/
@ApiModelProperty(value = "撤销日期")
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "撤销日期", width = 30, dateFormat = "yyyy-MM-dd")
private LocalDate revokeDate;
@Override

131
postdischarge-manage/src/main/java/com/xinelu/manage/dto/department/ImportDepartmentDTO.java Normal file
View File

@ -0,0 +1,131 @@
package com.xinelu.manage.dto.department;
import com.xinelu.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ImportDepartmentDTO {
private static final long serialVersionUID = 1L;
/**
* 上级科室id
*/
@ApiModelProperty(value = "上级科室编号")
@Excel(name = "上级科室编号")
private String parentDepartmentCode;
/**
* 所属机构id
*/
@ApiModelProperty(value = "所属机构编码")
@Excel(name = "所属机构编码")
private String agencyCode;
/**
* 所属机构名称
*/
@ApiModelProperty(value = "所属机构名称")
@Excel(name = "所属机构名称")
private String agencyName;
/**
* 科室名称
*/
@ApiModelProperty(value = "科室名称")
@Excel(name = "科室名称")
private String departmentName;
/**
* 科室类型
*/
@ApiModelProperty(value = "科室类型")
@Excel(name = "科室类型")
private String departmentType;
/**
* 科室简称
*/
@ApiModelProperty(value = "科室简称")
@Excel(name = "科室简称")
private String departmentAbbreviation;
/**
* 科室负责人id
*/
@ApiModelProperty(value = "科室负责人id")
@Excel(name = "科室负责人编号")
private String departmentPersonId;
/**
* 科室负责人姓名
*/
@ApiModelProperty(value = "科室负责人姓名")
@Excel(name = "科室负责人姓名")
private String departmentPersonName;
/**
* 节点类型，科室：DEPARTMENT，病区：WARD，
*/
@ApiModelProperty(value = "节点类型，科室：DEPARTMENT，病区：WARD")
@Excel(name = "节点类型，科室：DEPARTMENT，病区：WARD")
private String nodeType;
/**
* 提供服务类别，门诊：OUTPATIENT_SERVICE，急诊：EMERGENCY_TREATMENT，住院：BE_HOSPITALIZED，病区：WARD，医技：MEDICAL_TECHNOLOGY，
* 药剂：DRUG，财务：FINANCE，行政：ADMINISTRATION，药房：PHARMACY，药库：DRUG_STORAGE，公卫：PUBLIC_HEALTH
*/
@ApiModelProperty(value = "提供服务类别，门诊：OUTPATIENT_SERVICE，急诊：EMERGENCY_TREATMENT，住院：BE_HOSPITALIZED，病区：WARD，医技：MEDICAL_TECHNOLOGY，药剂：DRUG，财务：FINANCE，行政：ADMINISTRATION，药房：PHARMACY，药库：DRUG_STORAGE，公卫：PUBLIC_HEALTH")
@Excel(name = "提供服务类别，门诊：OUTPATIENT_SERVICE，急诊：EMERGENCY_TREATMENT，住院：BE_HOSPITALIZED，病区：WARD，医技：MEDICAL_TECHNOLOGY， 药剂：DRUG，财务：FINANCE，行政：ADMINISTRATION，药房：PHARMACY，药库：DRUG_STORAGE，公卫：PUBLIC_HEALTH")
private String provideServiceCategory;
/**
* 细分类别id
*/
@ApiModelProperty(value = "细分类别id")
@Excel(name = "细分类别编号")
private String subdivisionCategoryCode;
/**
* 细分类别名称
*/
@ApiModelProperty(value = "细分类别名称")
@Excel(name = "细分类别名称")
private String subdivisionCategoryName;
/**
* 标准科室对照id
*/
@ApiModelProperty(value = "标准科室对照id")
@Excel(name = "标准科室对照编号")
private String normDepartmentCompareCode;
/**
* 标准科室对照名称
*/
@ApiModelProperty(value = "标准科室对照名称")
@Excel(name = "标准科室对照名称")
private String normDepartmentCompareName;
/**
* 编制床位数
*/
@ApiModelProperty(value = "编制床位数")
@Excel(name = "编制床位数")
private Integer prepareBedsCount;
/**
* 科室电话
*/
@ApiModelProperty(value = "科室电话")
@Excel(name = "科室电话")
private String departmentPhone;
/**
* 科室邮箱
*/
@ApiModelProperty(value = "科室邮箱")
@Excel(name = "科室邮箱")
private String departmentMail;
}

5
postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
View File

@ -1,10 +1,12 @@
package com.xinelu.manage.service.agency.impl;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.enums.NodeTypeEnum;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.bean.BeanUtils;
import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
import com.xinelu.common.utils.regex.RegexUtil;
import com.xinelu.manage.domain.agency.Agency;
import com.xinelu.manage.domain.department.Department;
@ -48,6 +50,8 @@ public class AgencyServiceImpl implements IAgencyService {
private SysAreaMapper sysAreaMapper;
@Resource
private DepartmentMapper departmentMapper;
@Resource
private GenerateSystemCodeUtil generateSystemCodeUtil;
/**
@ -114,6 +118,7 @@ public class AgencyServiceImpl implements IAgencyService {
}
agency.setCreateTime(LocalDateTime.now());
agency.setCreateBy(SecurityUtils.getUsername());
agency.setAgencyCode(Constants.AGENCY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.AGENCY_CODE));
return AjaxResult.success(agencyMapper.insertAgency(agency));
}

5
postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
View File

@ -1,11 +1,13 @@
package com.xinelu.manage.service.department.impl;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.domain.entity.SysUser;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.StringUtils;
import com.xinelu.common.utils.bean.BeanUtils;
import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
import com.xinelu.common.utils.regex.RegexUtil;
import com.xinelu.manage.domain.department.Department;
import com.xinelu.manage.dto.department.DepartmentDTO;
@ -41,6 +43,8 @@ public class DepartmentServiceImpl implements IDepartmentService {
private RegexUtil regexUtil;
@Resource
private SysUserMapper sysUserMapper;
@Resource
private GenerateSystemCodeUtil generateSystemCodeUtil;
/**
* 查询科室信息
@ -108,6 +112,7 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
department.setCreateTime(LocalDateTime.now());
department.setCreateBy(SecurityUtils.getUsername());
department.setDepartmentCode(Constants.DEPARTMENT_CODE + generateSystemCodeUtil.generateSystemCode(Constants.DEPARTMENT_CODE));
return departmentMapper.insertDepartment(department);
}

2
postdischarge-manage/src/main/java/com/xinelu/manage/service/infocategory/impl/InfoCategoryServiceImpl.java
View File

@ -89,7 +89,7 @@ public class InfoCategoryServiceImpl implements IInfoCategoryService {
infocategory.setCreateTime(LocalDateTime.now());//设置添加时间
infocategory.setInfoCategoryCreator(SecurityUtils.getUsername());//设置当前的用户
infocategory.setInfoCategoryType(infocategory.getInfoCategoryName());//类型 无用 直接赋值和名称相同
infocategory.setInfoCategoryCode(Constants.INFO_CATEGORY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.DEPARTMENT_CODE));
infocategory.setInfoCategoryCode(Constants.INFO_CATEGORY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.INFO_CATEGORY_CODE));
}
int insertCount = infoCategoryMapper.insertInfoCategoryList(infoCategoryDTO.getInfoCategoryList());
if (insertCount < 0) {

22
postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
View File

@ -12,11 +12,14 @@ import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService;
import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeVO;
import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
@ -110,13 +113,20 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
log.info("删除管理节点信息失败");
throw new ServiceException("修改专病路径管理节点信息失败");
}
for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) {
diseaseNode.setRouteId(specialDiseaseRoute.getId());
diseaseNode.setRouteName(specialDiseaseNode.getRouteName());
diseaseNode.setUpdateTime(LocalDateTime.now());
diseaseNode.setUpdateBy(SecurityUtils.getUsername());
if (CollectionUtils.isEmpty(specialDiseaseNode.getSpecialDiseaseNodeList())) {
return AjaxResult.success();
}
int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList());
ArrayList<SpecialDiseaseNodeVO> specialDiseaseNodeVOS = new ArrayList<>();
for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) {
if (StringUtils.isNotBlank(diseaseNode.getRouteNodeName()) && Objects.nonNull(diseaseNode.getRouteNodeDay()) && StringUtils.isNotBlank(diseaseNode.getTaskType()) && StringUtils.isNotBlank(diseaseNode.getTaskSubdivision()) && StringUtils.isNotBlank(diseaseNode.getTaskStatus())) {
diseaseNode.setRouteId(specialDiseaseRoute.getId());
diseaseNode.setRouteName(specialDiseaseNode.getRouteName());
diseaseNode.setUpdateTime(LocalDateTime.now());
diseaseNode.setUpdateBy(SecurityUtils.getUsername());
specialDiseaseNodeVOS.add(diseaseNode);
}
}
int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNodeVOS);
if (insertNodeCount < 0) {
log.info("新增管理节点信息失败");
throw new ServiceException("修改专病路径管理节点信息失败");

4
postdischarge-manage/src/main/resources/mapper/manage/info/InfoMapper.xml
View File

@ -50,10 +50,10 @@
and info_category_name = #{infoCategoryName}
</if>
<if test="infoTitle != null and infoTitle != ''">
and info_title = #{infoTitle}
and info_title like concat('%', #{infoTitle}, '%')
</if>
<if test="infoCode != null and infoCode != ''">
and info_code = #{infoCode}
and info_code like concat('%', #{infoCode}, '%')
</if>
<if test="infoContent != null and infoContent != ''">
and info_content = #{infoContent}

154
postdischarge-manage/src/main/resources/mapper/manage/infocategory/InfoCategoryMapper.xml
View File

@ -5,114 +5,123 @@
<mapper namespace="com.xinelu.manage.mapper.infocategory.InfoCategoryMapper">
<resultMap type="InfoCategory" id="InfoCategoryResult">
<result property="id" column="id"/>
<result property="infoCategoryCode" column="info_category_code"/>
<result property="infoCategoryName" column="info_category_name"/>
<result property="infoCategoryType" column="info_category_type"/>
<result property="infoCategorySort" column="info_category_sort"/>
<result property="infoCategoryCreator" column="info_category_creator"/>
<result property="infoCategoryCreateTime" column="info_category_create_time"/>
<result property="id" column="id"/>
<result property="infoCategoryCode" column="info_category_code"/>
<result property="infoCategoryName" column="info_category_name"/>
<result property="infoCategoryType" column="info_category_type"/>
<result property="infoCategorySort" column="info_category_sort"/>
<result property="infoCategoryCreator" column="info_category_creator"/>
<result property="infoCategoryCreateTime" column="info_category_create_time"/>
</resultMap>
<sql id="selectInfoCategoryVo">
select id, info_category_code, info_category_name, info_category_type, info_category_sort, info_category_creator, info_category_create_time from info_category
select id,
info_category_code,
info_category_name,
info_category_type,
info_category_sort,
info_category_creator,
info_category_create_time
from info_category
</sql>
<select id="selectInfoCategoryList" parameterType="InfoCategory" resultMap="InfoCategoryResult">
<include refid="selectInfoCategoryVo"/>
<where>
<if test="infoCategoryCode != null and infoCategoryCode != ''">
and info_category_code = #{infoCategoryCode}
</if>
<if test="infoCategoryName != null and infoCategoryName != ''">
and info_category_name like concat('%', #{infoCategoryName}, '%')
</if>
<if test="infoCategoryType != null and infoCategoryType != ''">
and info_category_type = #{infoCategoryType}
</if>
<if test="infoCategorySort != null ">
and info_category_sort = #{infoCategorySort}
</if>
<if test="infoCategoryCreator != null and infoCategoryCreator != ''">
and info_category_creator = #{infoCategoryCreator}
</if>
<if test="infoCategoryCreateTime != null ">
and info_category_create_time = #{infoCategoryCreateTime}
</if>
<if test="infoCategoryCode != null and infoCategoryCode != ''">
and info_category_code like concat('%', #{infoCategoryCode}, '%')
</if>
<if test="infoCategoryName != null and infoCategoryName != ''">
and info_category_name like concat('%', #{infoCategoryName}, '%')
</if>
<if test="infoCategoryType != null and infoCategoryType != ''">
and info_category_type = #{infoCategoryType}
</if>
<if test="infoCategorySort != null ">
and info_category_sort = #{infoCategorySort}
</if>
<if test="infoCategoryCreator != null and infoCategoryCreator != ''">
and info_category_creator = #{infoCategoryCreator}
</if>
<if test="infoCategoryCreateTime != null ">
and info_category_create_time = #{infoCategoryCreateTime}
</if>
</where>
order by info_category_sort
</select>
<select id="selectInfoCategoryByName" parameterType="String" resultMap="InfoCategoryResult">
<select id="selectInfoCategoryByName" parameterType="String" resultMap="InfoCategoryResult">
<include refid="selectInfoCategoryVo"/>
where info_category_name = #{info_category_name}
</select>
<select id="selectInfoCategoryById" parameterType="Long" resultMap="InfoCategoryResult">
<include refid="selectInfoCategoryVo"/>
where id = #{id}
<include refid="selectInfoCategoryVo"/>
where id = #{id}
</select>
<insert id="insertInfoCategory" parameterType="InfoCategory" useGeneratedKeys="true"
keyProperty="id">
insert into info_category
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="infoCategoryCode != null">info_category_code,
</if>
<if test="infoCategoryName != null">info_category_name,
</if>
<if test="e != null">info_category_type,
</if>
<if test="infoCategorySort != null">info_category_sort,
</if>
<if test="infoCategoryCreator != null">info_category_creator,
</if>
<if test="infoCategoryCreateTime != null">info_category_create_time,
</if>
<if test="infoCategoryCode != null">info_category_code,
</if>
<if test="infoCategoryName != null">info_category_name,
</if>
<if test="e != null">info_category_type,
</if>
<if test="infoCategorySort != null">info_category_sort,
</if>
<if test="infoCategoryCreator != null">info_category_creator,
</if>
<if test="infoCategoryCreateTime != null">info_category_create_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="infoCategoryCode != null">#{infoCategoryCode},
</if>
<if test="infoCategoryName != null">#{infoCategoryName},
</if>
<if test="infoCategoryType != null">#{infoCategoryType},
</if>
<if test="infoCategorySort != null">#{infoCategorySort},
</if>
<if test="infoCategoryCreator != null">#{infoCategoryCreator},
</if>
<if test="infoCategoryCreateTime != null">#{infoCategoryCreateTime},
</if>
<if test="infoCategoryCode != null">#{infoCategoryCode},
</if>
<if test="infoCategoryName != null">#{infoCategoryName},
</if>
<if test="infoCategoryType != null">#{infoCategoryType},
</if>
<if test="infoCategorySort != null">#{infoCategorySort},
</if>
<if test="infoCategoryCreator != null">#{infoCategoryCreator},
</if>
<if test="infoCategoryCreateTime != null">#{infoCategoryCreateTime},
</if>
</trim>
</insert>
<update id="updateInfoCategory" parameterType="InfoCategory">
update info_category
<trim prefix="SET" suffixOverrides=",">
<if test="infoCategoryCode != null">info_category_code =
#{infoCategoryCode},
</if>
<if test="infoCategoryName != null">info_category_name =
#{infoCategoryName},
</if>
<if test="infoCategoryType != null">info_category_type =
#{infoCategoryType},
</if>
<if test="infoCategorySort != null">info_category_sort =
#{infoCategorySort},
</if>
<if test="infoCategoryCreator != null">info_category_creator =
#{infoCategoryCreator},
</if>
<if test="infoCategoryCreateTime != null">info_category_create_time =
#{infoCategoryCreateTime},
</if>
<if test="infoCategoryCode != null">info_category_code =
#{infoCategoryCode},
</if>
<if test="infoCategoryName != null">info_category_name =
#{infoCategoryName},
</if>
<if test="infoCategoryType != null">info_category_type =
#{infoCategoryType},
</if>
<if test="infoCategorySort != null">info_category_sort =
#{infoCategorySort},
</if>
<if test="infoCategoryCreator != null">info_category_creator =
#{infoCategoryCreator},
</if>
<if test="infoCategoryCreateTime != null">info_category_create_time =
#{infoCategoryCreateTime},
</if>
</trim>
where id = #{id}
</update>
<delete id="deleteInfoCategoryById" parameterType="Long">
delete from info_category where id = #{id}
delete
from info_category
where id = #{id}
</delete>
<delete id="deleteInfoCategoryByIds" parameterType="String">
@ -130,7 +139,6 @@
</select>
<insert id="insertInfoCategoryList">
insert into info_category(
info_category_code,

26
postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml
View File

@ -77,7 +77,7 @@
#{fieldMark}
</if>
</where>
order by create_time DESC
order by content_sort, create_time DESC
</select>
<select id="selectLabelFieldContentById" parameterType="Long"
@ -162,40 +162,40 @@
update label_field_content
<trim prefix="SET" suffixOverrides=",">
<if test="fieldId != null">field_id =
#{fieldId},
#{fieldId},
</if>
<if test="fieldName != null">field_name =
#{fieldName},
#{fieldName},
</if>
<if test="contentName != null">content_name =
#{contentName},
#{contentName},
</if>
<if test="contentCode != null">content_code =
#{contentCode},
#{contentCode},
</if>
<if test="resultPreview != null">result_preview =
#{resultPreview},
#{resultPreview},
</if>
<if test="contentSort != null">content_sort =
#{contentSort},
#{contentSort},
</if>
<if test="contentRemark != null">content_remark =
#{contentRemark},
#{contentRemark},
</if>
<if test="fieldMark != null">field_mark =
#{fieldMark},
#{fieldMark},
</if>
<if test="createBy != null">create_by =
#{createBy},
#{createBy},
</if>
<if test="createTime != null">create_time =
#{createTime},
#{createTime},
</if>
<if test="updateBy != null">update_by =
#{updateBy},
#{updateBy},
</if>
<if test="updateTime != null">update_time =
#{updateTime},
#{updateTime},
</if>
</trim>
where id = #{id}

2
postdischarge-manage/src/main/resources/mapper/manage/labelfieldinfo/LabelFieldInfoMapper.xml
View File

@ -57,7 +57,7 @@
#{fieldRemark}
</if>
</where>
order by create_time DESC
order by field_sort, create_time DESC
</select>

2
postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml
View File

@ -86,7 +86,7 @@
,#{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}
,#{wardId,jdbcType=BIGINT},#{wardName,jdbcType=VARCHAR},#{patientVisitRecordId,jdbcType=BIGINT},#{visitSerialNumber,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}

1
postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
View File

@ -199,6 +199,7 @@
and sdrp.service_package_id = #{servicePackageId}
</if>
</where>
GROUP BY sdr.id order by create_time DESC,route_sort ASC
</select>
<select id="selectSpecialDiseaseRouteById" parameterType="Long"

9
postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/appletpersoncenter/AppletPersonCenterController.java
View File

@ -3,7 +3,6 @@ package com.xinelu.mobile.controller.appletpersoncenter;
import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.manage.service.patientinfo.IPatientInfoService;
import com.xinelu.mobile.dto.appletpersoncenter.HealthRecordDTO;
import com.xinelu.mobile.service.appletpersoncenter.AppletPersonCenterService;
import org.apache.commons.lang3.StringUtils;
@ -27,8 +26,6 @@ public class AppletPersonCenterController extends BaseController {
@Resource
private AppletPersonCenterService appletPersonCenterService;
@Resource
private IPatientInfoService patientInfoService;
/**
* 院后微信小程序一键登录接口
@ -62,8 +59,8 @@ public class AppletPersonCenterController extends BaseController {
/**
* 根据居民表id查询患者健康档案信息
*
* @param residentId
* @return
* @param residentId 居民患者id
* @return 分页列表数据
*/
@GetMapping("/getHealthRecordListByResidentId")
public TableDataInfo getHealthRecordListById(Long residentId) {
@ -75,7 +72,7 @@ public class AppletPersonCenterController extends BaseController {
/**
* 根据id获取患者患者健康档案信息
*
* @param id
* @param id 居民患者id
* @return PatientInfo
*/
@GetMapping("/getHealthRecordInfoById")

14
postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/info/MobileInfoController.java
View File

@ -1,19 +1,16 @@
package com.xinelu.mobile.controller.info;
import com.xinelu.common.core.controller.BaseController;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.common.core.page.TableDataInfo;
import com.xinelu.manage.domain.info.Info;
import com.xinelu.manage.service.info.IInfoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import static com.xinelu.common.utils.PageUtils.startPage;
/**
* 微信端获取资讯信息
* 资讯信息Controller
@ -36,4 +33,9 @@ public class MobileInfoController extends BaseController {
return getDataTable(list);
}
@GetMapping("/getInfoById")
public AjaxResult getInfoById(Long id) {
return AjaxResult.success(infoService.selectInfoById(id));
}
}

9
postdischarge-mobile/src/main/java/com/xinelu/mobile/mapper/appletpersoncenter/AppletPersonCenterMapper.java
View File

@ -16,14 +16,15 @@ public interface AppletPersonCenterMapper {
/**
* 根据居民表id查询患者健康档案信息
*
* @param residentID
* @return
* @param residentId 居民患者id
* @return 列表信息
*/
List<HealthRecordDTO> getHealthRecordListByResidentID(Long residentID);
List<HealthRecordDTO> getHealthRecordListByResidentId(Long residentId);
/**
* 根绝id获取患者蒋康档案详细信息
* @param id
*
* @param id 居民患者id
* @return 健康档案详细信息
*/

6
postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/AppletPersonCenterService.java
View File

@ -32,18 +32,18 @@ public interface AppletPersonCenterService {
AjaxResult getResidentInfoById(Long residentId);
/**
* 根据居民表id查询患者健康档案信息
*
* @param residentId
* @param residentId 居民患者id
* @return 列表信息
*/
List<HealthRecordDTO> getHealthRecordListByResidentId(Long residentId);
/**
* 根绝id获取患者健康档案详细信息
* @param id
*
* @param id 居民患者id
* @return 监控档案详细信息
*/

7
postdischarge-mobile/src/main/java/com/xinelu/mobile/service/appletpersoncenter/Impl/AppletPersonCenterServiceImpl.java
View File

@ -130,19 +130,19 @@ public class AppletPersonCenterServiceImpl implements AppletPersonCenterService
/**
* 根据居民表id查询患者健康档案信息
*
* @param residentId
* @param residentId 居民患者id
* @return 健康档案列表
*/
@Override
public List<HealthRecordDTO> getHealthRecordListByResidentId(Long residentId) {
return appletPersonCenterMapper.getHealthRecordListByResidentID(residentId);
return appletPersonCenterMapper.getHealthRecordListByResidentId(residentId);
}
/**
* 根据id获取患者患者健康档案信息
*
* @param id
* @param id 居民患者id
* @return PatientInfo
*/
@Override
@ -154,7 +154,6 @@ public class AppletPersonCenterServiceImpl implements AppletPersonCenterService
} else if (StringUtils.equals(healthRecordInfoDTO.getSignStatus(), "IN_SIGN")) {
healthRecordInfoDTO.setSignStatus("是");
}
return healthRecordInfoDTO;
}
}

4
postdischarge-mobile/src/main/resources/mapper/appletpersoncenter/AppletPersonCenterMapper.xml
View File

@ -27,10 +27,10 @@
</resultMap>
<select id="getHealthRecordListByResidentID" parameterType="long" resultMap="HealthRecordResult">
<select id="getHealthRecordListByResidentId" parameterType="long" resultMap="HealthRecordResult">
select id, hospital_agency_name, department_name, visit_date
from patient_info
where resident_id = #{residentID}
where resident_id = #{residentId}
</select>
<select id="getHealthRecordInfoById" parameterType="long" resultMap="HealthRecordInfo">