Pārlūkot izejas kodu

质控类型维护:运行质控启用状态

chengyao 4 gadi atpakaļ
vecāks
revīzija
7a156d823c

+ 2 - 2
doc/021.20200812v1.4.2/qc_initv1.4.2.sql

@@ -6,5 +6,5 @@ update qc_cases_entry_hospital set is_used_run = is_used, score_run=score;
 UPDATE `sys_dictionary_info` SET `name` = '形式质控',`order_no` = 3 WHERE `name` = '形式质控';
 UPDATE `sys_dictionary_info` SET `name` = '内涵CRF质控',`order_no` = 2 WHERE `name` = '内涵质控';
 INSERT INTO `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,'内涵规则质控','3',1,1,'质控形式');
-alter table qc_cases_entry_hospital MODIFY remark varchar(1024);
-alter table qc_cases_entry MODIFY remark varchar(1024);
+alter table qc_cases_entry_hospital MODIFY remark varchar(1024) DEFAULT NULL COMMENT '备注';
+alter table qc_cases_entry MODIFY remark varchar(1024) DEFAULT NULL COMMENT '备注';

+ 1 - 0
src/main/java/com/diagbot/vo/QcTypeVO.java

@@ -13,6 +13,7 @@ import lombok.Setter;
 @Setter
 public class QcTypeVO {
     private Long id;
+    private String isPlacefile = "1";
     @ApiModelProperty(hidden = true)
     private Long hospitalId;
 }

+ 8 - 1
src/main/resources/mapper/QcTypeCasesEntryMapper.xml

@@ -24,7 +24,14 @@
                     t1.`name`,
                     t1.id,
                     t3.`name` mode_name,
-                    t2.is_used,
+        <choose>
+            <when test='isPlacefile == "0"'>
+                t2.is_used_run AS isUsed,
+            </when>
+            <otherwise>
+                t2.is_used AS isUsed,
+            </otherwise>
+        </choose>
                     t3.order_no mode_order,
                     t1.order_no
                 FROM