Merge branch 'dev/20200713_1.3.7.1' into develop

doc/015.20200706v1.3.7.1/qc_initv1.3.7.1.sql

@@ -0,0 +1,9 @@
+use `qc`;
+
+ALTER TABLE `qc_cases_entry` ADD `drgs` tinyint(4) DEFAULT '2' COMMENT '是否控费(1：是，2：否)' AFTER `name`;
+ALTER TABLE `qc_cases_entry` ADD `type` tinyint(4) DEFAULT '1' COMMENT '质控形式(1：形式质控，2：内涵质控)' AFTER `drgs`;
+
+INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '是', '1', '1', '1', '是否控费');
+INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '17', '否', '2', '1', '2', '是否控费');
+INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '形式质控', '1', '1', '2', '质控形式');
+INSERT INTO `qc`.`sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '18', '内涵质控', '2', '1', '1', '质控形式');

src/main/java/com/diagbot/dto/MsgDTO.java

@@ -22,6 +22,10 @@ public class MsgDTO {
     private BigDecimal score;
     //提示信息
     private String msg;
+    // 控费标识(1：是控费条目，2：不是控费条目)
+    private Integer drgs;
+    // 质控形式(1：形式质控，2：内涵质控)
+    private Integer type;
     //提示信息
     private String code;
     //提示信息

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：错误)
      */

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -214,6 +214,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             // 根据模块分组
             Map<String, List<MsgDTO>> msgMap = EntityUtil.makeEntityListMap(msgDTOList, "modelName");
             res.put("msg", msgMap);
+
+            // 添加DRGS分组
+            List<MsgDTO> msgDTOListDrgs = msgDTOList.stream().filter(r -> r.getDrgs().equals(1)).collect(Collectors.toList());
+            Map<String, List<MsgDTO>> drgsMap = EntityUtil.makeEntityListMap(msgDTOListDrgs, "modelName");
+            res.put("drgs", drgsMap);
         }
 
         return res;

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -109,7 +109,8 @@
     <select id="getMsg" resultType="com.diagbot.dto.MsgDTO">
         SELECT b.`name` model_name,c.score,c.msg,c.cases_entry_id,c.is_reject,c.id id,c.info,
         a.cases_id cases_id, d.score cases_score,b.id model_id, a.name standard_msg,
-        c.opt_type, c.grade_type, c.gmt_create, c.gmt_modified
+        c.opt_type, c.grade_type, c.gmt_create, c.gmt_modified,
+        a.type, a.drgs
         FROM `qc_cases_entry` a, qc_mode b, med_qcresult_detail c, qc_cases_hospital d
         where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N' and d.is_deleted = 'N'
         and a.id = c.cases_entry_id

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="rule_type" property="ruleType" />
         <result column="dev_type" property="devType" />
         <result column="accuracy_type" property="accuracyType" />