xielianghe

whepi-ui/templates/home/ribao.js

@@ -304,7 +304,7 @@ function ribao_cell(v) {
     others = "其他：" + v.others;
   var scoreRezult = "";
   if (v.scoreRezult != 0)
-    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult,v.temperatureScore) + "；";
+    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' +
@@ -441,6 +441,10 @@ function ribaoCommit() {
       "score": score,
     },
     success: function (data) {
+      if (data.msgReport == "2"){
+        $.toast("家人姓名不能重复，如果重复，可以带上称呼");
+        return;
+       }
       if ($('#ribao')[0].style.display == 'none') {
         $('#notOpenRibao').toggle();
         $('#ribao')[0].style.display = '';
@@ -527,7 +531,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,suspected.temperatureScore));
+        $("#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,7 +628,7 @@ function helpValue1(v) {
     others = "其他：" + v.others;
   var scoreRezult = "";
   if (v.scoreRezult != 0)
-    scoreRezult = "评估结果：" + getScoreRezult(v.scoreRezult,v.temperatureScore) + "；";
+    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' +
@@ -834,7 +838,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,data.temperatureScore);
+        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);

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

@@ -39,12 +39,6 @@ public class MsSuspectedService {
         return msSuspectedMapper.selectById(suspectedId);
     }
 
-    //判断家人是否添加
-    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    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,
@@ -107,6 +101,10 @@ public class MsSuspectedService {
         if (diarrhea > 0)
             suspectedStatus = 1;
         if (suspectedId == 0L) {
+            //判断家人是否同名
+            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName);
+            if (list != null && list.size() > 0)
+                return 2L;
             MsSuspected msSuspected = new MsSuspected();
             msSuspected.setSuspectedId(IdWorker.getId());
             msSuspected.setReportId(reportId);
@@ -135,6 +133,16 @@ public class MsSuspectedService {
             msSuspected.setTimeUpdate(DateTime.now());
             msSuspectedMapper.insert(msSuspected);
         } else {
+            //判断家人是否同名
+            List<MsSuspected> list = msSuspectedMapper.selectUserNameNum(reportId, userName);
+            if (list != null && list.size() > 0) {
+                if (list.size() > 1)
+                    return 2L;
+                else {
+                    if (list.get(0).getSuspectedId() != suspectedId)
+                        return 2L;
+                }
+            }
             MsSuspected msSuspected1 = msSuspectedMapper.selectById(suspectedId);
             if (msSuspected1 != null) {
                 msSuspected1.setUserName(userName);

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

@@ -38,7 +38,7 @@ public class MsReportController {
         //初始化今日日报
         Long suspectedId = Conv.NL(request.getParameter("suspectedId"));
         Long userCreate = Conv.NL(request.getParameter("userCreate"));
-        String userName = request.getParameter("userName");
+        String userName = request.getParameter("userName").trim();
         Integer grender = Conv.NI(request.getParameter("grender"));
         Integer age = Conv.NI(request.getParameter("age"));
         Integer familyStatus = Conv.NI(request.getParameter("familyStatus"));
@@ -57,9 +57,13 @@ public class MsReportController {
         Integer scoreHistroy = Conv.NI(request.getParameter("scoreHistroy"));
         Integer score = Conv.NI(request.getParameter("score"));
 
+        MsReport msReport=new MsReport();
         Long reportId =msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate,scoreRezult,temperatureScore,scoreHistroy,score);
-
-        return msReportService.getByReport(reportId);
+        if(reportId==2L)
+            msReport.setMsgReport("2");
+        else
+            msReport= msReportService.getByReport(reportId);
+        return msReport;
     }
 
     //查询家人