Merge branch 'develop' into dev/20200601lltkg_v1.5.0

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

@@ -12,9 +12,9 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.2.190:7474
-          username: root
-          password: zjlantone
+          url: jdbc:neo4j:http://192.168.3.150:7474
+          username: neo4j
+          password: 12345678
           #定义初始连接数
           initialSize: 0
           #定义最大连接数
@@ -95,4 +95,4 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.3.150:9999
+    address: http://192.168.3.150:9998

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

@@ -12,9 +12,9 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.2.190:7474
-          username: root
-          password: zjlantone
+          url: jdbc:neo4j:http://192.168.3.150:7474
+          username: neo4j
+          password: 12345678
           #定义初始连接数
           initialSize: 0
           #定义最大连接数
@@ -95,4 +95,4 @@ nlprel:
 
 qa:
   server:
-    address: http://192.168.3.150:9999
+    address: http://192.168.3.150:9998

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

@@ -12,7 +12,7 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.3.150:7474
+          url: jdbc:neo4j:http://192.168.2.186:7474
           username: neo4j
           password: 12345678
           #定义初始连接数
@@ -91,8 +91,8 @@ mybatis-plus:
 
 nlprel:
   server:
-    address: http://192.168.3.150:3456
+    address: http://192.168.2.186:3456
 
 qa:
   server:
-    address: http://192.168.3.150:9999
+    address: http://192.168.2.186:9998

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

@@ -12,7 +12,7 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.3.150:7474
+          url: jdbc:neo4j:http://192.168.2.123:7472
           username: neo4j
           password: 12345678
           #定义初始连接数
@@ -91,8 +91,8 @@ mybatis-plus:
 
 nlprel:
   server:
-    address: http://192.168.3.150:3456
+    address: http://192.168.2.123:3456
 
 qa:
   server:
-    address: http://192.168.3.150:9999
+    address: http://192.168.2.123:9998

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

@@ -12,9 +12,9 @@ spring:
       datasource:
         neo4j:
           driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.2.190:7474
-          username: root
-          password: zjlantone
+          url: jdbc:neo4j:http://192.168.2.234:7472
+          username: neo4j
+          password: 12345678
           #定义初始连接数
           initialSize: 0
           #定义最大连接数
@@ -91,8 +91,8 @@ mybatis-plus:
 
 nlprel:
   server:
-    address: http://192.168.3.150:3456
+    address: http://192.168.2.234:3456
 
 qa:
   server:
-    address: http://192.168.3.150:9999
+    address: http://192.168.2.234:9998

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

@@ -58,11 +58,11 @@ spring:
           druid:
             initial-size: 5
         slave:
-          driver-class-name: oracle.jdbc.driver.OracleDriver
-          platform: oracle
-          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-          username: ETRACKMRQC
-          password: ETRACKMRQC
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: root
+          password: lantone
           druid:
             initial-size: 5
 

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

@@ -58,11 +58,11 @@ spring:
           druid:
             initial-size: 5
         slave:
-          driver-class-name: oracle.jdbc.driver.OracleDriver
-          platform: oracle
-          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-          username: ETRACKMRQC
-          password: ETRACKMRQC
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: root
+          password: lantone
           druid:
             initial-size: 5
 

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

@@ -58,11 +58,11 @@ spring:
           druid:
             initial-size: 5
         slave:
-          driver-class-name: oracle.jdbc.driver.OracleDriver
-          platform: oracle
-          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-          username: ETRACKMRQC
-          password: ETRACKMRQC
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.121:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: teamback
+          password: goTulmLeon
           druid:
             initial-size: 5
 

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

@@ -58,11 +58,11 @@ spring:
           druid:
             initial-size: 5
         slave:
-          driver-class-name: oracle.jdbc.driver.OracleDriver
-          platform: oracle
-          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-          username: ETRACKMRQC
-          password: ETRACKMRQC
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.122:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: root
+          password: lantone
           druid:
             initial-size: 5
 

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

@@ -59,11 +59,11 @@ spring:
           druid:
             initial-size: 5
         slave:
-          driver-class-name: oracle.jdbc.driver.OracleDriver
-          platform: oracle
-          url: jdbc:oracle:thin:@192.168.2.246:1521:orcl
-          username: ETRACKMRQC
-          password: ETRACKMRQC
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          platform: mysql
+          url: jdbc:mysql://192.168.2.241:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: root
+          password: lantone
           druid:
             initial-size: 5
 

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;
@@ -131,15 +129,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 +165,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/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/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>