lenovodn 2 лет назад
Родитель
Сommit
36079342a6

+ 47 - 43
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/FactorEnchanceController.java

@@ -291,54 +291,58 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         }
         factorEnchance.setFactorCatalogId(factorEnchance.getFactorCatalog());
         if (factorEnchance.getEnhanceType() == 1 || factorEnchance.getEnhanceType() == 4 || factorEnchance.getEnhanceType() == 7) {
-            List<FactorAttrRela> inList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.INPUT).eq(FactorAttrRela::getFactorEnhanceId, factorEnchance.getId()).list();
-            if (inList.size() > 0) {
-                inList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));
-                List<Integer> in = inList.stream().map(item -> item.getEventAttrId()).collect(Collectors.toList());
-                List<EventAttr> list = eventAttrService.lambdaQuery().in(EventAttr::getId, in).list();
-                if (list.size() > 0) {
-                    List<String> collect = list.stream().map(item -> item.getChName()).collect(Collectors.toList());
-                    factorEnchance.setInParamNameList(collect);
-                }
-            }
-            List<FactorAttrRela> outList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.OUTPUT).eq(FactorAttrRela::getFactorEnhanceId, factorEnchance.getId()).list();
-            if (outList.size() > 0) {
-                outList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));
-                List<Integer> out = outList.stream().map(item -> item.getEventAttrId()).collect(Collectors.toList());
-                List<EventAttr> list = eventAttrService.lambdaQuery().in(EventAttr::getId, out).list();
-                if (list.size() > 0) {
-                    List<String> collect = list.stream().map(item -> item.getChName()).collect(Collectors.toList());
-                    factorEnchance.setOutParamNameList(collect);
-                }
-            }
+            List<String> list = eventAttrService.getByInById(factorEnchance.getId());
+            factorEnchance.setInParamNameList(list);
+//            List<String> outList = eventAttrService.getByOutById(factorEnchance.getId());
+//            factorEnchance.setOutParamNameList(outList);
+
         }
         if (factorEnchance.getEnhanceType() == 2 && factorEnchance.getExtAttr3().equals("0")) {
             List<FactorCondRela> factorCondRelaList = factorCondRelaService.lambdaQuery().eq(FactorCondRela::getFactorEnhanceId, factorEnchance.getId()).list();
             factorEnchance.setFactorCondRelaList(factorCondRelaList);
-            List<FactorAttrRela> outList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.OUTPUT).eq(FactorAttrRela::getFactorEnhanceId, factorEnchance.getId()).list();
-            if (outList.size() > 0) {
-                outList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));
-                List<Integer> out = outList.stream().map(item -> item.getEventAttrId()).collect(Collectors.toList());
-                List<EventAttr> list = eventAttrService.lambdaQuery().in(EventAttr::getId, out).list();
-                if (list.size() > 0) {
-                    List<String> collect = list.stream().map(item -> item.getChName()).collect(Collectors.toList());
-                    factorEnchance.setOutParamNameList(collect);
-                }
-            }
+//            List<FactorAttrRela> outList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.OUTPUT).eq(FactorAttrRela::getFactorEnhanceId, factorEnchance.getId()).list();
+//            if (outList.size() > 0) {
+//                outList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));
+//                List<Integer> out = outList.stream().map(item -> item.getEventAttrId()).collect(Collectors.toList());
+//                List<EventAttr> list = eventAttrService.lambdaQuery().in(EventAttr::getId, out).list();
+//                if (list.size() > 0) {
+//                    List<String> collect = list.stream().map(item -> item.getChName()).collect(Collectors.toList());
+//                    factorEnchance.setOutParamNameList(collect);
+//                }
+//            }
+//            List<String> outList = eventAttrService.getByOutById(factorEnchance.getId());
+//            factorEnchance.setOutParamNameList(outList);
         }
         if (factorEnchance.getEnhanceType() == 6) {
             List<FactorCondRela> factorCondRelaList = factorCondRelaService.lambdaQuery().eq(FactorCondRela::getFactorEnhanceId, factorEnchance.getId()).list();
             factorEnchance.setFactorCondRelaList(factorCondRelaList);
-            List<FactorAttrRela> outList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.OUTPUT).eq(FactorAttrRela::getFactorEnhanceId, factorEnchance.getId()).list();
-            if (outList.size() > 0) {
-                outList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));
-                List<Integer> out = outList.stream().map(item -> item.getEventAttrId()).collect(Collectors.toList());
-                List<EventAttr> list = eventAttrService.lambdaQuery().in(EventAttr::getId, out).list();
-                if (list.size() > 0) {
-                    List<String> collect = list.stream().map(item -> item.getChName()).collect(Collectors.toList());
-                    factorEnchance.setOutParamNameList(collect);
-                }
+//            List<FactorAttrRela> outList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.OUTPUT).eq(FactorAttrRela::getFactorEnhanceId, factorEnchance.getId()).list();
+//            if (outList.size() > 0) {
+//                outList.sort(Comparator.comparing(FactorAttrRela::getSeqNum));
+//                List<Integer> out = outList.stream().map(item -> item.getEventAttrId()).collect(Collectors.toList());
+//                List<EventAttr> list = eventAttrService.lambdaQuery().in(EventAttr::getId, out).list();
+//                if (list.size() > 0) {
+//                    List<String> collect = list.stream().map(item -> item.getChName()).collect(Collectors.toList());
+//                    factorEnchance.setOutParamNameList(collect);
+//                }
+//            }
+
+        }
+//        case 1: 'SQL取值'
+//        case 2: 逻辑判断'
+//        case 4: 插件提取'
+//        case 6: '常量赋值'
+//        case 7: 属性赋值'
+        if(factorEnchance.getEnhanceType()==1 ||factorEnchance.getEnhanceType()==4){
+            List<String> outList = eventAttrService.getByOutById(factorEnchance.getId());
+            factorEnchance.setOutParamNameList(outList);
+        }else{
+            EventAttr byId = eventAttrService.getById(factorEnchance.getEventAttrId());
+            List<String> name = new ArrayList<>();
+            if(byId!=null){
+                name.add(byId.getChName());
             }
+            factorEnchance.setOutParamNameList(name);
         }
         String title = "";
         List<MedicalEnchanceDto> dtoList = new ArrayList<>();
@@ -410,16 +414,16 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
                         if (one != null) {
                             operator = dictService.queryDictTextByKey("operator", it.getOperator().toString());
                             if (it.getRefAttrType() == 1) {
-                                type = "扩展属性:";
+//                                type = "扩展属性:";
                                 text = it.getExtAttr1();
                             } else {
-                                type = "引用属性标识:";
+//                                type = "引用属性标识:";
                                 EventAttr two = eventAttrService.lambdaQuery().eq(EventAttr::getId, it.getRefEventAttrId()).one();
                                 text = two.getChName();
                             }
                         }
-                        String concat = string.concat("逻辑表达式:").concat(one.getChName()+";").concat("比较符:")
-                                .concat(operator+";").concat("引用属性类型:").concat(type).concat(text);
+                        String concat = string.concat(one.getChName() + "(" + one.getEnName() + ")")
+                                .concat(operator).concat(type).concat(text);
                         str.add(concat);
                     });
                     logical4.setValue(str);

+ 9 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/MedicalInsRuleInfoController.java

@@ -398,6 +398,11 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     @ApiOperation(value = "medical_ins_rule_info-通过id删除", notes = "medical_ins_rule_info-通过id删除")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        List<MedicalInsRuleProject> list = projectService.lambdaQuery().eq(MedicalInsRuleProject::getMedicalInsRuleInfoId, id).list();
+        if(list.size()>0){
+            return Result.error("有医保规则数据,不能删除!");
+
+        }
         medicalInsRuleInfoService.removeById(id);
         return Result.OK("删除成功!");
     }
@@ -412,6 +417,10 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     @ApiOperation(value = "medical_ins_rule_info-批量删除", notes = "medical_ins_rule_info-批量删除")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        List<MedicalInsRuleProject> list = projectService.lambdaQuery().in(MedicalInsRuleProject::getMedicalInsRuleInfoId, ids).list();
+        if(list.size()>0){
+            return Result.error("有医保规则数据,不能删除!");
+        }
         this.medicalInsRuleInfoService.removeByIds(Arrays.asList(ids.split(",")));
         return Result.OK("批量删除成功!");
     }

+ 3 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/EventAttrMapper.java

@@ -14,4 +14,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EventAttrMapper extends BaseMapper<EventAttr> {
 
+    List<String> getInById(@Param("id") Integer id);
+    List<String> getOutById(@Param("id") Integer id);
+
 }

+ 14 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/EventAttrMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.medical.mapper.EventAttrMapper">
 
+    <select id="getInById" resultType="java.lang.String">
+
+        select ch_name
+        From event_attr
+        where id in (select event_attr_id From factor_attr_rela r where r.factor_enhance_id = #{id} and r.io_type = 1 order by  r.seq_num )
+
+    </select>
+    <select id="getOutById" resultType="java.lang.String">
+
+        select ch_name
+        From event_attr
+        where id in (select event_attr_id From factor_attr_rela r where r.factor_enhance_id = #{id} and r.io_type = 2 order by  r.seq_num )
+
+    </select>
 </mapper>

+ 5 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/IEventAttrService.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.medical.service;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.medical.entity.EventAttr;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * @Description: event_attr
  * @Author: jeecg-boot
@@ -10,5 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface IEventAttrService extends IService<EventAttr> {
+    List<String> getByInById(Integer id);
+    List<String> getByOutById(Integer id);
 
 }

+ 12 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/service/impl/EventAttrServiceImpl.java

@@ -7,6 +7,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: event_attr
  * @Author: jeecg-boot
@@ -16,4 +18,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class EventAttrServiceImpl extends ServiceImpl<EventAttrMapper, EventAttr> implements IEventAttrService {
 
+
+    @Override
+    public List<String> getByInById(Integer id) {
+        return baseMapper.getInById(id);
+    }
+
+    @Override
+    public List<String> getByOutById(Integer id) {
+        return baseMapper.getOutById(id);
+    }
 }