Merge branch 'develop' into dev/ltkg20200710_term

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