xielianghe

whepi-ui/templates/home/ribao.js

@@ -302,7 +302,7 @@ function ribao_cell(v) {
   var scoreRezult = "";
   if (v.scoreRezult != 0)
     scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
-  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
+  $('#rb_family').append($('<div class="weui-media-box weui-media-box_text" style="height: 15vh">\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' +
@@ -382,6 +382,11 @@ function ribaoCommit() {
     $.alert("心脑血管不能同时选择服用和未服用");
     return;
   }
+  //男性不能选择妊娠期
+  if ( $("#js_input_user_sex").attr("data-values")==1 && $("input[name='checkbox7']:checked").val() == "on") {
+    $.alert("男性不能选择妊娠期");
+    return;
+  }
   //家庭状态
   var familyStatus = "";
   if ($("input[name='checkbox1']:checked").val() == "on")
@@ -703,7 +708,7 @@ function helpValue1(v) {
   var scoreRezult = "";
   if (v.scoreRezult != 0)
     scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult, v.temperatureScore) + "；";
-  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 12vh">\n' +
+  $('#ribao_famliy').append($('<div class="weui-media-box weui-media-box_text" style="height: 15vh">\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' +
     '                                    </div>\n' +
@@ -866,6 +871,7 @@ $('#ribao_score').on('click', function () {
   var suspectedId = $("#suspectedId").val();
   var userId = $("#userId").val();
   var userName = $("#js_input_user_name").val();
+  var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
   var temperature = $("#js_input_user_tiwen").val() == "" ? 0 : $("#js_input_user_tiwen").val();
   var cough = $("#js_input_user_kesou").attr("data-values") == undefined ? 0 : $("#js_input_user_kesou").attr("data-values");
   var muscle = $("#js_input_user_jirou").attr("data-values") == undefined ? 0 : $("#js_input_user_jirou").attr("data-values");
@@ -892,6 +898,7 @@ $('#ribao_score').on('click', function () {
       "userName": userName,
       "suspectedId": suspectedId,
       "userCreate": userId,
+      "medical": medical,
       "temperature": temperature,
       "cough": cough,
       "muscle": muscle,

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

@@ -107,7 +107,7 @@ public class MsSuspectedService {
                 return 2L;
             //判断是否评估
             if (scoreRezult == 0) {
-                MsSuspected msSuspected1 = getScore(0L, userName, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+                MsSuspected msSuspected1 = getScore(0L, userName, medical,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
                 if (msSuspected1 != null) {
                     scoreRezult = msSuspected1.getScoreRezult();
                     score = msSuspected1.getScore();
@@ -154,7 +154,7 @@ public class MsSuspectedService {
                         return 2L;
                 }
             }
-            MsSuspected msSuspected2 = getScore(suspectedId, userName, temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+            MsSuspected msSuspected2 = getScore(suspectedId, userName, medical,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
             if (msSuspected2 != null) {
                 scoreRezult = msSuspected2.getScoreRezult();
                 score = msSuspected2.getScore();
@@ -247,13 +247,13 @@ 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, Integer medical, 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));
+        msSuspected.setScore(addScore(medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea));
         Integer scoreHistroy = msSuspectedMapper.selectUserNameScore(userCreate, userName, susprectedId);
         msSuspected.setScoreHistroy(scoreHistroy);
-        msSuspected.setScoreRezult(scoreRezulte(msSuspected.getScoreHistroy(), msSuspected.getScore()));
+        msSuspected.setScoreRezult(scoreRezulte(medical,msSuspected.getScoreHistroy(), msSuspected.getScore()));
         return msSuspected;
     }
 
@@ -277,41 +277,35 @@ public class MsSuspectedService {
 
     //获取总评分
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer addScore(BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea) {
-        Integer score = getTemperatureScore(temperature);
-        //咳嗽
-        score += cough;
-        //肌肉
-        score += muscle;
-        //肌肉
-        score += dyspnea;
-        //肌肉
-        score += fatigue;
-        //肌肉
-        score += diarrhea;
+    public Integer addScore(Integer medical, BigDecimal temperature, Integer cough, Integer muscle, Integer dyspnea, Integer fatigue, Integer diarrhea) {
+        Integer score = 0;
+
+        if (medical == 0) {
+            //温度
+            score += getTemperatureScore(temperature);
+            //咳嗽
+            score += cough;
+            //肌肉
+            score += muscle;
+            //肌肉
+            score += dyspnea;
+            //肌肉
+            score += fatigue;
+            //肌肉
+            score += diarrhea;
+        } else
+            score = 5;
         return score;
     }
 
     //评估结果
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public Integer scoreRezulte(Integer scoreHistory, Integer score) {
+    public Integer scoreRezulte(Integer medical, Integer scoreHistory, Integer score) {
         Integer scoreRezult = 0;
-        //判断用户是否含有历史评分
-        if (scoreHistory == null) {
-            //判断结果
-            if (score < 1)
-                scoreRezult = 1;
-            if (score >= 1 && score <= 3)
-                scoreRezult = 2;
-            if (score == 4)
-                scoreRezult = 3;
-            if (score > 4)
-                scoreRezult = 4;
-
-        } else {
-            if (score - scoreHistory >= 3)
-                return 4;
-            else {
+        if (medical == 0) {
+            //判断用户是否含有历史评分
+            if (scoreHistory == null) {
+                //判断结果
                 if (score < 1)
                     scoreRezult = 1;
                 if (score >= 1 && score <= 3)
@@ -320,8 +314,23 @@ public class MsSuspectedService {
                     scoreRezult = 3;
                 if (score > 4)
                     scoreRezult = 4;
+
+            } else {
+                if (score - scoreHistory >= 3)
+                    return 4;
+                else {
+                    if (score < 1)
+                        scoreRezult = 1;
+                    if (score >= 1 && score <= 3)
+                        scoreRezult = 2;
+                    if (score == 4)
+                        scoreRezult = 3;
+                    if (score > 4)
+                        scoreRezult = 4;
+                }
             }
-        }
+        } else
+            scoreRezult = 4;
         return scoreRezult;
     }
 }

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

@@ -140,13 +140,14 @@ public class MsReportController {
         Long suspectedId = Conv.NL(request.getParameter("suspectedId"));
         String userName = request.getParameter("userName");
         Long userCreate = Conv.NL(request.getParameter("userCreate"));
+        Integer medical = Conv.NI(request.getParameter("medical"));
         BigDecimal temperature = new BigDecimal(request.getParameter("temperature"));
         Integer cough = Conv.NI(request.getParameter("cough"));
         Integer muscle = Conv.NI(request.getParameter("muscle"));
         Integer dyspnea = Conv.NI(request.getParameter("dyspnea"));
         Integer fatigue = Conv.NI(request.getParameter("fatigue"));
         Integer diarrhea = Conv.NI(request.getParameter("diarrhea"));
-        return msSuspectedService.getScore(suspectedId,userName,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
+        return msSuspectedService.getScore(suspectedId,userName,medical,temperature, cough, muscle, dyspnea, fatigue, diarrhea, userCreate);
     }
 
 }