常用列表

triage-service/src/main/java/com/diagbot/facade/SymptomFacade.java

@@ -6,6 +6,7 @@ import com.diagbot.entity.SymptomWrapper;
 import com.diagbot.enums.ShowTypeEnum;
 import com.diagbot.service.impl.SymptomServiceImpl;
 import com.diagbot.vo.SymptomSearchVO;
+import com.diagbot.vo.SymptomUsualVO;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -22,16 +23,21 @@ import java.util.Map;
 public class SymptomFacade extends SymptomServiceImpl{
     /**
      *  获取常用症状
+     *
      * @return
      */
-    public List<Symptom> getUsualFac() {
-        return this.getUsual();
+    public List<Symptom> getUsualFac(SymptomUsualVO symptomUsualVO) {
+        Map paramMap = new HashMap();
+        paramMap.put("sexType", symptomUsualVO.getSexType());
+        paramMap.put("age", symptomUsualVO.getAge());
+        return this.getUsual(paramMap);
     }
 
 
     /**
      * 根据部位partIds获取症状信息
-     * @param map
+     *
+     * @param map 参数
      * @return
      */
     public List<SymptomWrapper> getByPartIdsFac(Map map) {
@@ -41,6 +47,7 @@ public class SymptomFacade extends SymptomServiceImpl{
 
     /**
      * 症状检索
+     *
      * @param symptomSearchVO
      * @return 检索的症状
      */

triage-service/src/main/java/com/diagbot/mapper/SymptomMapper.java

@@ -27,7 +27,7 @@ public interface SymptomMapper extends BaseMapper<Symptom> {
      * 获取常用症状
      * @return 常用症状
      */
-    public List<Symptom> getUsual();
+    public List<Symptom> getUsual(Map map);
 
 
     /**

triage-service/src/main/java/com/diagbot/service/SymptomService.java

@@ -31,7 +31,7 @@ public interface SymptomService extends IService<Symptom> {
      * 获取常用症状
      * @return
      */
-    public List<Symptom> getUsual();
+    public List<Symptom> getUsual(Map map);
 
 
     /**

triage-service/src/main/java/com/diagbot/service/impl/SymptomServiceImpl.java

@@ -28,8 +28,8 @@ public class SymptomServiceImpl extends ServiceImpl<SymptomMapper, Symptom> impl
     }
 
     @Override
-    public List<Symptom> getUsual() {
-        return baseMapper.getUsual();
+    public List<Symptom> getUsual(Map map) {
+        return baseMapper.getUsual(map);
     }
 
     @Override

triage-service/src/main/java/com/diagbot/vo/SymptomUsualVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 部位搜索参数
+ * @Author: ztg
+ * @Date: 2018/10/10 13:17
+ */
+@Getter
+@Setter
+public class SymptomUsualVO {
+
+    @NotNull(message = "请输入性别")
+    private Integer sexType;
+    @NotNull(message = "请输入年龄")
+    private Integer age;
+}

triage-service/src/main/java/com/diagbot/web/PartController.java

@@ -27,7 +27,10 @@ public class PartController {
     PartFacade partFacade;
 
 
-    @ApiOperation(value = "根据已选部位返回对应的症状", notes = "partIds: 部位的id，多个用逗号隔开")
+    @ApiOperation(value = "根据已选部位返回对应的症状[by:zhoutg]",
+            notes = "partIds： 部位的id，数组<br>" +
+                    "sexType：性别，1：男，2：女<br>" +
+                    "age：年龄")
     @PostMapping("/getSymptomByPartIds")
     public RespDTO<List<PartSymptomDTO>> getSymptomByPartIds(@RequestBody PartSymptomVO partSymptomVO) {
         return RespDTO.onSuc(partFacade.getSymptomByPartIds(partSymptomVO));

triage-service/src/main/java/com/diagbot/web/SymptomController.java

@@ -6,6 +6,7 @@ import com.diagbot.dto.SymptomSearchDTO;
 import com.diagbot.entity.Symptom;
 import com.diagbot.facade.SymptomFacade;
 import com.diagbot.vo.SymptomSearchVO;
+import com.diagbot.vo.SymptomUsualVO;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -29,14 +30,19 @@ public class SymptomController {
     SymptomFacade symptomFacade;
 
 
-    @ApiOperation(value = "获取常用症状", notes = "")
+    @ApiOperation(value = "获取常用症状[by:zhoutg]",
+            notes = "sexType：性别，1：男，2：女<br>" +
+                    "age：年龄")
     @PostMapping("/getUsual")
-    public RespDTO<List<Symptom>> getUsual() {
-        return RespDTO.onSuc(symptomFacade.getUsualFac());
+    public RespDTO<List<Symptom>> getUsual(@RequestBody @Valid SymptomUsualVO symptomUsualVO) {
+        return RespDTO.onSuc(symptomFacade.getUsualFac(symptomUsualVO));
     }
 
 
-    @ApiOperation(value = "搜索症状", notes = "")
+    @ApiOperation(value = "搜索症状[by:zhoutg]",
+            notes = "name: 输入内容<br>" +
+                    "sexType：性别，1：男，2：女<br>" +
+                    "age：年龄")
     @PostMapping("/search")
     public RespDTO<List<SymptomSearchDTO>> search(@RequestBody @Valid SymptomSearchVO symptomSearchVO) {
         return RespDTO.onSuc(symptomFacade.searchFac(symptomSearchVO));

triage-service/src/main/resources/mapper/SymptomMapper.xml

@@ -34,9 +34,14 @@
         order by b.part_id, b.order_no
     </select>
 
-    <select id="getUsual"  resultMap="BaseResultMap">
+    <select id="getUsual"  parameterType="java.util.Map" resultMap="BaseResultMap">
         SELECT a.*  FROM `triage_symptom` a, triage_symptom_usual b where a.is_deleted = 'N' and b.is_deleted = 'N'
         and b.symptom_id = a.id
+        and a.sex_type in (3, #{sexType})
+        <if test="age != null">
+            <![CDATA[ and a.age_begin <= #{age} ]]>
+            <![CDATA[ and a.age_end >= #{age} ]]>
+        </if>
         order by b.order_no
     </select>