Merge remote-tracking branch 'origin/master'

whepi-doc/mrsb.sql

@@ -10,6 +10,7 @@ CREATE TABLE ms_report  (
   suspected_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 1                              COMMENT '上报状态:0草稿,1正常',
   ms_status         int(11) NOT NULL DEFAULT 1                              COMMENT '健康状态:1正常,2异常',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
@@ -27,10 +28,20 @@ CREATE TABLE ms_suspected  (
   suspected_id      bigint(20) NOT NULL DEFAULT 0                           COMMENT '疑似ID',
   report_id         bigint(20) NOT NULL DEFAULT 0                           COMMENT '上报ID',
   user_name         varchar(50)  NOT NULL DEFAULT ''                        COMMENT '家人姓名',
-  family_relative   int(11)    NOT NULL DEFAULT 1                           COMMENT '是否家庭成员:1是,2暂住亲友',
-  medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否就医:0否,1是',
-  condition_status  varchar(50)  NOT NULL DEFAULT ''                        COMMENT '疑似情况:1咳嗽,2发烧,3腹泻,4酸痛,5乏力,6其他 ',
-  remarks           varchar(200)  NOT NULL DEFAULT ''                       COMMENT '异常备注',
+  grender            int(11)    NOT NULL DEFAULT 1                           COMMENT '性别:0未设置，1男,2女',
+  age               int(11)    NOT NULL DEFAULT 1                           COMMENT '年龄',
+  family_status     int(11)    NOT NULL DEFAULT 1                           COMMENT '基本状态:1心血管疾病（服用ARB）,2心血管疾病（未服用ARB）,3呼吸系统病史，4肿瘤病史，5糖尿病史，6服用过激素药物，7妊娠期',
+  status_desp       varchar(100)  NOT NULL DEFAULT ''                       COMMENT '状态描述',
+  medical           int(11)    NOT NULL DEFAULT 1                           COMMENT '是否确诊:0否,1是',
+  temperature       decimal(14,2) NOT NULL DEFAULT 0                        COMMENT '体温',
+  cough             int(11)    NOT NULL DEFAULT 0                           COMMENT '咳嗽:0无咳嗽,1偶尔短暂咳嗽，2频繁咳嗽轻重，3频繁咳嗽重度',
+  muscle            int(11)    NOT NULL DEFAULT 0                           COMMENT '肌肉酸痛:0无,1加重，2好转，3无变化',
+  dyspnea           int(11)    NOT NULL DEFAULT 0                           COMMENT '呼吸困难:0无,1加重，2好转，3无变化，4严重',
+  chest             int(11)    NOT NULL DEFAULT 0                           COMMENT '胸闷:0无,1端坐呼吸，2活动无，3无变化',
+  fatigue           int(11)    NOT NULL DEFAULT 0                           COMMENT '乏力:0无,1加重，2好转，3无变化',
+  diarrhea          int(11)    NOT NULL DEFAULT 0                           COMMENT '腹泻:0无,1有',
+  diarrhea_num      int(11)    NOT NULL DEFAULT 0                           COMMENT '每日腹泻次数',
+  others            varchar(600)  NOT NULL DEFAULT ''                       COMMENT '其他',
   user_create       bigint(20) NOT NULL DEFAULT 0                           COMMENT '新增人',
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0)       COMMENT '新增时间',
   user_update       bigint(20) NOT NULL DEFAULT 0                           COMMENT '修改人',

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

@@ -41,6 +41,9 @@ public class MsReport {
     @TableField("report_date")
     private Date reportDate;
 
+    @TableField("report_status")
+    private Integer reportStatus;
+
     @TableField("ms_status")
     private Integer msStatus;
 

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

@@ -8,6 +8,8 @@ import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
 
+import java.math.BigDecimal;
+
 /**
  * @Author: xielianghe
  * @Date: 2020/2/4 14:54
@@ -27,17 +29,47 @@ public class MsSuspected {
     @TableField("user_name")
     private String userName;
 
-    @TableField("family_relative")
-    private Integer familyRelative;
+    @TableField("grender")
+    private Integer grender;
+
+    @TableField("age")
+    private Integer age;
+
+    @TableField("family_status")
+    private Integer familyStatus;
+
+    @TableField("status_desp")
+    private String statusDesp;
 
     @TableField("medical")
     private Integer medical;
 
-    @TableField("condition_status")
-    private String conditionStatus;
+    @TableField("temperature")
+    private BigDecimal temperature;
+
+    @TableField("cough")
+    private Integer cough;
+
+    @TableField("muscle")
+    private Integer muscle;
+
+    @TableField("dyspnea")
+    private Integer dyspnea;
+
+    @TableField("chest")
+    private Integer chest;
+
+    @TableField("fatigue")
+    private Integer fatigue;
+
+    @TableField("diarrhea")
+    private Integer diarrhea;
+
+    @TableField("diarrhea_num")
+    private Integer diarrheaNum;
 
-    @TableField("remarks")
-    private String remarks;
+    @TableField("others")
+    private String others;
 
     @TableField("user_create")
     private Long userCreate;

whepi-web/src/main/java/com/bofeng/service/MsReportService.java

@@ -6,7 +6,6 @@ import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
-import com.bofeng.entity.NotifyOpen;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -72,6 +71,7 @@ public class MsReportService {
             msReport.setSuspectedNum(0);
             msReport.setRemarks("");
             msReport.setReportDate(DateTime.now().toDate());
+            msReport.setReportStatus(1);
             msReport.setMsStatus(1);
             msReport.setUserCreate(userCreate);
             msReport.setTimeCreate(DateTime.now());
@@ -87,6 +87,7 @@ public class MsReportService {
                     msReport.setMsStatus(1);
                 else
                     msReport.setMsStatus(2);
+                msReport.setReportStatus(1);
                 msReport.setSafetyNum(Integer.parseInt(safetyNum));
                 msReport.setUserUpdate(0L);
                 msReport.setTimeUpdate(DateTime.now());

whepi-web/src/main/java/com/bofeng/service/MsSuspectedService.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -32,7 +33,9 @@ public class MsSuspectedService {
 
 
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addSuspected(String userName, String conditionStatus, Integer medical, String remarks, Long userCreate) {
+    public void addSuspected(String userName, Integer grender, Integer age, Integer familyStatus,
+                             String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
+                             Integer dyspnea, Integer chest, Integer fatigue, Integer diarrhea, Integer diarrheaNum, String others, Long userCreate) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -64,10 +67,19 @@ public class MsSuspectedService {
         msSuspected.setSuspectedId(IdWorker.getId());
         msSuspected.setReportId(reportId);
         msSuspected.setUserName(userName);
-        msSuspected.setFamilyRelative(1);//默认为家人
-        msSuspected.setConditionStatus(conditionStatus);
-        msSuspected.setMedical(medical);
-        msSuspected.setRemarks(remarks);
+        msSuspected.setGrender(grender);//默认为家人
+        msSuspected.setAge(age);
+        msSuspected.setFamilyStatus(familyStatus);
+        msSuspected.setStatusDesp(statusDesp);
+        msSuspected.setTemperature(temperature);
+        msSuspected.setCough(cough);
+        msSuspected.setMuscle(muscle);
+        msSuspected.setDiarrhea(dyspnea);
+        msSuspected.setChest(chest);
+        msSuspected.setFatigue(fatigue);
+        msSuspected.setDiarrhea(diarrhea);
+        msSuspected.setDiarrheaNum(diarrheaNum);
+        msSuspected.setOthers(others);
         msSuspected.setUserCreate(userCreate);
         msSuspected.setTimeCreate(DateTime.now());
         msSuspected.setUserUpdate(userCreate);

whepi-web/src/main/java/com/bofeng/wx/controller/MsReportController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -34,10 +35,21 @@ public class MsReportController {
         //初始化今日日报
         Long userCreate = Long.parseLong(request.getParameter("userCreate"));
         String userName = request.getParameter("userName");
-        String conditionStatus = request.getParameter("conditionStatus");
+        Integer grender = Integer.parseInt(request.getParameter("grender"));
+        Integer age = Integer.parseInt(request.getParameter("age"));
+        Integer familyStatus = Integer.parseInt(request.getParameter("familyStatus"));
+        String statusDesp = request.getParameter("statusDesp");
         Integer medical = Integer.parseInt(request.getParameter("medical"));
-        String remarks = request.getParameter("remarks");
-        msSuspectedService.addSuspected(userName, conditionStatus, medical, remarks, userCreate);
+        BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));
+        Integer cough = Integer.parseInt(request.getParameter("cough"));
+        Integer muscle = Integer.parseInt(request.getParameter("muscle"));
+        Integer dyspnea = Integer.parseInt(request.getParameter("dyspnea"));
+        Integer chest = Integer.parseInt(request.getParameter("chest"));
+        Integer fatigue = Integer.parseInt(request.getParameter("fatigue"));
+        Integer diarrhea = Integer.parseInt(request.getParameter("diarrhea"));
+        Integer diarrheaNum = Integer.parseInt(request.getParameter("diarrheaNum"));
+        String others = request.getParameter("others");
+        msSuspectedService.addSuspected(userName, grender, age, familyStatus,statusDesp,medical,temperature,cough,muscle,dyspnea,chest,fatigue,diarrhea,diarrheaNum, others, userCreate);
         return 1;
     }