diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java index 5cd1200..6d0fb17 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/evaluateresult/EvaluateResultController.java @@ -1,6 +1,6 @@ package com.xinelu.manage.controller.evaluateresult; import com.xinelu.common.core.controller.BaseController; -import com.xinelu.common.core.page.TableDataInfo; +import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.manage.service.evaluateresult.EvaluateResultService; import com.xinelu.manage.vo.evaluateresult.EvaluateResultVo; import org.springframework.web.bind.annotation.GetMapping; @@ -22,15 +22,16 @@ public class EvaluateResultController extends BaseController { /** * 根据年龄端性别统计筛查结果 - * @param ageA - * @param ageB + * @param age * @param sex * @return */ - @GetMapping("/list/{ageA}/{ageB}/{sex}") - public TableDataInfo list(@PathVariable("ageA") String ageA, @PathVariable("ageB") String ageB,@PathVariable("sex")String sex) { - startPage(); - List list = evaluateResultService.list(ageA,ageB,sex); - return getDataTable(list); + @GetMapping("/list/{age}/{sex}") + public AjaxResult list(@PathVariable("age") String age, @PathVariable("sex")String sex) { + String[] split = age.split("-"); + String ageA = split[0]; + String ageB = split[1]; + List list = evaluateResultService.list(ageA,ageB,sex); + return AjaxResult.success(list); } } diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/hospitalpersoninfo/HospitalPersonInfoDtoo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/hospitalpersoninfo/HospitalPersonInfoDtoo.java index be76a74..0fab7b4 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/hospitalpersoninfo/HospitalPersonInfoDtoo.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/dto/hospitalpersoninfo/HospitalPersonInfoDtoo.java @@ -85,6 +85,8 @@ public class HospitalPersonInfoDtoo extends BaseDomain implements Serializable { @ApiModelProperty(value = "身份证号") @Excel(name = "身份证号") private String cardNo; + private String personAccount; + private String personPassword; /** * 人员职称,主任医师:CHIEF_PHYSICIAN,副主任医师:DEPUTY_CHIEF_PHYSICIAN,主治医师:ATTENDING_DOCTOR,医师:PHYSICIAN,医士:HEALER,住院医师:RESIDENT_PHYSICIAN diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java index 29b1239..bf80f63 100644 --- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java +++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/service/evaluateresult/impl/EvaluateResultServiceimpl.java @@ -4,9 +4,7 @@ import com.xinelu.manage.service.evaluateresult.EvaluateResultService; import com.xinelu.manage.vo.evaluateresult.EvaluateResultVo; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.List; -import java.util.Map; @Service public class EvaluateResultServiceimpl implements EvaluateResultService {