触发条件修改。

postdischarge-manage/src/main/java/com/xinelu/manage/controller/signpatientmanageroute/SignPatientManageRouteController.java

@@ -38,7 +38,6 @@ public class SignPatientManageRouteController extends BaseController {
     /**
      * 查询签约患者管理任务路径列表
      */
-    //@PreAuthorize("@ss.hasPermi('manage:signroute:list')")
     @GetMapping("/list")
     public TableDataInfo list(SignPatientManageRoute signPatientManageRoute) {
         startPage();
@@ -61,7 +60,6 @@ public class SignPatientManageRouteController extends BaseController {
     /**
      * 获取签约患者管理任务路径详细信息
      */
-    //@PreAuthorize("@ss.hasPermi('manage:signroute:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(signPatientManageRouteService.selectSignPatientManageRouteById(id));
@@ -70,7 +68,6 @@ public class SignPatientManageRouteController extends BaseController {
     /**
      * 新增签约患者管理任务路径
      */
-    //@PreAuthorize("@ss.hasPermi('manage:signroute:add')")
     @Log(title = "签约患者管理任务路径", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult add(@RequestBody @Validated(Insert.class) SignPatientManageRouteVO signPatientManageRoute) {
@@ -80,7 +77,6 @@ public class SignPatientManageRouteController extends BaseController {
     /**
      * 修改签约患者管理任务路径(未使用)
      */
-    //@PreAuthorize("@ss.hasPermi('manage:signroute:edit')")
     @Log(title = "签约患者管理任务路径", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody SignPatientManageRouteVO signPatientManageRoute) {
@@ -90,7 +86,6 @@ public class SignPatientManageRouteController extends BaseController {
     /**
      * 删除签约患者管理任务路径
      */
-    //@PreAuthorize("@ss.hasPermi('manage:signroute:remove')")
     @Log(title = "签约患者管理任务路径", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
@@ -130,4 +125,6 @@ public class SignPatientManageRouteController extends BaseController {
     public AjaxResult selectPhonePush(Long manageRouteNodeId){
         return signPatientManageRouteService.selectPhonePush(manageRouteNodeId);
     }
+
+
 }

postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java

@@ -76,7 +76,6 @@ public class SpecialDiseaseRouteController extends BaseController {
     /**
      * 修改专病路径信息及服务包信息
      */
-    //@PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:edit')")
     @Log(title = "专病路径信息", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody @Validated(Update.class) SpecialDiseaseRouteVO specialDiseaseRoute) {

postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasetriggercondition/SpecialDiseaseTriggerConditionController.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.controller.specialdiseasetriggercondition;
 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;
@@ -96,8 +97,8 @@ public class SpecialDiseaseTriggerConditionController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:triggerCondition:edit')")
     @Log(title = "触发条件关系", businessType = BusinessType.UPDATE)
     @PutMapping("/edit")
-    public AjaxResult edit(@RequestBody TriggerConditionUpdateDto triggerConditionUpdateDto) {
+    public R<String> edit(@RequestBody TriggerConditionUpdateDto triggerConditionUpdateDto) {
-        return toAjax(specialDiseaseTriggerConditionService.updateSpecialDiseaseTriggerCondition(triggerConditionUpdateDto));
+        return R.ok(specialDiseaseTriggerConditionService.updateSpecialDiseaseTriggerCondition(triggerConditionUpdateDto));
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/ISpecialDiseaseTriggerConditionService.java

@@ -42,7 +42,7 @@ public interface ISpecialDiseaseTriggerConditionService {
      * @param triggerConditionUpdateDto 触发条件关系
      * @return 结果
      */
-    int updateSpecialDiseaseTriggerCondition(TriggerConditionUpdateDto triggerConditionUpdateDto);
+    String updateSpecialDiseaseTriggerCondition(TriggerConditionUpdateDto triggerConditionUpdateDto);
 
     /**
      * 批量删除触发条件关系

postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasetriggercondition/impl/SpecialDiseaseTriggerConditionServiceImpl.java

@@ -1,8 +1,10 @@
 package com.xinelu.manage.service.specialdiseasetriggercondition.impl;
 
 import com.xinelu.common.constant.Constants;
+import com.xinelu.common.core.redis.RedisCache;
 import com.xinelu.common.enums.ReleaseStatusEnum;
 import com.xinelu.common.exception.ServiceException;
+import com.xinelu.common.utils.DictUtils;
 import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.StringUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
@@ -22,7 +24,7 @@ import java.util.Objects;
 import javax.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
-
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 触发条件关系Service业务层处理
@@ -38,6 +40,8 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas
 	private SpecialDiseaseRouteMapper specialDiseaseRouteMapper;
 	@Resource
 	private GenerateSystemCodeUtil generateSystemCodeUtil;
+	@Resource
+	private RedisCache redisCache;
 
     /**
      * 查询触发条件关系
@@ -122,7 +126,8 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas
      * @return 结果
      */
     @Override
-    public int updateSpecialDiseaseTriggerCondition(TriggerConditionUpdateDto triggerConditionUpdateDto) {
+    @Transactional(rollbackFor = Exception.class)
+    public String updateSpecialDiseaseTriggerCondition(TriggerConditionUpdateDto triggerConditionUpdateDto) {
 	    // 判断主路径的发布状态
 	    SpecialDiseaseRoute route = specialDiseaseRouteMapper.selectSpecialDiseaseRouteById(triggerConditionUpdateDto.getRouteId());
 		if (Objects.nonNull(route)) {
@@ -168,8 +173,11 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas
 		    triggerCondition.setRouteName(specialDiseaseRoute.getRouteName());
 		    triggerConditions.add(triggerCondition);
 	    });
-
+	    int flag = specialDiseaseTriggerConditionMapper.insertTriggerConditionList(triggerConditions);
-        return specialDiseaseTriggerConditionMapper.insertTriggerConditionList(triggerConditions);
+		if (flag <= 0) {
+			throw new ServiceException("修改失败");
+		}
+        return specialDiseaseRoute.getRouteName();
     }
 
     /**
@@ -199,13 +207,13 @@ public class SpecialDiseaseTriggerConditionServiceImpl implements ISpecialDiseas
 		for (int i = 0; i < triggerConditionList.size(); i++) {
 			TriggerConditionDto item = triggerConditionList.get(i);
 			if (i == 0) {
-				routeName.append(item.getTriggerConditionName() + item.getTriggerConditionOperatorName() + item.getTriggerConditionValue());
+				routeName.append(DictUtils.getDictLabel("trigger_condition_name", item.getTriggerConditionCode()) + DictUtils.getDictLabel("trigger_condition_operator", item.getTriggerConditionOperator()) + item.getTriggerConditionValue());
 			}
 			if (i == 1) {
-				routeName.append("|"+ item.getTriggerConditionName() + item.getTriggerConditionOperatorName() + item.getTriggerConditionValue());
+				routeName.append("|"+ DictUtils.getDictLabel("trigger_condition_name", item.getTriggerConditionCode()) + DictUtils.getDictLabel("trigger_condition_operator", item.getTriggerConditionOperator()) + item.getTriggerConditionValue());
 			}
 			if (i == 2) {
-				routeName.append("(" + item.getTriggerLogicName() + ")" + item.getTriggerConditionName() + item.getTriggerConditionOperatorName() + item.getTriggerConditionValue());
+				routeName.append("(" + DictUtils.getDictLabel("trigger_logic", item.getTriggerLogic()) + ")" + DictUtils.getDictLabel("trigger_condition_name", item.getTriggerConditionCode()) + DictUtils.getDictLabel("trigger_condition_operator", item.getTriggerConditionOperator()) + item.getTriggerConditionValue());
 			}
 		}
 		return routeName.toString();