Merge branch 'master' into 122run

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("诊断依据");

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")

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

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;
 }

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

@@ -2,7 +2,6 @@ package com.diagbot.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.diagbot.entity.QcCasesEntry;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -41,6 +40,11 @@ public class QcCasesEntryAllDTO {
      */
     private String name;
 
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
+
     private String precond;
 
     /**

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

@@ -2,7 +2,8 @@ package com.diagbot.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @author wangfeng
  * @since 2020-04-27
  */
+@Data
 public class QcCasesEntry implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -43,6 +45,11 @@ public class QcCasesEntry implements Serializable {
      */
     private String name;
 
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
+
     private String precond;
 
     /**
@@ -79,123 +86,4 @@ public class QcCasesEntry implements Serializable {
      * 修改人,如果为0则表示纪录未修改
      */
     private String modifier;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    public Long getCasesId() {
-        return casesId;
-    }
-
-    public void setCasesId(Long casesId) {
-        this.casesId = casesId;
-    }
-    public String getCasesName() {
-        return casesName;
-    }
-
-    public void setCasesName(String casesName) {
-        this.casesName = casesName;
-    }
-    public Long getModeId() {
-        return modeId;
-    }
-
-    public void setModeId(Long modeId) {
-        this.modeId = modeId;
-    }
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getPrecond() {
-        return precond;
-    }
-
-    public void setPrecond(String precond) {
-        this.precond = precond;
-    }
-    public Integer getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(Integer orderNo) {
-        this.orderNo = orderNo;
-    }
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-    public String getIsDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(String isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-    public Date getGmtCreate() {
-        return gmtCreate;
-    }
-
-    public void setGmtCreate(Date gmtCreate) {
-        this.gmtCreate = gmtCreate;
-    }
-    public Date getGmtModified() {
-        return gmtModified;
-    }
-
-    public void setGmtModified(Date gmtModified) {
-        this.gmtModified = gmtModified;
-    }
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
-    public String getModifier() {
-        return modifier;
-    }
-
-    public void setModifier(String modifier) {
-        this.modifier = modifier;
-    }
-
-    @Override
-    public String toString() {
-        return "QcCasesEntry{" +
-                "id=" + id +
-                ", casesId=" + casesId +
-                ", casesName=" + casesName +
-                ", modeId=" + modeId +
-                ", code=" + code +
-                ", name=" + name +
-                ", precond=" + precond +
-                ", orderNo=" + orderNo +
-                ", remark=" + remark +
-                ", isDeleted=" + isDeleted +
-                ", gmtCreate=" + gmtCreate +
-                ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
-                "}";
-    }
 }

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

@@ -11,12 +11,10 @@ import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.CasesEntryHospitalService;
 import com.diagbot.service.impl.CasesEntryHospitalServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.SqlExecuteUtil;
 import com.diagbot.vo.GetAllByHospitalVO;
 import com.diagbot.vo.InsertByHospitalVO;
 import com.diagbot.vo.UpdateByHospitalVO;
@@ -90,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());
@@ -116,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;
     }
 
     /**
@@ -131,15 +133,15 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
      */
     public Boolean insertByHospital(InsertByHospitalVO insertByHospitalVO){
 
-            QueryWrapper<QcCasesEntry> qcCasesEntryWrapper = new QueryWrapper<>();
-            qcCasesEntryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
-                    .ne("id",insertByHospitalVO.getId()==null? -1:insertByHospitalVO.getId())
-                    .eq("name",insertByHospitalVO.getName())
-                    .eq("cases_id",insertByHospitalVO.getCasesId());
-            int sum = qcCacesEntryFacade.count(qcCasesEntryWrapper);
-            if (sum != 0) {
-                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该条目名称存在");
-            }
+        QueryWrapper<QcCasesEntry> qcCasesEntryWrapper = new QueryWrapper<>();
+        qcCasesEntryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .ne("id",insertByHospitalVO.getId()==null? -1:insertByHospitalVO.getId())
+                .eq("name",insertByHospitalVO.getName())
+                .eq("cases_id",insertByHospitalVO.getCasesId());
+        int sum = qcCacesEntryFacade.count(qcCasesEntryWrapper);
+        if (sum != 0) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "该条目名称存在");
+        }
         QueryWrapper<QcCasesEntry> qcCasesEntryQueryWrapper = new QueryWrapper<>();
         qcCasesEntryQueryWrapper.eq("id",insertByHospitalVO.getId());
         List<QcCasesEntry> qcCasesEntries = qcCacesEntryFacade.list(qcCasesEntryQueryWrapper);
@@ -167,7 +169,7 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
             qcCasesEntry.setGmtCreate(date);
             qcCasesEntry.setGmtModified(date);
             boolean res= qcCacesEntryFacade.save(qcCasesEntry);
-            //先保存， 在更新Coed
+            //先保存， 在更新Code
             if(res){
                 Long id = qcCasesEntry.getId();
                 String code = qcCasesEntry.getCode()+id;

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

@@ -94,6 +94,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);

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);
 }

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);
 }

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);
+    }
 }

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

@@ -54,6 +54,11 @@ public class InsertByHospitalVO {
      */
     private String name;
 
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
+
     private String precond;
 
     private Long modeId;

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

@@ -32,4 +32,9 @@ public class QcCasesEntryAllVO extends Page {
      * 条目编码
      */
     private String code;
+
+    /**
+     * 规则类型(0：无，1：空项，2：错误)
+     */
+    private Integer ruleType;
 }

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>

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

@@ -30,6 +30,9 @@
         <if test="modeId != null and modeId != ''">
             AND b.id = #{modeId}
         </if>
+        <if test="ruleType != null">
+            AND a.rule_type = #{ruleType}
+        </if>
         <if test="name != null and name != ''">
             AND  UPPER(a.name) LIKE CONCAT('%', UPPER(trim(#{name})), '%')
         </if>