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

Merge branch 'dev' of http://182.92.166.109:3000/jihan/PostDischargePatientManage into dev

Browse Source
This commit is contained in:
haown 2024-04-19 08:33:35 +08:00
commit 00a332cb9a
5 changed files with 105 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -15,14 +15,21 @@
</resultMap> </resultMap>
<sql id="selectInfoCategoryVo"> <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> </sql>
<select id="selectInfoCategoryList" parameterType="InfoCategory" resultMap="InfoCategoryResult"> <select id="selectInfoCategoryList" parameterType="InfoCategory" resultMap="InfoCategoryResult">
<include refid="selectInfoCategoryVo"/> <include refid="selectInfoCategoryVo"/>
<where> <where>
<if test="infoCategoryCode != null and infoCategoryCode != ''"> <if test="infoCategoryCode != null and infoCategoryCode != ''">
and info_category_code = #{infoCategoryCode} and info_category_code like concat('%', #{infoCategoryCode}, '%')
</if> </if>
<if test="infoCategoryName != null and infoCategoryName != ''"> <if test="infoCategoryName != null and infoCategoryName != ''">
and info_category_name like concat('%', #{infoCategoryName}, '%') and info_category_name like concat('%', #{infoCategoryName}, '%')
@ -112,7 +119,9 @@
</update> </update>
<delete id="deleteInfoCategoryById" parameterType="Long"> <delete id="deleteInfoCategoryById" parameterType="Long">
delete from info_category where id = #{id} delete
from info_category
where id = #{id}
</delete> </delete>
<delete id="deleteInfoCategoryByIds" parameterType="String"> <delete id="deleteInfoCategoryByIds" parameterType="String">
@ -130,7 +139,6 @@
</select> </select>
<insert id="insertInfoCategoryList"> <insert id="insertInfoCategoryList">
insert into info_category( insert into info_category(
info_category_code, info_category_code,

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

@ -77,7 +77,7 @@
#{fieldMark} #{fieldMark}
</if> </if>
</where> </where>
order by create_time DESC order by content_sort, create_time DESC
</select> </select>
<select id="selectLabelFieldContentById" parameterType="Long" <select id="selectLabelFieldContentById" parameterType="Long"

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

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

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