xielianghe

whepi-ui/templates/home/ribao.ftl

@@ -57,7 +57,7 @@
                         <input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
                     </div>
                     <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 40%;">是否单间隔离</div>
+                        <div style="color: gray;height: 5vh; line-height: 5vh; width: 40%;">单间隔离</div>
                         <input id="switchDanjiangeli" class="weui-input" autofocus="" type="text" placeholder="请选择" maxlength="20" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
                     </div>
 
@@ -98,96 +98,6 @@
                         <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default" style="width: 30%;">取消</a>
                         <a id="commit" href="javascript:;" onclick="ribaoCommit();" class="weui-btn weui-btn_primary" style="margin-top: 0;width: 30%;">提交</a>
                     </div>
-                    <#--                    <div class="weui-form__control-area">-->
-<#--                        <div class="weui-cells__group weui-cells__group_form">-->
-<#--                            <div class="weui-cells weui-cells_form">-->
-<#--                                <div class="weui-cell weui-cell_active" id="js_cell">-->
-<#--                                    <div class="weui-cell__hd"><label class="weui-label">家人</label></div>-->
-<#--                                    <div class="weui-cell__bd weui-flex">-->
-<#--                                        <input id="js_input_user_name" class="weui-input" autofocus="" type="text"-->
-<#--                                               placeholder="请输入姓名" maxlength="20">-->
-<#--                                    </div>-->
-<#--                                </div>-->
-<#--                                <div class="weui-cells weui-cells_checkbox">-->
-<#--                                    <label class="weui-cell weui-cell_active weui-check__label" for="s11">-->
-<#--                                        <div class="weui-cell__hd">-->
-<#--                                            <input type="checkbox" class="weui-check" name="checkbox1" id="s11">-->
-<#--                                            <i class="weui-icon-checked"></i>-->
-<#--                                        </div>-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <p>咳嗽</p>-->
-<#--                                        </div>-->
-<#--                                    </label>-->
-<#--                                    <label class="weui-cell weui-cell_active weui-check__label" for="s12">-->
-<#--                                        <div class="weui-cell__hd">-->
-<#--                                            <input type="checkbox" name="checkbox2" class="weui-check" id="s12">-->
-<#--                                            <i class="weui-icon-checked"></i>-->
-<#--                                        </div>-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <p>发烧</p>-->
-<#--                                        </div>-->
-<#--                                    </label>-->
-<#--                                    <label class="weui-cell weui-cell_active weui-check__label" for="s13">-->
-<#--                                        <div class="weui-cell__hd">-->
-<#--                                            <input type="checkbox" name="checkbox3" class="weui-check" id="s13">-->
-<#--                                            <i class="weui-icon-checked"></i>-->
-<#--                                        </div>-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <p>腹泻</p>-->
-<#--                                        </div>-->
-<#--                                    </label>-->
-<#--                                    <label class="weui-cell weui-cell_active weui-check__label" for="s14">-->
-<#--                                        <div class="weui-cell__hd">-->
-<#--                                            <input type="checkbox" name="checkbox4" class="weui-check" id="s14">-->
-<#--                                            <i class="weui-icon-checked"></i>-->
-<#--                                        </div>-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <p>酸痛</p>-->
-<#--                                        </div>-->
-<#--                                    </label>-->
-<#--                                    <label class="weui-cell weui-cell_active weui-check__label" for="s15">-->
-<#--                                        <div class="weui-cell__hd">-->
-<#--                                            <input type="checkbox" name="checkbox5" class="weui-check" id="s15">-->
-<#--                                            <i class="weui-icon-checked"></i>-->
-<#--                                        </div>-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <p>乏力</p>-->
-<#--                                        </div>-->
-<#--                                    </label>-->
-<#--                                    <label class="weui-cell weui-cell_active weui-check__label" for="s16">-->
-<#--                                        <div class="weui-cell__hd">-->
-<#--                                            <input type="checkbox" name="checkbox6" class="weui-check" id="s16">-->
-<#--                                            <i class="weui-icon-checked"></i>-->
-<#--                                        </div>-->
-<#--                                        <div class="weui-cell__bd">-->
-<#--                                            <p>其他</p>-->
-<#--                                        </div>-->
-<#--                                    </label>-->
-<#--                                </div>-->
-<#--                                <div class="weui-cell ">-->
-<#--                                    <div class="weui-cell__bd">-->
-<#--                                        <textarea id="rb_remarks" class="weui-textarea" placeholder="请输入病情描述"-->
-<#--                                                  rows="3"></textarea>-->
-<#--                                        <div class="weui-textarea-counter"><span>0</span>/100</div>-->
-<#--                                    </div>-->
-<#--                                </div>-->
-<#--                                <div class="weui-cell weui-cell_switch">-->
-<#--                                    <div class="weui-cell__bd">是否确诊</div>-->
-<#--                                    <div class="weui-cell__ft">-->
-<#--                                        <input class="weui-switch" type="checkbox" name="medical"/>-->
-<#--                                    </div>-->
-<#--                                </div>-->
-<#--                            </div>-->
-<#--                        </div>-->
-<#--                    </div>-->
-<#--                    <div class="weui-cells__tips"> <span style="color: red">-->
-<#--                        注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！-->
-<#--                    </span></div>-->
-<#--                    <div class="button-sp-area">-->
-<#--                        <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default">取消</a>-->
-<#--                        <a id="commit" href="javascript:;" onclick="ribaoCommit();"-->
-<#--                           class="weui-btn weui-btn_primary">提交</a>-->
-<#--                    </div>-->
                 </div>
                 </br>
                 </br>

whepi-ui/templates/home/ribao.js

@@ -23,7 +23,7 @@ function ribao_init() {
     title: "选择基本状况",
     items: [
       {
-        title: "正常",
+        title: "无病史",
         value: "0",
       }, {
         title: "心脑血管疾病（服用ARB）",
@@ -278,7 +278,7 @@ function ribao_cell(v) {
   var age = v.age;
   var familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "是否确诊：" + getMedical(v.medical) + "；";
-  var singleRoom = "是否单间隔离："+ getSingleRoom(v.singleRoom) + "；";
+  var singleRoom = "是否单间隔离：" + getSingleRoom(v.singleRoom) + "；";
   var temperature = "体温：" + v.temperature + "；";
   var cough = "咳嗽：" + getCough(v.cough) + "；";
   var muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；";
@@ -350,16 +350,16 @@ function ribaoCommit() {
   var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
   var age = $("#js_input_user_age").val();
   var familyStatus = $("#js_input_user_status").attr("data-values") == undefined ? 0 : $("#js_input_user_status").attr("data-values");
-  var statusDesp = $("#jibenmiaoshu").val()== undefined ? "" : $("#jibenmiaoshu").val();
+  var statusDesp = $("#jibenmiaoshu").val() == undefined ? "" : $("#jibenmiaoshu").val();
   var medical = $("#switchQuezhen").attr("data-values") == undefined ? 0 : $("#switchQuezhen").attr("data-values");
   var singleRoom = $("#switchDanjiangeli").attr("data-values") == undefined ? 0 : $("#switchDanjiangeli").attr("data-values");
-  var temperature = $("#js_input_user_tiwen").val()== "" ? 0 : $("#js_input_user_tiwen").val();
+  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");
   var dyspnea = $("#js_input_user_huxi").attr("data-values") == undefined ? 0 : $("#js_input_user_huxi").attr("data-values");
   var fatigue = $("#js_input_user_fali").attr("data-values") == undefined ? 0 : $("#js_input_user_fali").attr("data-values");
   var diarrhea = $("#js_input_user_fuxie").attr("data-values") == undefined ? 0 : $("#js_input_user_fuxie").attr("data-values");
-  var others = $("#shuruqita").val()== undefined ? "" : $("#jibenmiaoshu").val();
+  var others = $("#shuruqita").val() == undefined ? "" : $("#shuruqita").val();
 
   if (userName == undefined || userName == '') {
     alert("请填写姓名");
@@ -369,6 +369,10 @@ function ribaoCommit() {
     alert("请填写年龄");
     return;
   }
+  if (age.length >= 3) {
+    alert("请填写正确的年龄");
+    return;
+  }
   if (grender == 0) {
     alert("请填写性别");
     return;
@@ -390,7 +394,7 @@ function ribaoCommit() {
       "familyStatus": familyStatus,
       "statusDesp": statusDesp,
       "medical": medical,
-      "singleRoom" : singleRoom,
+      "singleRoom": singleRoom,
       "temperature": temperature,
       "cough": cough,
       "muscle": muscle,
@@ -407,6 +411,9 @@ function ribaoCommit() {
         $('#notOpenRibao')[0].style.display = '';
         $('#ribao')[0].style.display = 'none';
       }
+      $('#ribao_jinrijujian').empty();
+      $('#ribao_jinrijujian').append(data.safetyNum);
+
       ribao_refrash();
 
       clearShow();
@@ -423,6 +430,8 @@ function deleteSuspected(suspectedId) {
       "suspectedId": suspectedId
     },
     success: function (data) {
+      $('#ribao_jinrijujian').empty();
+      $('#ribao_jinrijujian').append(data.safetyNum);
       ribao_refrash();
     },
   });
@@ -449,36 +458,36 @@ function updateSuspected(suspectedId) {
         var suspected = data;
         $("#suspectedId").val(suspected.suspectedId);
         $("#js_input_user_sex").val(getGreder(suspected.grender));
-        $("#js_input_user_sex").attr("data-values",suspected.grender);
+        $("#js_input_user_sex").attr("data-values", suspected.grender);
         $("#js_input_user_name").val(suspected.userName);
         $("#js_input_user_age").val(suspected.age);
         $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
-        $("#js_input_user_status").attr("data-values",suspected.familyStatus);
+        $("#js_input_user_status").attr("data-values", suspected.familyStatus);
 
         $("#jibenmiaoshu").val(suspected.statusDesp);
 
         $("#switchQuezhen").val(getMedical(suspected.medical));
-        $("#switchQuezhen").attr("data-values",suspected.familyStatus);
+        $("#switchQuezhen").attr("data-values", suspected.familyStatus);
 
         $("#switchDanjiangeli").val(getSingleRoom(suspected.singleRoom));
-        $("#switchDanjiangeli").attr("data-values",suspected.familyStatus);
+        $("#switchDanjiangeli").attr("data-values", suspected.familyStatus);
 
-        $("#js_input_user_tiwen").val( suspected.temperature);
+        $("#js_input_user_tiwen").val(suspected.temperature);
 
         $("#js_input_user_kesou").val(getCough(suspected.cough));
-        $("#js_input_user_kesou").attr("data-values",suspected.cough);
+        $("#js_input_user_kesou").attr("data-values", suspected.cough);
 
         $("#js_input_user_jirou").val(getMuscle(suspected.muscle));
-        $("#js_input_user_jirou").attr("data-values",suspected.muscle);
+        $("#js_input_user_jirou").attr("data-values", suspected.muscle);
 
         $("#js_input_user_huxi").val(getDyspnea(suspected.dyspnea));
-        $("#js_input_user_huxi").attr("data-values",suspected.dyspnea);
+        $("#js_input_user_huxi").attr("data-values", suspected.dyspnea);
 
         $("#js_input_user_fali").val(getFatigue(suspected.fatigue));
-        $("#js_input_user_fali").attr("data-values",suspected.fatigue);
+        $("#js_input_user_fali").attr("data-values", suspected.fatigue);
 
         $("#js_input_user_fuxie").val(getDiarrhea(suspected.diarrhea));
-        $("#js_input_user_fuxie").attr("data-values",suspected.diarrhea);
+        $("#js_input_user_fuxie").attr("data-values", suspected.diarrhea);
 
         $("#shuruqita").val(suspected.others);
       }
@@ -543,7 +552,7 @@ function helpValue1(v) {
   var age = v.age;
   var familyStatus = "基本状况：" + getFamilyStatus(v.familyStatus) + "；";
   var medical = "是否确诊：" + getMedical(v.medical) + "；";
-  var singleRoom = "是否单间隔离："+ getSingleRoom(v.singleRoom) + "；";
+  var singleRoom = "单间隔离：" + getSingleRoom(v.singleRoom) + "；";
   var temperature = "体温：" + v.temperature + "；";
   var cough = "咳嗽：" + getCough(v.cough) + "；";
   var muscle = "肌肉酸痛：" + getMuscle(v.muscle) + "；";
@@ -552,8 +561,8 @@ function helpValue1(v) {
   var diarrhea = "腹泻：" + getDiarrhea(v.diarrhea) + "；";
   var others = "其他：" + v.others;
   $('#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  + '</p>\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 + '</p>\n' +
     '                                    </div>\n' +
     '                              '));
 }
@@ -569,7 +578,7 @@ function getGreder(greder) {
 
 function getFamilyStatus(familyStatus) {
   if (familyStatus == 0)
-    return "正常";
+    return "无病史";
   if (familyStatus == 1)
     return "心脑血管疾病（服用ARB）";
   else if (familyStatus == 2)
@@ -672,36 +681,36 @@ function clearShow() {
   console.log("qingkong")
   $("#suspectedId").val("");
   $("#js_input_user_sex").val("");
-  $("#js_input_user_sex").attr("data-values","");
+  $("#js_input_user_sex").attr("data-values", "");
   $("#js_input_user_name").val("");
   $("#js_input_user_age").val("");
   $("#js_input_user_status").val("");
-  $("#js_input_user_status").attr("data-values","");
+  $("#js_input_user_status").attr("data-values", "");
 
   $("#jibenmiaoshu").val("");
 
   $("#switchQuezhen").val("");
-  $("#switchQuezhen").attr("data-values","");
+  $("#switchQuezhen").attr("data-values", "");
 
   $("#switchDanjiangeli").val("");
-  $("#switchDanjiangeli").attr("data-values","");
+  $("#switchDanjiangeli").attr("data-values", "");
 
-  $("#js_input_user_tiwen").val( "");
+  $("#js_input_user_tiwen").val("");
 
   $("#js_input_user_kesou").val("");
-  $("#js_input_user_kesou").attr("data-values","");
+  $("#js_input_user_kesou").attr("data-values", "");
 
   $("#js_input_user_jirou").val("");
-  $("#js_input_user_jirou").attr("data-values","");
+  $("#js_input_user_jirou").attr("data-values", "");
 
   $("#js_input_user_huxi").val("");
-  $("#js_input_user_huxi").attr("data-values","");
+  $("#js_input_user_huxi").attr("data-values", "");
 
   $("#js_input_user_fali").val("");
-  $("#js_input_user_fali").attr("data-values","");
+  $("#js_input_user_fali").attr("data-values", "");
 
   $("#js_input_user_fuxie").val("");
-  $("#js_input_user_fuxie").attr("data-values","");
+  $("#js_input_user_fuxie").attr("data-values", "");
 }
 
 

whepi-web/src/main/java/com/bofeng/dao/MsSuspectedMapper.java

@@ -6,6 +6,7 @@ import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -19,4 +20,8 @@ import java.util.List;
 public interface MsSuspectedMapper extends BaseMapper<MsSuspected> {
 
     List<MsSuspected> selectByReportId(@Param("reportId") Long reportId);
+
+    //判断家人姓名是否重复
+    @Select("select count(*) from ms_suspected where report_id=#{reportId} and user_name=#{userName}")
+    Integer selectUserNameNum(@Param("reportId") Long reportId,@Param("userName") String userName);
 }

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

@@ -37,6 +37,10 @@ public class MsReportService {
         return msSuspectedMapper.selectByReportId(reportId);
     }
 
+    public MsReport getByReport(Long reportId) {
+        return msReportMapper.selectById(reportId);
+    }
+
     //获取前一天数据
     public List<MsSuspected> getByReportReportDate(String reportDate, Long userCreate) {
 
@@ -75,9 +79,14 @@ public class MsReportService {
 
         //判断体温是否填写
         List<MsSuspected> listSuspected = msSuspectedMapper.selectByReportId(Long.parseLong(listReport.get(0).getReportId().toString()));
-        for (MsSuspected msSuspected : listSuspected) {
-            if (msSuspected.getTemperature().compareTo(new BigDecimal(0)) == 0)
-                return 2;
+        if (listSuspected == null || listSuspected.size() == 0)
+            return 3;
+        else {
+            for (MsSuspected msSuspected : listSuspected) {
+                if (msSuspected.getTemperature().compareTo(new BigDecimal(0)) == 0)
+                    return 2;
+            }
+
         }
         MsReport msReport = msReportMapper.selectById(Long.parseLong(listReport.get(0).getReportId().toString()));
         if (msReport != null) {

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

@@ -39,7 +39,7 @@ public class MsSuspectedService {
 
     //添加家人
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
-    public void addSuspected(Long suspectedId, String userName, Integer grender, Integer age, Integer familyStatus,
+    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) {
         Long reportId = 0L;
@@ -141,6 +141,7 @@ public class MsSuspectedService {
 
         //更新今日日报
         updateReport(reportId, medical, singleRoom, temperature);
+        return reportId;
 
     }
 

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

@@ -33,7 +33,7 @@ public class MsReportController {
 
     //添加家人
     @PostMapping("/home/addRibao")
-    public Integer saveUser(HttpServletRequest request) {
+    public MsReport saveUser(HttpServletRequest request) {
         //初始化今日日报
         Long suspectedId = Conv.NL(request.getParameter("suspectedId"));
         Long userCreate = Conv.NL(request.getParameter("userCreate"));
@@ -51,8 +51,9 @@ public class MsReportController {
         Integer diarrhea = Conv.NI(request.getParameter("diarrhea"));
         Integer singleRoom = Conv.NI(request.getParameter("singleRoom"));
         String others = request.getParameter("others");
-        msSuspectedService.addSuspected(suspectedId,userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate);
-        return 1;
+        Long reportId =msSuspectedService.addSuspected(suspectedId, userName, grender, age, familyStatus, statusDesp, medical, temperature, cough, muscle, dyspnea, fatigue, diarrhea, singleRoom, others, userCreate);
+
+        return msReportService.getByReport(reportId);
     }
 
     //查询家人
@@ -65,10 +66,14 @@ public class MsReportController {
 
     //删除家人病例
     @PostMapping("/home/deleteSuspected")
-    public Integer deleteSuspected(HttpServletRequest request) {
+    public MsReport deleteSuspected(HttpServletRequest request) {
         Long suspectedId = Long.parseLong(request.getParameter("suspectedId"));
+        MsSuspected msSuspected = msSuspectedService.selectSuspected(suspectedId);
         msSuspectedService.deleteSuspected(suspectedId);
-        return 1;
+        if (msSuspected != null)
+            return msReportService.getByReport(msSuspected.getReportId());
+        else
+            return null;
     }
 
     //根据登录人获取家人
@@ -95,6 +100,8 @@ public class MsReportController {
             return ModelOps.newSuccess();
         } else if (re == 2) { //没有上报体温
             return ModelOps.newFail("请填报今日体温！");
+        }else if (re == 3) { //没有选择家人
+            return ModelOps.newFail("请选择家人！");
         }
         return ModelOps.newFail("上报错误");
     }