feat，疾病报告

server-common/src/main/java/com/makeit/module/iot/vo/analysis/DiseaseReportVO.java

+package com.makeit.module.iot.vo.analysis;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DiseaseReportVO {
+
+    private Integer number;
+    private List<Condition> condition;
+    private String score;
+    private String evaluate;
+
+
+    @Data
+    public static class Condition {
+        private String resultRelational;
+        private String resultCondition;
+    }
+}

server-common/src/main/java/com/makeit/module/iot/vo/analysis/SaasSleepEvaluateStandardReportVO.java

+package com.makeit.module.iot.vo.analysis;
+
+import lombok.Data;
+
+@Data
+public class SaasSleepEvaluateStandardReportVO {
+
+    private Long deepScore;
+    private Long lightScore;
+    private Long soberScore;
+    private Long sleepScore;
+    private Long totalScore;
+
+
+
+}

server-service/src/main/java/com/makeit/dto/saas/analysis/SaasDiseaseEvaluateReportDTO.java

 package com.makeit.dto.saas.analysis;
 package com.makeit.dto.saas.analysis;
 
 
+import com.makeit.module.iot.vo.analysis.DiseaseReportVO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  * 呼吸心率慢性病模型评估结果
  * 呼吸心率慢性病模型评估结果
@@ -19,7 +22,8 @@ public class SaasDiseaseEvaluateReportDTO {
     private String id;
     private String id;
 
 
     @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condition：\"{}\",\"score\":\"\",evaluate:\"\"\"}")
     @ApiModelProperty(value = "评估内容 json字符串 {\"number:\"1\",condition：\"{}\",\"score\":\"\",evaluate:\"\"\"}")
-    private String resultContent;
+    private List<DiseaseReportVO> resultContent;
+
 
 
 
 
 }
 }

server-service/src/main/java/com/makeit/service/saas/impl/SaasDiseaseEvaluateReportServiceImpl.java

 package com.makeit.service.saas.impl;
 package com.makeit.service.saas.impl;
 
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.dto.saas.analysis.SaasDiseaseEvaluateReportDTO;
 import com.makeit.dto.saas.analysis.SaasDiseaseEvaluateReportDTO;
 import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
 import com.makeit.entity.saas.analysis.SaasDiseaseEvaluateReport;
@@ -28,14 +29,16 @@ public class SaasDiseaseEvaluateReportServiceImpl extends ServiceImpl<SaasDiseas
     @Override
     @Override
     public void add(SaasDiseaseEvaluateReportDTO dto) {
     public void add(SaasDiseaseEvaluateReportDTO dto) {
         SaasDiseaseEvaluateReport entity = new SaasDiseaseEvaluateReport();
         SaasDiseaseEvaluateReport entity = new SaasDiseaseEvaluateReport();
-        BeanUtils.copyProperties(dto,entity);
+        String result = JSON.toJSONString(dto.getResultContent());
+        entity.setResultContent(result);
         save(entity);
         save(entity);
     }
     }
 
 
     @Override
     @Override
     public void edit(SaasDiseaseEvaluateReportDTO dto) {
     public void edit(SaasDiseaseEvaluateReportDTO dto) {
         SaasDiseaseEvaluateReport entity = getById(dto.getId());
         SaasDiseaseEvaluateReport entity = getById(dto.getId());
-        BeanUtils.copyProperties(dto,entity);
+        String result = JSON.toJSONString(dto.getResultContent());
+        entity.setResultContent(result);
         saveOrUpdate(entity);
         saveOrUpdate(entity);
     }
     }
 }
 }