xielianghe

whepi-ui/templates/home/ribao.js

@@ -231,29 +231,6 @@ function ribaoInitialization(reportId) {
         });
       } else {
         $('#btn_shangbao').text('上报');
-
-        $("#switchQuezhen").val(getMedical(0));
-        $("#switchQuezhen").attr("data-values", 0);
-
-        $("#switchDanjiangeli").val(getSingleRoom(0));
-        $("#switchDanjiangeli").attr("data-values", 0);
-
-        $("#js_input_user_tiwen").val(0);
-
-        $("#js_input_user_kesou").val(getCough(0));
-        $("#js_input_user_kesou").attr("data-values", 0);
-
-        $("#js_input_user_jirou").val(getMuscle(0));
-        $("#js_input_user_jirou").attr("data-values", 0);
-
-        $("#js_input_user_huxi").val(getDyspnea(0));
-        $("#js_input_user_huxi").attr("data-values", 0);
-
-        $("#js_input_user_fali").val(getFatigue(0));
-        $("#js_input_user_fali").attr("data-values", 0);
-
-        $("#js_input_user_fuxie").val(getDiarrhea(0));
-        $("#js_input_user_fuxie").attr("data-values", 0);
       }
     },
     error: function () {
@@ -283,30 +260,6 @@ function ribao_refrash() {
             ribao_cell(v);
           });
         } else {
-
-          $("#switchQuezhen").val(getMedical(0));
-          $("#switchQuezhen").attr("data-values", 0);
-
-          $("#switchDanjiangeli").val(getSingleRoom(0));
-          $("#switchDanjiangeli").attr("data-values", 0);
-
-          $("#js_input_user_tiwen").val(0);
-
-          $("#js_input_user_kesou").val(getCough(0));
-          $("#js_input_user_kesou").attr("data-values", 0);
-
-          $("#js_input_user_jirou").val(getMuscle(0));
-          $("#js_input_user_jirou").attr("data-values", 0);
-
-          $("#js_input_user_huxi").val(getDyspnea(0));
-          $("#js_input_user_huxi").attr("data-values", 0);
-
-          $("#js_input_user_fali").val(getFatigue(0));
-          $("#js_input_user_fali").attr("data-values", 0);
-
-          $("#js_input_user_fuxie").val(getDiarrhea(0));
-          $("#js_input_user_fuxie").attr("data-values", 0);
-
         }
       }
     },
@@ -370,6 +323,33 @@ function ribao_add() {
       $('#notOpenRibao')[0].style.display = '';
       $('#ribao')[0].style.display = 'none';
     }
+
+    $("#js_input_user_status").val(0);
+    $("#js_input_user_status").attr("data-values", 0);
+
+    $("#switchQuezhen").val(getMedical(0));
+    $("#switchQuezhen").attr("data-values", 0);
+
+    $("#switchDanjiangeli").val(getSingleRoom(0));
+    $("#switchDanjiangeli").attr("data-values", 0);
+
+    $("#js_input_user_tiwen").val(0);
+
+    $("#js_input_user_kesou").val(getCough(0));
+    $("#js_input_user_kesou").attr("data-values", 0);
+
+    $("#js_input_user_jirou").val(getMuscle(0));
+    $("#js_input_user_jirou").attr("data-values", 0);
+
+    $("#js_input_user_huxi").val(getDyspnea(0));
+    $("#js_input_user_huxi").attr("data-values", 0);
+
+    $("#js_input_user_fali").val(getFatigue(0));
+    $("#js_input_user_fali").attr("data-values", 0);
+
+    $("#js_input_user_fuxie").val(getDiarrhea(0));
+    $("#js_input_user_fuxie").attr("data-values", 0);
+
   });
 }
 

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

@@ -22,8 +22,8 @@ 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);
+    @Select("select * from ms_suspected where report_id=#{reportId} and user_name=#{userName}")
+    List<MsSuspected> selectUserNameNum(@Param("reportId") Long reportId, @Param("userName") String userName);
 
     //判断家人是否有历史评分
     @Select("select score from ms_suspected where user_create=#{userCreate} and user_name=#{userName} and suspected_id !=#{suspectedId}  order by time_update desc limit 1")

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -68,4 +68,8 @@ public class MsReport {
 
     @TableField("time_update")
     private DateTime timeUpdate;
+
+
+    @TableField(exist = false)
+    private String msgReport = "";
 }

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

@@ -38,6 +38,12 @@ 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,
@@ -100,7 +106,6 @@ public class MsSuspectedService {
         if (diarrhea > 0)
             suspectedStatus = 1;
         if (suspectedId == 0L) {
-            //添加家人
             MsSuspected msSuspected = new MsSuspected();
             msSuspected.setSuspectedId(IdWorker.getId());
             msSuspected.setReportId(reportId);

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

@@ -34,6 +34,7 @@ public class MsReportController {
     //添加家人
     @PostMapping("/home/addRibao")
     public MsReport saveUser(HttpServletRequest request) {
+
         //初始化今日日报
         Long suspectedId = Conv.NL(request.getParameter("suspectedId"));
         Long userCreate = Conv.NL(request.getParameter("userCreate"));
@@ -55,6 +56,7 @@ public class MsReportController {
         Integer temperatureScore = Conv.NI(request.getParameter("temperatureScore"));
         Integer scoreHistroy = Conv.NI(request.getParameter("scoreHistroy"));
         Integer score = Conv.NI(request.getParameter("score"));
+
         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);