xielianghe

whepi-ui/templates/home/ribao.js

@@ -304,11 +304,11 @@ function ribao_cell(v) {
     others = "其他：" + v.others;
   var scoreRezult = "";
   if (v.scoreRezult != 0)
-    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult) + "；";
+    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult,v.temperatureScore) + "；";
   $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #bc4246" onclick=\'deleteSuspected(' + JSON.stringify(v.suspectedId) + ')\'>删除</a>\n' +
     '                                      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a style="color: #2a62bc" onclick=\'updateSuspected(' + JSON.stringify(v.suspectedId) + ')\'>修改</a></h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others +scoreRezult+ '</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -527,7 +527,7 @@ function updateSuspected(suspectedId) {
         $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
 
         $("#shuruqita").val(suspected.others);
-        $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult));
+        $("#js_input_score_rezult").val(getScoreRezult(suspected.scoreRezult,suspected.temperatureScore));
         $("#js_input_score_rezult_value").val(suspected.scoreRezult);
         $("#js_input_temperature_score").val(suspected.temperatureScore);
         $("#js_input_score_histroy").val(suspected.scoreHistroy);
@@ -624,10 +624,10 @@ function helpValue1(v) {
     others = "其他：" + v.others;
   var scoreRezult = "";
   if (v.scoreRezult != 0)
-    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult) + "；";
+    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult,v.temperatureScore) + "；";
   $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
     '                                      <h4 class="weui-media-box__title">' + userName + '&nbsp;&nbsp;&nbsp;' + grender + '&nbsp;&nbsp;&nbsp;' + age + '</h4>\n' +
-    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult+'</p>\n' +
+    '                                      <p class="weui-media-box__desc" style="height: 80%">' + familyStatus + medical + singleRoom + temperature + cough + muscle + dyspnea + fatigue + diarrhea + others + scoreRezult + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -834,7 +834,7 @@ $('#ribao_score').on('click', function () {
         $('#js_input_temperature_score').empty();
         $('#js_input_score_histroy').empty();
         $('#js_input_score').empty();
-        var ScoreRezult = getScoreRezult(data.scoreRezult);
+        var ScoreRezult = getScoreRezult(data.scoreRezult,data.temperatureScore);
         $("#js_input_score_rezult").val(ScoreRezult);
         $("#js_input_score_rezult_value").val(data.scoreRezult);
         $("#js_input_temperature_score").val(data.temperatureScore);
@@ -846,13 +846,21 @@ $('#ribao_score').on('click', function () {
 });
 
 
-function getScoreRezult(scoreRezult) {
+function getScoreRezult(scoreRezult, temperatureScore) {
   if (scoreRezult == 0)
     return "未评估";
-  else if (scoreRezult == 1)
-    return "安全";
-  else if (scoreRezult == 2)
-    return "注意观察";
+  else if (scoreRezult == 1) {
+    if (temperatureScore > 1)
+      return "正常,间隔时间服用退烧药，多休息，多喝水";
+    else
+      return "正常";
+  }
+  else if (scoreRezult == 2) {
+    if (temperatureScore > 1)
+      return "注意观察,间隔时间服用退烧药，多休息，多喝水";
+    else
+      return "注意观察";
+  }
   else if (scoreRezult == 3)
     return "联系社区医生（或者在线问诊）";
   else if (scoreRezult == 4)
@@ -861,3 +869,4 @@ function getScoreRezult(scoreRezult) {
 }
 
 
+

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

@@ -6,6 +6,7 @@ import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
+import com.yvan.platform.Conv;
 import io.swagger.models.auth.In;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,15 +41,15 @@ public class MsSuspectedService {
 
     //判断家人是否添加
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public List<MsSuspected> selectUserNameNum(long reportId,String userName) {
-        return msSuspectedMapper.selectUserNameNum(reportId,userName);
+    public List<MsSuspected> selectUserNameNum(long reportId, String userName) {
+        return msSuspectedMapper.selectUserNameNum(reportId, userName);
     }
 
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Long addSuspected(Long suspectedId, String userName, Integer grender, Integer age, Integer familyStatus,
                              String statusDesp, Integer medical, BigDecimal temperature, Integer cough, Integer muscle,
-                             Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate,Integer scoreRezult,Integer temperatureScore,Integer scoreHistroy, Integer score) {
+                             Integer dyspnea, Integer fatigue, Integer diarrhea, Integer singleRoom, String others, Long userCreate, Integer scoreRezult, Integer temperatureScore, Integer scoreHistroy, Integer score) {
         Long reportId = 0L;
         //如果是当前日期 已经添加
         Date t = new Date();
@@ -88,7 +89,7 @@ public class MsSuspectedService {
         if (singleRoom == 1)
             suspectedStatus = 1;
         //体温
-        if (temperature.compareTo(new BigDecimal(36)) == -1 || temperature.compareTo(new BigDecimal(37.3)) == 1)
+        if (Conv.NFloat(temperature) < Conv.NFloat(36) || Conv.NFloat(temperature) >= Conv.NFloat(37.3))
             suspectedStatus = 1;
         //咳嗽
         if (cough > 0)
@@ -219,11 +220,11 @@ public class MsSuspectedService {
 
     //健康评估
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public MsSuspected getScore(Long susprectedId,String userName, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea, Long userCreate) {
+    public MsSuspected getScore(Long susprectedId, String userName, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea, Long userCreate) {
         MsSuspected msSuspected = new MsSuspected();
         msSuspected.setTemperatureScore(getTemperatureScore(temperature));
         msSuspected.setScore(addScore(temperature, cough, muscle, dyspnea, fatigue, diarrhea));
-        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName,susprectedId);
+        Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
         if (scoreHistroy == null)
             scoreHistroy = 0;
         msSuspected.setScoreHistroy(scoreHistroy);
@@ -236,15 +237,15 @@ public class MsSuspectedService {
     public Integer getTemperatureScore(BigDecimal temperature) {
         Integer score = 0;
         //温度
-        if (temperature.compareTo(new BigDecimal(37.3)) == -1)//37.3以下0分
+        if (Conv.NFloat(temperature) < Conv.NFloat(37.3))//37.3以下0分
             score += 0;
-        if (temperature.compareTo(new BigDecimal(37.4)) > -1 && temperature.compareTo(new BigDecimal(38)) < 1)//   37.3~38℃为 1分
+        if (Conv.NFloat(temperature) >= Conv.NFloat(37.4) && Conv.NFloat(temperature) <= Conv.NFloat(38))//   37.3~38℃为 1分
             score += 1;
-        if (temperature.compareTo(new BigDecimal(38.1)) > -1 && temperature.compareTo(new BigDecimal(39)) < 1)// 38.1～39℃为中度发热 2分
+        if (Conv.NFloat(temperature) >= Conv.NFloat(38.1) && Conv.NFloat(temperature) <= Conv.NFloat(39))// 38.1～39℃为中度发热 2分
             score += 2;
-        if (temperature.compareTo(new BigDecimal(39.1)) > -1 && temperature.compareTo(new BigDecimal(34)) < 1)//39.1~40℃为高热 3分
+        if (Conv.NFloat(temperature) >= Conv.NFloat(39.1) && Conv.NFloat(temperature) <= Conv.NFloat(40))//39.1~40℃为高热 3分
             score += 3;
-        if (temperature.compareTo(new BigDecimal(39.1)) > -1 && temperature.compareTo(new BigDecimal(34)) < 1)//340℃以上为超高热 4分
+        if (Conv.NFloat(temperature) > Conv.NFloat(40))//340℃以上为超高热 4分
             score += 4;
         return score;
     }
@@ -273,9 +274,9 @@ public class MsSuspectedService {
         //判断用户是否含有历史评分
         if (scoreHistory == 0) {
             //判断结果
-            if (score <= 1)
+            if (score < 1)
                 scoreRezult = 1;
-            if (score >= 2 && score <= 3)
+            if (score >= 1 && score <= 3)
                 scoreRezult = 2;
             if (score == 4)
                 scoreRezult = 3;
@@ -284,8 +285,6 @@ public class MsSuspectedService {
 
         } else {
             if (score - scoreHistory >= 3)
-                return 3;
-            if (score - scoreHistory > 4)
                 return 4;
             else {
                 if (score <= 1)