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

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

@@ -107,4 +107,4 @@ nlp:
 
 aineo:
   server:
-    address: http://192.168.3.150:8888
+    address: http://192.168.2.234:8888

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

@@ -22,6 +22,8 @@ public class GetAllByHospitalDetialDTO {
     private Long modeId;
     private BigDecimal score;
     private Integer isUsed;
+    private BigDecimal scoreRun;
+    private Integer isUsedRun;
     private Integer isReject;
     private String msg;
 }

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

@@ -15,7 +15,9 @@ import java.math.BigDecimal;
 public class GetUpdateInfoDetialDTO {
     private String hospitalName;
     private BigDecimal score;
+    private BigDecimal scoreRun;
     private Integer isUsed;
+    private Integer isUsedRun;
     private Integer isReject;
     private String msg;
 }

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

@@ -46,12 +46,10 @@ public class QcCasesEntryAllDTO {
     private Integer drgs;
 
     /**
-     * 质控形式(1：形式质控，2：内涵质控)
+     * 质控形式(1：形式质控，2：内涵CRF质控，3：内涵规则质控)
      */
     private Integer type;
 
-
-
     /**
      * 规则类型(0：无，1：空项，2：错误)
      */

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

@@ -21,11 +21,16 @@ public class QcCasesEntrySimpleDTO {
      */
     private String name;
 
-    /**
+    /**终末质控
      * 0-未启用 1-启用
      */
     private String isUsed;
 
+    /**运行质控
+     * 0-未启用 1-启用
+     */
+    private String isUsedRun;
+
     /**
      * modeName
      */

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

@@ -63,9 +63,14 @@ public class CasesEntryHospital implements Serializable {
     private Long hospitalId;
 
     /**
-     * 扣分值
+     * 终末扣分值
      */
     private BigDecimal score;
+    /**
+     * 运行扣分值
+     */
+    private BigDecimal scoreRun;
+
 
     /**
      * 条目提示信息
@@ -73,10 +78,15 @@ public class CasesEntryHospital implements Serializable {
     private String msg;
 
     /**
-     * 0-未启用 1-启用
+     * 终末质控0-未启用 1-启用
      */
     private Integer isUsed;
 
+    /**
+     * 运行质控0-未启用 1-启用
+     */
+    private Integer isUsedRun;
+
     /**
      * 单项否决（1-单项否决 0-非）
      */
@@ -175,26 +185,44 @@ public class CasesEntryHospital implements Serializable {
         return remark;
     }
 
+    public BigDecimal getScoreRun() {
+        return scoreRun;
+    }
+
+    public void setScoreRun(BigDecimal scoreRun) {
+        this.scoreRun = scoreRun;
+    }
+
+    public Integer getIsUsedRun() {
+        return isUsedRun;
+    }
+
+    public void setIsUsedRun(Integer isUsedRun) {
+        this.isUsedRun = isUsedRun;
+    }
+
     public void setRemark(String remark) {
         this.remark = remark;
     }
 
     @Override
     public String toString() {
-        return "QcCasesEntryHospital{" +
+        return "CasesEntryHospital{" +
                 "id=" + id +
-                ", isDeleted=" + isDeleted +
+                ", isDeleted='" + isDeleted + '\'' +
                 ", gmtCreate=" + gmtCreate +
                 ", gmtModified=" + gmtModified +
-                ", creator=" + creator +
-                ", modifier=" + modifier +
+                ", creator='" + creator + '\'' +
+                ", modifier='" + modifier + '\'' +
                 ", casesEntryId=" + casesEntryId +
                 ", hospitalId=" + hospitalId +
                 ", score=" + score +
-                ", msg=" + msg +
+                ", scoreRun=" + scoreRun +
+                ", msg='" + msg + '\'' +
                 ", isUsed=" + isUsed +
+                ", isUsedRun=" + isUsedRun +
                 ", isReject=" + isReject +
-                ", remark=" + remark +
-                "}";
+                ", remark='" + remark + '\'' +
+                '}';
     }
 }

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

@@ -51,7 +51,7 @@ public class QcCasesEntry implements Serializable {
     private Integer drgs;
 
     /**
-     * 质控形式(1：形式质控，2：内涵质控)
+     * 质控形式(1：形式质控，2：内涵CRF质控，3：内涵规则质控)
      */
     private Integer type;
 

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

@@ -88,9 +88,11 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
                     getAllByHospitalDetialDTO.setModeName(qcCasesEntry.getModeName());
                     getAllByHospitalDetialDTO.setMsg(casesEntryHospitalMap.get(qcCasesEntry.getId()).getMsg());
                     getAllByHospitalDetialDTO.setIsUsed(casesEntryHospitalMap.get(qcCasesEntry.getId()).getIsUsed());
+                    getAllByHospitalDetialDTO.setIsUsedRun(casesEntryHospitalMap.get(qcCasesEntry.getId()).getIsUsedRun());
                     getAllByHospitalDetialDTO.setIsReject(casesEntryHospitalMap.get(qcCasesEntry.getId()).getIsReject());
                     getAllByHospitalDetialDTO.setScore(casesEntryHospitalMap.get(qcCasesEntry.getId()).getScore());
                     getAllByHospitalDetialDTO.setPrecond(qcCasesEntry.getPrecond());
+                    getAllByHospitalDetialDTO.setScoreRun(casesEntryHospitalMap.get(qcCasesEntry.getId()).getScoreRun());
                     getAllByHospitalDetialDTO.setName(qcCasesEntry.getName());
                     getAllByHospitalDetialDTOS.add(getAllByHospitalDetialDTO);
                 }
@@ -127,7 +129,6 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
 
     /**
      * 新增指定医院条目
-     *
      * @param insertByHospitalVO
      * @return
      */

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

@@ -116,8 +116,10 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
             getUpdateInfoDetialDTO.setHospitalName(hospitalNameMap.get(casesEntryHospital.getHospitalId()));
             getUpdateInfoDetialDTO.setMsg(casesEntryHospital.getMsg());
             getUpdateInfoDetialDTO.setIsUsed(casesEntryHospital.getIsUsed());
+            getUpdateInfoDetialDTO.setIsUsedRun(casesEntryHospital.getIsUsedRun());
             getUpdateInfoDetialDTO.setIsReject(casesEntryHospital.getIsReject());
             getUpdateInfoDetialDTO.setScore(casesEntryHospital.getScore());
+            getUpdateInfoDetialDTO.setScoreRun(casesEntryHospital.getScoreRun());
             getUpdateInfoDetialDTOS.add(getUpdateInfoDetialDTO);
         }
         getUpdateInfoDTO.setGetUpdateInfoDetialDTOS(getUpdateInfoDetialDTOS);

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

@@ -60,7 +60,7 @@ public class InsertByHospitalVO {
     private Integer drgs;
 
     /**
-     * 质控形式(1：形式质控，2：内涵质控)
+     * 质控形式(1：形式质控，2：内涵CRF质控,3：内涵规则质控)
      */
     private Integer type;
 

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

@@ -34,7 +34,7 @@ public class QcCasesEntryAllVO extends Page {
     private Integer drgs;
 
     /**
-     * 质控形式(1：形式质控，2：内涵质控)
+     * 质控形式(1：形式质控，2：内涵CRF质控，3：内涵规则质控)
      */
     private Integer type;
 

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

@@ -13,8 +13,10 @@
         <result column="cases_entry_id" property="casesEntryId" />
         <result column="hospital_id" property="hospitalId" />
         <result column="score" property="score" />
+        <result column="score_run" property="scoreRun" />
         <result column="msg" property="msg" />
         <result column="is_used" property="isUsed" />
+        <result column="is_used_run" property="isUsedRun" />
         <result column="is_reject" property="isReject" />
         <result column="remark" property="remark" />
     </resultMap>
@@ -27,8 +29,10 @@
         cases_entry_id,
         hospital_id,
         score,
+        score_run,
          msg,
         is_used,
+        is_used_run,
         is_reject,
         remark) VALUES
         <foreach collection="list" item="data" index="index"
@@ -37,8 +41,10 @@
             #{data.casesEntryId},
             #{data.hospitalId},
             #{data.score},
+            #{data.scoreRun},
             #{data.msg},
             #{data.isUsed},
+            #{data.isUsedRun},
             #{data.isReject},
             #{data.remark}
             )

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

@@ -118,7 +118,8 @@
     </select>
 
     <select id ="getQcCasesEntryAll" resultType="com.diagbot.dto.QcCasesEntryAllDTO">
-        SELECT a.*,b.name as modeName FROM qc_cases_entry a
+        SELECT a.id,a.cases_id,a.cases_name,a.mode_id,a.code,a.name,a.drgs,a.type,a.rule_type,a.dev_type,a.accuracy_type,a.precond,a.is_deleted,a.order_no,a.gmt_create,a.gmt_modified,a.creator,a.modifier,
+        b.name as modeName FROM qc_cases_entry a
         LEFT JOIN  qc_mode b ON b.id= a.mode_id
         WHERE a.is_deleted = 'N'
         ORDER BY a.cases_id,a.id

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

@@ -25,6 +25,7 @@
                     t1.id,
                     t3.`name` mode_name,
                     t2.is_used,
+                    t2.is_used_run,
                     t3.order_no mode_order,
                     t1.order_no
                 FROM

mrman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "icss_" });// 此处可以修改为您的表前缀
          strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "qc_cases_entry"}); // 需要生成的表
+        strategy.setInclude(new String[] { "qc_cases_entry_hospital"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);
@@ -80,4 +80,4 @@ public class CodeGeneration {
         mpg.execute();
 
     }
-}
+}