增加人群管理。

2024-05-16 16:47:17 +08:00 · 2024-05-16 16:47:17 +08:00 · d6584ca950
commit d6584ca950
parent de9065e8d6
7 changed files with 20 additions and 23 deletions
--- 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
@ -52,7 +52,6 @@ public class CrowdInfoController extends BaseController {
 	 * 查询人群信息列表
 	 */
 	@ApiOperation("查询人群信息列表")
-	@PreAuthorize("@ss.hasPermi('manage:crowdInfo:list')")
 	@GetMapping("/getList")
 	public R<List<CrowdInfo>> getList(CrowdInfo crowdInfo) {
 		List<CrowdInfo> list = crowdInfoService.selectCrowdInfoList(crowdInfo);
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java
@ -74,7 +74,7 @@ public class PatientVisitRecordController extends BaseController {
    /**
     * 获取患者就诊记录基本信息详细信息
     */
-    @PreAuthorize("@ss.hasPermi('manage:visit:query')")
+    //@PreAuthorize("@ss.hasPermi('manage:visit:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(patientVisitRecordService.selectPatientVisitRecordById(id));
@ -83,7 +83,7 @@ public class PatientVisitRecordController extends BaseController {
 	/**
 	 * 查询患者最新一次就诊记录信息
 	 */
-	@PreAuthorize("@ss.hasPermi('manage:visit:query')")
+	//@PreAuthorize("@ss.hasPermi('manage:visit:query')")
 	@GetMapping(value = "/getByPatientId/{patientId}")
 	public R<PatientVisitRecordVo> getByPatientId(@PathVariable("patientId") Long patientId) {
 		return R.ok(patientVisitRecordService.getByPatientId(patientId));
@ -139,7 +139,7 @@ public class PatientVisitRecordController extends BaseController {
    /**
     * 删除患者就诊记录基本信息
     */
-    @PreAuthorize("@ss.hasPermi('manage:visit:remove')")
+    //@PreAuthorize("@ss.hasPermi('manage:visit:remove')")
    @Log(title = "患者就诊记录基本信息", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java
@ -38,7 +38,7 @@ public class SignPatientManageRouteController extends BaseController {
    /**
     * 查询签约患者管理任务路径列表
     */
-    @PreAuthorize("@ss.hasPermi('manage:signroute:list')")
+    //@PreAuthorize("@ss.hasPermi('manage:signroute:list')")
    @GetMapping("/list")
    public TableDataInfo list(SignPatientManageRoute signPatientManageRoute) {
        startPage();
@ -61,7 +61,7 @@ public class SignPatientManageRouteController extends BaseController {
    /**
     * 获取签约患者管理任务路径详细信息
     */
-    @PreAuthorize("@ss.hasPermi('manage:signroute:query')")
+    //@PreAuthorize("@ss.hasPermi('manage:signroute:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(signPatientManageRouteService.selectSignPatientManageRouteById(id));
@ -70,7 +70,7 @@ public class SignPatientManageRouteController extends BaseController {
    /**
     * 新增签约患者管理任务路径
     */
-    @PreAuthorize("@ss.hasPermi('manage:signroute:add')")
+    //@PreAuthorize("@ss.hasPermi('manage:signroute:add')")
    @Log(title = "签约患者管理任务路径", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody @Validated(Insert.class) SignPatientManageRouteVO signPatientManageRoute) {
@ -80,7 +80,7 @@ public class SignPatientManageRouteController extends BaseController {
    /**
     * 修改签约患者管理任务路径(未使用)
     */
-    @PreAuthorize("@ss.hasPermi('manage:signroute:edit')")
+    //@PreAuthorize("@ss.hasPermi('manage:signroute:edit')")
    @Log(title = "签约患者管理任务路径", businessType = BusinessType.UPDATE)
    @PutMapping("/edit")
    public AjaxResult edit(@RequestBody SignPatientManageRouteVO signPatientManageRoute) {
@ -90,7 +90,7 @@ public class SignPatientManageRouteController extends BaseController {
    /**
     * 删除签约患者管理任务路径
     */
-    @PreAuthorize("@ss.hasPermi('manage:signroute:remove')")
+    //@PreAuthorize("@ss.hasPermi('manage:signroute:remove')")
    @Log(title = "签约患者管理任务路径", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java
@ -33,7 +33,7 @@ public class SpecialDiseaseRouteController extends BaseController {
    /**
     * 查询专病路径信息列表
     */
-    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:list')")
+    //@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:list')")
    @GetMapping("/list")
    public TableDataInfo list(SpecialDiseaseRouteDTO specialDiseaseRoute) {
        startPage();
@ -44,7 +44,7 @@ public class SpecialDiseaseRouteController extends BaseController {
    /**
     * 获取专病路径信息详细信息
     */
-    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:query')")
+    //@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(specialDiseaseRouteService.selectSpecialDiseaseRouteById(id));
@ -53,7 +53,7 @@ public class SpecialDiseaseRouteController extends BaseController {
    /**
     * 新增专病路径信息及服务包信息
     */
-    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:add')")
+    //@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:add')")
    @Log(title = "专病路径信息", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public AjaxResult add(@RequestBody @Validated(Insert.class) SpecialDiseaseRouteVO specialDiseaseRoute) {
@ -63,7 +63,7 @@ public class SpecialDiseaseRouteController extends BaseController {
    /**
     * 修改专病路径信息及服务包信息
     */
-    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')")
    @Log(title = "专病路径信息", businessType = BusinessType.UPDATE)
    @PutMapping("/edit")
    public AjaxResult edit(@RequestBody @Validated(Update.class) SpecialDiseaseRouteVO specialDiseaseRoute) {
--- 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
@ -53,6 +53,7 @@ public class CrowdInfoServiceImpl implements ICrowdInfoService {
    public int insertCrowdInfo(CrowdInfo crowdInfo) {
        crowdInfo.setCreateTime(LocalDateTime.now());
        crowdInfo.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+	    crowdInfo.setDelFlag(0);
        return crowdInfoMapper.insertCrowdInfo(crowdInfo);
    }

--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
@ -132,12 +132,17 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
 								}
 								break;
 							case (TaskContentConstants.QUESTIONNAIRE_SCALE): // 问卷量表-返回问卷信息
-							case (TaskContentConstants.ARTIFICIAL_FOLLOW_UP): // 人工随访-返回问卷信息
 								if (node.getQuestionInfoId() != null) {
 									QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getQuestionInfoId());
 									detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
 								}
 								break;
+							case (TaskContentConstants.ARTIFICIAL_FOLLOW_UP): // 人工随访-返回问卷信息
+								if (node.getFollowTemplateId() != null) {
+									QuestionVO questionVO = questionInfoService.selectQuestionInfoById(node.getFollowTemplateId());
+									detailInfo = JSONObject.parseObject(JSONObject.toJSONString(questionVO));
+								}
+								break;
 							case (TaskContentConstants.PROPAGANDA_ARTICLE): // 宣教文章-返回宣教库信息
 								if (node.getPropagandaInfoId() != null) {
 									PropagandaMaterialsVo propagandaMaterialsVo = propagandaInfoService.selectPropagandaInfoById(node.getPropagandaInfoId());
--- a/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/crowdinfo/CrowdInfoMapper.xml
@ -29,6 +29,7 @@
    <select id="selectCrowdInfoList" parameterType="CrowdInfo" resultMap="CrowdInfoResult">
        <include refid="selectCrowdInfoVo"/>
        <where>
+	        del_flag = 0
            <if test="crowdName != null  and crowdName != ''">
                and crowd_name like concat('%', #{crowdName}, '%')
            </if>
@ -50,15 +51,6 @@
            <if test="whetherDisable != null ">
                and whether_disable = #{whetherDisable}
            </if>
-            <if test="sort != null ">
-                and sort = #{sort}
-            </if>
-            <if test="createTime != null ">
-                and create_time = #{createTime}
-            </if>
-            <if test="updateTime != null ">
-                and update_time = #{updateTime}
-            </if>
        </where>
    </select>