Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-doc/mrsb.sql

@@ -9,6 +9,7 @@ CREATE TABLE ms_report  (
   sure_num          int(11) NOT NULL DEFAULT 0                              COMMENT '确诊人数',
   suspected_num     int(11) NOT NULL DEFAULT 0                              COMMENT '异常疑似人数',
   normal_num        int(11) NOT NULL DEFAULT 0                              COMMENT '正常人数',
+  single_num        int(11) NOT NULL DEFAULT 0                              COMMENT '隔离人数',
   remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
   report_date       date                                                    COMMENT '上报日期',
   report_status     int(11) NOT NULL DEFAULT 0                              COMMENT '上报状态:0草稿,1正常',

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -35,6 +35,12 @@ public class MsReport {
     @TableField("suspected_num")
     private Integer suspectedNum;
 
+    @TableField("normal_num")
+    private Integer normalNum;
+
+    @TableField("single_num")
+    private Integer singleNum;
+
     @TableField("remarks")
     private String remarks;
 

whepi-web/src/main/java/com/bofeng/entity/MsSuspected.java

@@ -65,12 +65,6 @@ public class MsSuspected {
     @TableField(exist = false)
     private String dyspneaStr;
 
-    @TableField("chest")
-    private Integer chest;
-
-    @TableField(exist = false)
-    private String chestStr;
-
     @TableField("fatigue")
     private Integer fatigue;
 
@@ -86,8 +80,8 @@ public class MsSuspected {
     @TableField(exist = false)
     private String zhengzhuang;
 
-    @TableField("diarrhea_num")
-    private Integer diarrheaNum;
+    @TableField("single_room")
+    private Integer singleRoom;
 
     @TableField("others")
     private String others;