Merge remote-tracking branch 'origin/dev/20200612_1.3.4' into dev/20200612_1.3.4

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

@@ -41,4 +41,19 @@ INSERT INTO `sys_user_pageset` VALUES ('13', 'N', '1970-01-01 12:00:00', '1970-0
 INSERT INTO `sys_user_pageset` VALUES ('14', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '主管医生', 'doctorName', '1', '14', null);
 INSERT INTO `sys_user_pageset` VALUES ('15', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '-1', '1', '主任医生', 'directorDoctorName', '1', '15', null);
 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);
+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`;
+
+-- 121和122已经执行过下面的脚本
+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`;
+
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('291', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '未开发', '0', '1', '0', '开发状态标识');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('292', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '15', '已开发', '1', '1', '1', '开发状态标识');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('293', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '极高', '0', '1', '0', '准确率类型');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('294', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '高', '1', '1', '1', '准确率类型');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('295', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '中', '2', '1', '2', '准确率类型');
+INSERT INTO `qc`.`sys_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('296', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '16', '低', '3', '1', '3', '准确率类型');
+
+-- alter table med_medical_record modify column `rec_date` datetime DEFAULT NULL COMMENT '病历日期';

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

@@ -1,5 +1,6 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -36,6 +37,7 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 出生日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date birthday;
 
     /**
@@ -61,11 +63,13 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 入院时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date behospitalDate;
 
     /**
      * 出院时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date leaveHospitalDate;
 
     /**
@@ -101,6 +105,7 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 评分时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date gradeTime;
 
     private String directorDoctorName ;
@@ -110,5 +115,6 @@ public class BehospitalInfoDTO implements Serializable {
     /**
      * 归档时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date placefileDate;
 }

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

@@ -46,6 +46,11 @@ public class RecordContentDTO implements Serializable {
      */
     private String recTitle;
 
+    /**
+     * 医院文书id
+     */
+    private String recId;
+
     /**
      * 病历类别编号
      */

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;
+
     /**
      * 医嘱领药类型
      */

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

@@ -50,6 +50,16 @@ public class QcCasesEntry implements Serializable {
      */
     private Integer ruleType;
 
+    /**
+     * 开发状态标识： 0-未开发  1-已开发
+     */
+    private Integer devType;
+
+    /**
+     * 准确率类型：0-极高，1-高，2-中，3-低
+     */
+    private Integer accuracyType;
+
     private String precond;
 
     /**

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

@@ -86,7 +86,7 @@ public class SysUserPagesetFacade extends SysUserPagesetServiceImpl {
             SysUserPageset sysUserPageset = new SysUserPageset();
             BeanUtil.copyProperties(sysUserPagesetVO, sysUserPageset);
             sysUserPageset.setPageType(sysUserPagesetSaveVO.getPageType());
-            sysUserPageset.setUserId(Long.valueOf(SysUserUtils.getCurrentPrincipleID()));
+            sysUserPageset.setUserId(Long.valueOf(userId));
             sysUserPageset.setCreator(userId);
             sysUserPageset.setModifier(userId);
             sysUserPageset.setGmtCreate(now);

src/main/resources/mapper/DoctorAdviceMapper.xml

@@ -24,6 +24,7 @@
         <result column="da_stop_date" property="daStopDate" />
         <result column="da_group_no" property="daGroupNo" />
         <result column="da_prescription_type" property="daPrescriptionType" />
+        <result column="medicine_type" property="medicineType" />
         <result column="da_med_type" property="daMedType" />
         <result column="doctor_notice" property="doctorNotice" />
         <result column="doctor_id" property="doctorId" />

src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -10,6 +10,9 @@
         <result column="mode_id" property="modeId" />
         <result column="code" property="code" />
         <result column="name" property="name" />
+        <result column="rule_type" property="ruleType" />
+        <result column="dev_type" property="devType" />
+        <result column="accuracy_type" property="accuracyType" />
         <result column="precond" property="precond" />
         <result column="order_no" property="orderNo" />
         <result column="remark" property="remark" />

src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
 //        strategy.setTablePrefix(new String[] { "med_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "sys_user_pageset"}); // 需要生成的表
+        strategy.setInclude(new String[] { "med_doctor_advice"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);