Merge branch 'dev/20200612_1.3.4' into debug

doc/009.20200612v1.3.4/qc_initv1.3.4.sql

@@ -43,6 +43,8 @@ INSERT INTO `sys_user_pageset` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-0
 INSERT INTO `sys_user_pageset` VALUES ('16', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '科室', 'behDeptName', '1', '16', null);
 INSERT INTO `sys_user_pageset` VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '评分时间', 'gradeTime', '1', '17', null);
 
+ALTER TABLE `qc`.`med_doctor_advice` ADD COLUMN `medicine_type` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '药品类型(0.普药 1.抗生素 2.激素)' AFTER `da_prescription_type`;
+
 
 ALTER TABLE `qc_cases_entry` ADD `dev_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '开发状态标识： 0-未开发  1-已开发' AFTER `rule_type`;
 ALTER TABLE `qc_cases_entry` ADD `accuracy_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '准确率类型：0-极高，1-高，2-中，3-低' AFTER `dev_type`;

src/main/java/com/diagbot/entity/DoctorAdvice.java

@@ -123,6 +123,11 @@ public class DoctorAdvice implements Serializable {
      */
     private String daPrescriptionType;
 
+    /**
+     * 药品类型(0.普药 1.抗生素 2.激素)
+     */
+    private String medicineType;
+
     /**
      * 医嘱领药类型
      */