Przeglądaj źródła

Merge branch 'develop' into dev/mrman20200609_qctype

gaodm 5 lat temu
rodzic
commit
643d76626f

+ 3 - 1
ltkg-service/src/main/java/com/diagbot/facade/KgFacade.java

@@ -119,7 +119,9 @@ public class KgFacade extends KgServiceImpl {
                 && (kgTreeVO.getSubType() == 1 || kgTreeVO.getSubType() == 2 || kgTreeVO.getSubType() == 3))
                 || (kgTreeVO.getType() == 2 && (kgTreeVO.getSubType() == 0))
                 || (kgTreeVO.getType() == 3 && (kgTreeVO.getSubType() == 0))
-                || (kgTreeVO.getType() == 4 && (kgTreeVO.getSubType() == 0))) {
+                || (kgTreeVO.getType() == 4 && (kgTreeVO.getSubType() == 0))
+                || (kgTreeVO.getType() == 5 && (kgTreeVO.getSubType() == 0))
+                || (kgTreeVO.getType() == 6 && (kgTreeVO.getSubType() == 0))) {
             // KgQueryVO kgQueryVO = new KgQueryVO();
             // kgQueryVO.setLabelName("诊断依据");
             // kgQueryVO.setInputStr("诊断依据");

+ 7 - 2
ltkg-service/src/main/java/com/diagbot/web/KgController.java

@@ -57,8 +57,13 @@ public class KgController {
     }
 
     @ApiOperation(value = "获取树形分类",
-            notes = "获取树形分类(疾病ICD10:t:1,st:1)" +
-                    "(疾病科室:t:1,st:2)")
+            notes = "获取树形分类(疾病ICD10:t:1,st:1)<br>" +
+                    "(疾病科室:t:1,st:2)<br>" +
+                    "(药品:t:2,st:0)<br>" +
+                    "(症状:t:3,st:0)<br>" +
+                    "(手术和操作:t:4,st:0)<br>" +
+                    "(实验室检查:t:5,st:0)<br>" +
+                    "(辅助检查:t:6,st:0)<br>")
     @PostMapping("/getTree")
     @SysLogger("getTree")
     @Cacheable(value = KGTREECACHE, key = "'kgtree:t_' + #kgTreeVO.type + '_st_' + #kgTreeVO.subType")

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

@@ -38,7 +38,7 @@
     <select id="getGraph" parameterType='com.diagbot.vo.KgQueryVO' resultMap="GraphResultMap">
         MATCH (n:${labelName})-[r]->(m)
         where n.name = #{inputStr}
-        OPTIONAL MATCH p=(m)-[]->(o) where head(Labels(m)) in ["疾病","症状","药品通用名"]
+        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

+ 1 - 0
mrman-service/src/main/java/com/diagbot/dto/GetUpdateInfoDetialDTO.java

@@ -16,5 +16,6 @@ public class GetUpdateInfoDetialDTO {
     private String hospitalName;
     private BigDecimal score;
     private Integer isUsed;
+    private Integer isReject;
     private String msg;
 }

+ 7 - 3
mrman-service/src/main/java/com/diagbot/facade/CasesEntryHospitalFacade.java

@@ -88,6 +88,7 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
                     getAllByHospitalDetialDTO.setModeName(qcCasesEntry.getModeName());
                     getAllByHospitalDetialDTO.setMsg(casesEntryHospitalMap.get(qcCasesEntry.getId()).getMsg());
                     getAllByHospitalDetialDTO.setIsUsed(casesEntryHospitalMap.get(qcCasesEntry.getId()).getIsUsed());
+                    getAllByHospitalDetialDTO.setIsReject(casesEntryHospitalMap.get(qcCasesEntry.getId()).getIsReject());
                     getAllByHospitalDetialDTO.setScore(casesEntryHospitalMap.get(qcCasesEntry.getId()).getScore());
                     getAllByHospitalDetialDTO.setPrecond(qcCasesEntry.getPrecond());
                     getAllByHospitalDetialDTO.setName(qcCasesEntry.getName());
@@ -114,11 +115,14 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
         casesEntryHospitalQueryWrapper
                 .eq("is_deleted",IsDeleteEnum.N.getKey())
                 .in("hospital_id",updateByHospitalVO.getHospitalIds());
-        this.remove(casesEntryHospitalQueryWrapper);
+
+        boolean res = this.remove(casesEntryHospitalQueryWrapper);
         //添加新的
-        casesEntryHospitalService.saveBatch(updateByHospitalVO.getCasesEntryHospitals());
+        if(res){
+           res = casesEntryHospitalService.saveAll(updateByHospitalVO.getCasesEntryHospitals());
+        }
 
-        return true;
+        return res;
     }
 
     /**

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

@@ -116,6 +116,7 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
             getUpdateInfoDetialDTO.setHospitalName(hospitalNameMap.get(casesEntryHospital.getHospitalId()));
             getUpdateInfoDetialDTO.setMsg(casesEntryHospital.getMsg());
             getUpdateInfoDetialDTO.setIsUsed(casesEntryHospital.getIsUsed());
+            getUpdateInfoDetialDTO.setIsReject(casesEntryHospital.getIsReject());
             getUpdateInfoDetialDTO.setScore(casesEntryHospital.getScore());
             getUpdateInfoDetialDTOS.add(getUpdateInfoDetialDTO);
             getUpdateInfoDTO.setGetUpdateInfoDetialDTOS(getUpdateInfoDetialDTOS);

+ 4 - 0
mrman-service/src/main/java/com/diagbot/mapper/CasesEntryHospitalMapper.java

@@ -2,6 +2,9 @@ package com.diagbot.mapper;
 
 import com.diagbot.entity.CasesEntryHospital;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CasesEntryHospitalMapper extends BaseMapper<CasesEntryHospital> {
 
+    boolean saveAll(@Param("list") List<CasesEntryHospital> casesEntryHospitals);
 }

+ 3 - 0
mrman-service/src/main/java/com/diagbot/service/CasesEntryHospitalService.java

@@ -3,6 +3,8 @@ package com.diagbot.service;
 import com.diagbot.entity.CasesEntryHospital;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 病历条目 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface CasesEntryHospitalService extends IService<CasesEntryHospital> {
 
+    boolean saveAll(List<CasesEntryHospital> casesEntryHospitals);
 }

+ 6 - 0
mrman-service/src/main/java/com/diagbot/service/impl/CasesEntryHospitalServiceImpl.java

@@ -6,6 +6,8 @@ import com.diagbot.service.CasesEntryHospitalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 病历条目 服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class CasesEntryHospitalServiceImpl extends ServiceImpl<CasesEntryHospitalMapper, CasesEntryHospital> implements CasesEntryHospitalService {
 
+    @Override
+    public boolean saveAll(List<CasesEntryHospital> casesEntryHospitals) {
+        return baseMapper.saveAll(casesEntryHospitals);
+    }
 }

+ 26 - 0
mrman-service/src/main/resources/mapper/CasesEntryHospitalMapper.xml

@@ -19,4 +19,30 @@
         <result column="remark" property="remark" />
     </resultMap>
 
+    <insert id="saveAll" parameterType="java.util.List">
+        <if test="list.size !=0 ">
+        INSERT INTO
+        qc_cases_entry_hospital
+        (
+        cases_entry_id,
+        hospital_id,
+        score,
+         msg,
+        is_used,
+        is_reject,
+        remark) VALUES
+        <foreach collection="list" item="data" index="index"
+                 separator=",">
+            (
+            #{data.casesEntryId},
+            #{data.hospitalId},
+            #{data.score},
+            #{data.msg},
+            #{data.isUsed},
+            #{data.isReject},
+            #{data.remark}
+            )
+        </foreach>
+        </if>
+    </insert>
 </mapper>