zhoutg 4 سال پیش
والد
کامیت
4fab5d1aef

+ 12 - 0
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:错误)
      */

+ 10 - 0
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:错误)
      */

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

@@ -97,8 +97,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;
     }

+ 10 - 0
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:错误)
      */

+ 10 - 0
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;
+
     /**
      * 条目编码
      */

+ 8 - 0
mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -10,6 +10,8 @@
         <result column="mode_id" property="modeId" />
         <result column="code" property="code" />
         <result column="name" property="name" />
+        <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" />
@@ -33,6 +35,12 @@
         <if test="ruleType != null">
             AND a.rule_type = #{ruleType}
         </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>