Browse Source

Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into dev/neo2mysql20210120

gaodm 4 years ago
parent
commit
0032bf9704

+ 37 - 0
cdssman-service/src/main/java/com/diagbot/dto/RuleDTO.java

@@ -0,0 +1,37 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/1 15:40
+ */
+@Getter
+@Setter
+public class RuleDTO {
+    private Integer ruleLibType;
+    private String ruleLibName;
+    private Long ruleId;
+    private Long ruleConceptId;
+    private String ruleDescription;
+    private Integer hasSubCond;
+    private String ruleMsg;
+    private Integer groupType;
+    private Long ruleBaseId;
+    private String ruleBaseDescription;
+    private String ruleBaseEqOperator;
+    private String ruleBaseEqUnit;
+    private Double ruleBaseEqValue;
+    private String ruleMaxOperator;
+    private String ruleBaseMaxUnit;
+    private Double ruleBaseMaxValue;
+    private String ruleMinOperator;
+    private String ruleBaseMinUnit;
+    private Double ruleBaseMinValue;
+    private Integer ruleBaseType;
+    private Long ruleBaseConceptId;
+    private String ruleBaseLibName;
+    private Integer ruleBaseLibType;
+}

+ 16 - 0
cdssman-service/src/main/java/com/diagbot/facade/KlRuleFacade.java

@@ -0,0 +1,16 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.KlRuleServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/1 16:20
+ */
+@Component
+public class KlRuleFacade extends KlRuleServiceImpl {
+    public  void  billCommon(){
+
+    }
+}

+ 12 - 0
cdssman-service/src/main/java/com/diagbot/facade/MedRuleConvertFacade.java

@@ -0,0 +1,12 @@
+package com.diagbot.facade;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/1 16:49
+ */
+@Component
+public class MedRuleConvertFacade {
+}

+ 5 - 1
cdssman-service/src/main/java/com/diagbot/mapper/KlRuleMapper.java

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
+import com.diagbot.dto.RuleDTO;
 import com.diagbot.entity.KlRule;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.vo.RuleVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2021-03-01
  */
 public interface KlRuleMapper extends BaseMapper<KlRule> {
-
+    List<RuleDTO> getRules(RuleVO ruleVO);
 }

+ 6 - 2
cdssman-service/src/main/java/com/diagbot/service/KlRuleService.java

@@ -1,7 +1,11 @@
 package com.diagbot.service;
 
-import com.diagbot.entity.KlRule;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.RuleDTO;
+import com.diagbot.entity.KlRule;
+import com.diagbot.vo.RuleVO;
+
+import java.util.List;
 
 /**
  * <p>
@@ -12,5 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-03-01
  */
 public interface KlRuleService extends IService<KlRule> {
-
+    List<RuleDTO> getRules(RuleVO ruleVO);
 }

+ 8 - 2
cdssman-service/src/main/java/com/diagbot/service/impl/KlRuleServiceImpl.java

@@ -1,12 +1,16 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.RuleDTO;
 import com.diagbot.entity.KlRule;
 import com.diagbot.mapper.KlRuleMapper;
 import com.diagbot.service.KlRuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.RuleVO;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 规则信息表 服务实现类
@@ -18,5 +22,7 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("med")
 public class KlRuleServiceImpl extends ServiceImpl<KlRuleMapper, KlRule> implements KlRuleService {
-
+    public List<RuleDTO> getRules(RuleVO ruleVO) {
+        return baseMapper.getRules(ruleVO);
+    }
 }

+ 14 - 0
cdssman-service/src/main/java/com/diagbot/vo/RuleVO.java

@@ -0,0 +1,14 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/3/1 16:07
+ */
+@Getter
+@Setter
+public class RuleVO {
+}

+ 63 - 0
cdssman-service/src/main/resources/mapper/KlRuleMapper.xml

@@ -18,4 +18,67 @@
         <result column="msg" property="msg" />
     </resultMap>
 
+    <select id="getRules" resultType="com.diagbot.dto.RuleDTO">
+        SELECT
+        t1.lib_type AS ruleLibType,
+        t1.lib_name AS ruleLibName,
+        t1.rule_id AS ruleId,
+        t1.concept_id AS ruleConceptId,
+        t1.description AS ruleDescription,
+        t1.has_sub_cond AS hasSubCond,
+        t1.msg AS ruleMsg,
+        t2.group_type AS groupType,
+        t2.rule_base_id AS ruleBaseId,
+        t3.description AS ruleBaseDescription,
+        t3.eq_operator AS ruleBaseEqOperator,
+        t3.eq_unit AS ruleBaseEqUnit,
+        t3.eq_value AS ruleBaseEqValue,
+        t3.max_operator AS ruleMaxOperator,
+        t3.max_unit AS ruleBaseMaxUnit,
+        t3.max_value AS ruleBaseMaxValue,
+        t3.min_operator AS ruleMinOperator,
+        t3.min_unit AS ruleBaseMinUnit,
+        t3.min_value AS ruleBaseMinValue,
+        t3.type AS ruleBaseType,
+        t3.concept_id AS ruleBaseConceptId,
+        t4.lib_name AS ruleBaseLibName,
+        t4.lib_type AS ruleBaseLibType
+        FROM
+        (
+        SELECT
+        a.lib_type,
+        a.lib_name,
+        b.id AS rule_id,
+        b.concept_id,
+        b.description,
+        b.has_sub_cond,
+        b.msg,
+        b.`status`
+        FROM
+        kl_concept a,
+        kl_rule b
+        WHERE
+        a.is_deleted = 'N'
+        AND b.is_deleted = 'N'
+        AND a.id = b.concept_id
+        <if test="libTypes != null and libTypes.size > 0">
+            <foreach item="libType" collection="libTypes" open="and(" separator="or" close=")" >
+                a.lib_type = #{typeId}
+            </foreach>
+        </if>
+        <if test="ruleType != null">
+            AND b.rule_type = #{ruleType}
+        </if>
+        AND a.`status` = 1
+        AND b.`status` = 1
+        ) t1
+        LEFT JOIN kl_rule_condition t2 ON t1.rule_id = t2.rule_id
+        AND t2.is_deleted = 'N'
+        LEFT JOIN kl_rule_base t3 ON t2.rule_base_id = t3.id
+        AND t3.is_deleted = 'N'
+        AND t3.`status` = 1
+        LEFT JOIN kl_concept t4 ON t3.concept_id = t4.id
+        AND t4.is_deleted = 'N'
+        AND t4.`status` = 1
+    </select>
 </mapper>