浏览代码

体温记录(个人列表)加参数 是否异常

jz.kai 5 年之前
父节点
当前提交
6a2f91d89e

+ 10 - 0
common/src/main/resources/mapper/base/PersonDeviceFilterLog.xml

@@ -159,6 +159,16 @@
             <if test="searchParams.abnormalFilter!=null">
                 and a.temperature_>37
             </if>
+            <if test="searchParams.fever==true">
+                <![CDATA[
+                and a.temperature_>37
+                ]]>
+            </if>
+            <if test="searchParams.fever==false">
+                <![CDATA[
+                and a.temperature_<=37
+                ]]>
+            </if>
         </where>
         <foreach item="sort" collection="sortList"  open="order by" separator=",">
             ${sort.name} ${sort.order}

+ 11 - 10
web/src/main/java/com/jpsoft/smart/modules/mobile/controller/PersonDeviceFilterLogController.java

@@ -91,23 +91,26 @@ public class PersonDeviceFilterLogController {
     @ApiImplicitParams({
             @ApiImplicitParam(name="token",value = "令牌",required = true,paramType = "form"),
             @ApiImplicitParam(name="subject",value = "目标(不传)",paramType = "form"),
+            @ApiImplicitParam(name="fever",value = "是否异常",required = false,paramType = "form",dataType = "Boolean")
 //            @ApiImplicitParam(name = "recordDate",value = "查询日期(yyyy-MM-dd)", required = false, paramType = "form",dataType = "String")
     })
     public MessageResult<Map> pageList(//@RequestParam(value="recordDate",defaultValue="") String recordDate,
-                                                              @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-                                                              @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-                                                              @RequestAttribute String subject,
-                                                              String token){
+                                      @RequestParam(value="fever",defaultValue="") Boolean fever,
+                                      @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+                                      @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+                                      @RequestAttribute String subject,
+                                      String token){
         MessageResult<Map> msgResult = new MessageResult<>();
 
         try {
-            List<PersonDeviceFilterLogDTO> listPersonDeviceFilterLogDTO = new ArrayList<>();
-
-            Map<String,Object> searchParams = new HashMap<>();
-            searchParams.put("personId",subject);
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("a.id_","asc"));
 
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("personId",subject);
+            if(fever != null){
+                searchParams.put("fever", fever);
+            }
 //            if(StringUtils.isNotEmpty(recordDate)) {
 //                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 //                Calendar calendar = Calendar.getInstance();
@@ -138,8 +141,6 @@ public class PersonDeviceFilterLogController {
                 }else {
                     personDeviceFilterLogDTO.setFever(false);
                 }
-
-                listPersonDeviceFilterLogDTO.add(personDeviceFilterLogDTO);
             }
 
             msgResult.setResult(true);