Merge branch 'develop' into dev/mix20200401_icss6.0

config-server/src/main/resources/shared/ltkg-service-dev.yml

@@ -95,4 +95,7 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.3.150:9998
+    address: http://192.168.3.150:9998
+term:
+  server:
+    address: http://192.168.3.150:23232

config-server/src/main/resources/shared/ltkg-service-local.yml

@@ -95,4 +95,7 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.3.150:9998
+    address: http://192.168.3.150:9998
+term:
+  server:
+    address: http://192.168.3.150:23232

config-server/src/main/resources/shared/ltkg-service-pre.yml

@@ -95,4 +95,7 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.2.186:9998
+    address: http://192.168.2.186:9998
+term:
+  server:
+    address: http://192.168.2.186:23232

config-server/src/main/resources/shared/ltkg-service-pro.yml

@@ -95,4 +95,7 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.2.123:9998
+    address: http://192.168.2.123:9998
+term:
+  server:
+    address: http://192.168.2.123:23232

config-server/src/main/resources/shared/ltkg-service-test.yml

@@ -95,4 +95,7 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.2.234:9998
+    address: http://192.168.2.234:9998
+term:
+  server:
+    address: http://192.168.2.234:23232

ltkg-service/src/main/java/com/diagbot/client/TermServiceClient.java

@@ -0,0 +1,19 @@
+package com.diagbot.client;
+
+import com.diagbot.client.hystrix.TermServiceHystrix;
+import com.diagbot.vo.TermVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-07-13 13:54
+ */
+@FeignClient(name = "Term", url = "${term.server.address}", fallback = TermServiceHystrix.class)
+public interface TermServiceClient {
+
+    @PostMapping(value = "/api/similarity")
+    String similaritys(@RequestBody TermVO termVO);
+}

ltkg-service/src/main/java/com/diagbot/client/hystrix/TermServiceHystrix.java

@@ -0,0 +1,21 @@
+package com.diagbot.client.hystrix;
+
+import com.diagbot.client.TermServiceClient;
+import com.diagbot.vo.TermVO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-07-13 14:13
+ */
+@Component
+@Slf4j
+public class TermServiceHystrix implements TermServiceClient {
+    @Override
+    public String similaritys(TermVO termVO) {
+        log.error("【hystrix】调用{}异常", "similaritys");
+        return null;
+    }
+}

ltkg-service/src/main/java/com/diagbot/facade/TermFacade.java

@@ -0,0 +1,28 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.TermServiceClient;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.vo.TermVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-07-10 15:09
+ */
+@Component
+public class TermFacade {
+    @Autowired
+    TermServiceClient termServiceClient;
+
+    public String getTerms(TermVO termVO) {
+        String similaritys = termServiceClient.similaritys(termVO);
+        if(similaritys==null){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "调用术语库服务失败");
+        }
+        return similaritys;
+    }
+}
+

ltkg-service/src/main/java/com/diagbot/vo/TermVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-07-10 15:10
+ */
+@Setter
+@Getter
+public class TermVO {
+    private String word_type;
+    private String word;
+    private Integer number;
+}

ltkg-service/src/main/java/com/diagbot/web/TermController.java

@@ -0,0 +1,34 @@
+package com.diagbot.web;
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.TermFacade;
+import com.diagbot.vo.TermVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2020-07-10 15:07
+ */
+@RestController
+@RequestMapping("/term")
+@Api(value = "医学术语映射相关API", tags = { "医学术语映射相关API" })
+@SuppressWarnings("unchecked")
+public class TermController {
+    @Autowired
+    private TermFacade termFacade;
+
+    @ApiOperation(value = "医学术语映射[zhaops]", notes = "")
+    @PostMapping("/getTerm")
+    @SysLogger("getTerm")
+    public RespDTO<String> getTerm(@RequestBody TermVO termVO) {
+        return RespDTO.onSuc(termFacade.getTerms(termVO));
+    }
+}

ltkg-service/src/main/resources/mapper/KgMapper.xml

@@ -41,7 +41,6 @@
         OPTIONAL MATCH p=(m)-[]->(o) where head(Labels(m)) in ["疾病","症状","药品通用名","手术和操作","实验室检查","辅助检查"]
         RETURN head(Labels(n)) as sLabel,n.name as sName,Type (r) as rType, head(Labels(m)) as eLabel,m.name as eName, count(p) as pCount
         ORDER BY rType
-        LIMIT 100
     </select>
 
     <select id="getTree" resultType="java.lang.String">

mrman-service/src/main/java/com/diagbot/dto/QcCasesEntryAllDTO.java

@@ -40,6 +40,18 @@ public class QcCasesEntryAllDTO {
      */
     private String name;
 
+    /**
+     * 控费标识(1：是控费条目，2：不是控费条目)
+     */
+    private Integer drgs;
+
+    /**
+     * 质控形式(1：形式质控，2：内涵质控)
+     */
+    private Integer type;
+
+
+
     /**
      * 规则类型(0：无，1：空项，2：错误)
      */

mrman-service/src/main/java/com/diagbot/entity/QcCasesEntry.java

@@ -45,6 +45,16 @@ public class QcCasesEntry implements Serializable {
      */
     private String name;
 
+    /**
+     * 控费标识(1：是控费条目，2：不是控费条目)
+     */
+    private Integer drgs;
+
+    /**
+     * 质控形式(1：形式质控，2：内涵质控)
+     */
+    private Integer type;
+
     /**
      * 规则类型(0：无，1：空项，2：错误)
      */

mrman-service/src/main/java/com/diagbot/facade/QcCacesEntryFacade.java

@@ -119,8 +119,8 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
             getUpdateInfoDetialDTO.setIsReject(casesEntryHospital.getIsReject());
             getUpdateInfoDetialDTO.setScore(casesEntryHospital.getScore());
             getUpdateInfoDetialDTOS.add(getUpdateInfoDetialDTO);
-            getUpdateInfoDTO.setGetUpdateInfoDetialDTOS(getUpdateInfoDetialDTOS);
         }
+        getUpdateInfoDTO.setGetUpdateInfoDetialDTOS(getUpdateInfoDetialDTOS);
         getUpdateInfoDTOS.add(getUpdateInfoDTO);
         return getUpdateInfoDTOS;
     }

mrman-service/src/main/java/com/diagbot/vo/InsertByHospitalVO.java

@@ -54,6 +54,16 @@ public class InsertByHospitalVO {
      */
     private String name;
 
+    /**
+     * 控费标识(1：是控费条目，2：不是控费条目)
+     */
+    private Integer drgs;
+
+    /**
+     * 质控形式(1：形式质控，2：内涵质控)
+     */
+    private Integer type;
+
     /**
      * 规则类型(0：无，1：空项，2：错误)
      */

mrman-service/src/main/java/com/diagbot/vo/QcCasesEntryAllVO.java

@@ -28,6 +28,16 @@ public class QcCasesEntryAllVO extends Page {
      */
     private String name;
 
+    /**
+     * 控费标识(1：是控费条目，2：不是控费条目)
+     */
+    private Integer drgs;
+
+    /**
+     * 质控形式(1：形式质控，2：内涵质控)
+     */
+    private Integer type;
+
     /**
      * 条目编码
      */

mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -13,6 +13,8 @@
         <result column="rule_type" property="ruleType" />
         <result column="dev_type" property="devType" />
         <result column="accuracy_type" property="accuracyType" />
+        <result column="drgs" property="drgs" />
+        <result column="type" property="type" />
         <result column="precond" property="precond" />
         <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />
@@ -42,6 +44,12 @@
         <if test="accuracyType != null">
             AND a.accuracy_type = #{accuracyType}
         </if>
+        <if test="drgs != null">
+            AND a.drgs = #{drgs}
+        </if>
+        <if test="type != null">
+            AND a.type = #{type}
+        </if>
         <if test="name != null and name != ''">
             AND  UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
         </if>
@@ -269,7 +277,7 @@
             AND t2.case_entry_id = #{entryId}
         )
     </select>
-    
+
     <delete id="deleteQcTypeEntry">
         DELETE t2
         FROM