问诊体质列表修改

prec-service/src/main/java/com/diagbot/dto/GetEvaluatorPageDTO.java

@@ -0,0 +1,129 @@
+package com.diagbot.dto;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@ApiModel(value="儿童体质辨识--获取分页信息--接口出参")
+@Getter
+@Setter
+public class GetEvaluatorPageDTO{
+	
+	/**
+     * 主键id
+     */
+	@ApiModelProperty(value="主键id")
+    private Long id;
+
+    /**
+     * 记录创建时间
+     */
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	@ApiModelProperty(value="记录创建时间")
+    private Date gmtCreate;
+
+    /**
+     * 姓名
+     */
+	@ApiModelProperty(value="姓名")
+    private String name;
+
+    /**
+     * 手机号
+     */
+	@ApiModelProperty(value="手机号")
+    private String phone;
+
+    /**
+     * 性别(1：男 2：女)
+     */
+	@ApiModelProperty(value="性别(1：男 2：女)")
+    private Integer sex;
+
+    /**
+     * 性别名称
+     */
+	@ApiModelProperty(value="性别名称")
+    private String sexName;
+	
+    /**
+     * 出生日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty(value="出生日期")
+    private Date birthday;
+
+    /**
+     * 年龄
+     */
+	@ApiModelProperty(value="年龄")
+    private Integer age;
+
+    /**
+     * 平和体质转化分
+     */
+	@ApiModelProperty(value="平和体质转化分")
+    private BigDecimal mildValue;
+
+    /**
+     * 气虚体质转化分
+     */
+	@ApiModelProperty(value="气虚体质转化分")
+    private BigDecimal faintValue;
+
+    /**
+     * 湿滞体质转化分
+     */
+	@ApiModelProperty(value="湿滞体质转化分")
+    private BigDecimal wetValue;
+
+    /**
+     * 心肝火旺体质转化分
+     */
+	@ApiModelProperty(value="心肝火旺体质转化分")
+    private BigDecimal heartValue;
+
+    /**
+     * 积滞体质转化分
+     */
+	@ApiModelProperty(value="积滞体质转化分")
+    private BigDecimal stagnantValue;
+
+    /**
+     * 异禀体质转化分
+     */
+	@ApiModelProperty(value="异禀体质转化分")
+    private BigDecimal exceptValue;
+
+    /**
+     * 体质结果
+     */
+	@ApiModelProperty(value="体质结果")
+    private String physicalRes;
+
+    /**
+     * 需要显示的体质逗号隔开
+     */
+	@ApiModelProperty(value="需要显示的体质逗号隔开")
+    private String physicalTypes;
+
+    /**
+     * 体质显示列表
+     */
+	@ApiModelProperty(value="体质显示列表")
+    private List<PhysicalInfoDTO> physicalInfoDTOList;
+	
+	
+}

prec-service/src/main/java/com/diagbot/facade/InquiryEvaluatorFacade.java

@@ -4,6 +4,7 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.assertj.core.util.Lists;
@@ -11,12 +12,17 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.EvaluatorCalDTO;
+import com.diagbot.dto.GetEvaluatorPageDTO;
+import com.diagbot.dto.PhysicalInfoDTO;
 import com.diagbot.entity.InquiryEvaluator;
 import com.diagbot.entity.InquiryInfo;
+import com.diagbot.entity.PhysicalInfo;
 import com.diagbot.entity.PhysicalVal;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.PhysicalTypeEnum;
+import com.diagbot.enums.SexEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.InquiryEvaluatorServiceImpl;
@@ -25,6 +31,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.AddEvaluatorVO;
 import com.diagbot.vo.EvaluatorCalVO;
+import com.diagbot.vo.GetEvaluatorPageVO;
 
 /**
  * @author: zhoutg
@@ -91,6 +98,34 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
         return evaluatorCalDTO;
     }
     
+    /**
+     * 儿童体质辨识--获取分页信息
+     * @param getEvaluatorPageVO
+     * @return
+     */
+    public IPage<GetEvaluatorPageDTO> getEvaluatorPage(GetEvaluatorPageVO getEvaluatorPageVO){
+    	IPage<GetEvaluatorPageDTO> ipage = this.baseMapper.getEvaluatorPage(getEvaluatorPageVO);
+    	if(ListUtil.isNotEmpty(ipage.getRecords())){
+    		Map<String, PhysicalInfo> physicalInfoMap = physicalInfoFacade.getPhysicalMap();
+    		ipage.getRecords().forEach(getEvaluatorPageDTO->{
+    			getEvaluatorPageDTO.setSexName(SexEnum.getName(getEvaluatorPageDTO.getSex()));
+    			getEvaluatorPageDTO.setAge(DateUtil.yearCompare(getEvaluatorPageDTO.getBirthday(), DateUtil.now()));
+    			
+    			String[] physicalTypes = getEvaluatorPageDTO.getPhysicalTypes().split(",");
+                List<PhysicalInfoDTO> physicalInfoDTOList = ListUtil.newArrayList();
+                for (String physicalType : physicalTypes) {
+                    if(physicalInfoMap.get(physicalType)!=null) {
+                    	PhysicalInfoDTO physicalInfoDTO = new PhysicalInfoDTO();
+                        BeanUtil.copyProperties(physicalInfoMap.get(physicalType), physicalInfoDTO);
+                        physicalInfoDTOList.add(physicalInfoDTO);
+                    }
+                }
+                getEvaluatorPageDTO.setPhysicalInfoDTOList(physicalInfoDTOList);
+    		});
+    	}
+    	return ipage;
+    }
+    
     /**
      * 进行体质计算
      * @param evaluatorCalVO

prec-service/src/main/java/com/diagbot/mapper/InquiryEvaluatorMapper.java

@@ -1,7 +1,10 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.GetEvaluatorPageDTO;
 import com.diagbot.entity.InquiryEvaluator;
+import com.diagbot.vo.GetEvaluatorPageVO;
 
 /**
  * <p>
@@ -13,5 +16,6 @@ import com.diagbot.entity.InquiryEvaluator;
  */
 public interface InquiryEvaluatorMapper extends BaseMapper<InquiryEvaluator> {
 	
+	IPage<GetEvaluatorPageDTO> getEvaluatorPage(GetEvaluatorPageVO getEvaluatorPageVO);
 
 }

prec-service/src/main/java/com/diagbot/vo/GetEvaluatorPageVO.java

@@ -0,0 +1,47 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:58
+ */
+@ApiModel(value="儿童体质辨识--获取分页信息--接口传参")
+@Getter
+@Setter
+public class GetEvaluatorPageVO {
+	
+    /**
+     * 姓名
+     */
+	@ApiModelProperty(value="姓名")
+    private String name;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value="手机号")
+    private String phone;
+
+    /**
+     * 性别(1：男 2：女)
+     */
+    @ApiModelProperty(value="性别(1：男 2：女)")
+    private Integer sex;
+	
+	
+	/**
+     * 医院编码
+     */
+	@ApiModelProperty(value="医院编码")
+	@NotBlank(message="医院编码必传")
+    private String hospitalCode;
+
+	   
+}

prec-service/src/main/java/com/diagbot/web/InquiryEvaluatorController.java

@@ -9,12 +9,15 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EvaluatorCalDTO;
+import com.diagbot.dto.GetEvaluatorPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.InquiryEvaluatorFacade;
 import com.diagbot.vo.AddEvaluatorVO;
 import com.diagbot.vo.EvaluatorCalVO;
+import com.diagbot.vo.GetEvaluatorPageVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -43,4 +46,11 @@ public class InquiryEvaluatorController {
         return RespDTO.onSuc(inquiryEvaluatorFacade.evaluatorCal(evaluatorCalVO));
     }
     
+    @ApiOperation(value = "儿童体质辨识--获取分页信息")
+    @PostMapping("/getEvaluatorPage")
+    @SysLogger("getEvaluatorPage")
+    public RespDTO<IPage<GetEvaluatorPageDTO>> getEvaluatorPage(@Valid @RequestBody GetEvaluatorPageVO getEvaluatorPageVO){
+    	return RespDTO.onSuc(inquiryEvaluatorFacade.getEvaluatorPage(getEvaluatorPageVO));
+    }
+    
 }

prec-service/src/main/resources/mapper/InquiryEvaluatorMapper.xml

@@ -21,5 +21,9 @@
         <result column="physical_types" property="physicalTypes" />
     </resultMap>
     
+    <select id="getEvaluatorPage" resultType="com.diagbot.dto.GetEvaluatorPageDTO">
+    
+    </select>
+    
 
 </mapper>