xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0418_小程序开发' into dev

Browse Source
This commit is contained in:
haown 2024-05-07 14:32:46 +08:00
commit 45f25f3bad
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientprehospitalization/PatientPreHospitalizationController.java
View File

@ -56,7 +56,7 @@ public class PatientPreHospitalizationController extends BaseController {
* 查询预住院患者信息列表
*/
@ApiOperation("查询预住院患者信息列表")
@PreAuthorize("@ss.hasPermi('manage:patientInfo:list')")
@PreAuthorize("@ss.hasPermi('manage:preHospitalized:list')")
@GetMapping("/list")
public TableDataInfo list(PatientInfoDto patientInfo) {
startPage();
@ -67,7 +67,7 @@ public class PatientPreHospitalizationController extends BaseController {
/**
* 获取住院患者信息详细信息
*/
@PreAuthorize("@ss.hasPermi('manage:patientInfo:query')")
@PreAuthorize("@ss.hasPermi('manage:preHospitalized:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(preHospitalizationService.getById(id));
@ -76,7 +76,7 @@ public class PatientPreHospitalizationController extends BaseController {
/**
* 修改预住院患者信息
*/
@PreAuthorize("@ss.hasPermi('manage:patientInfo:edit')")
@PreAuthorize("@ss.hasPermi('manage:preHospitalized:edit')")
@Log(title = "预住院患者", businessType = BusinessType.UPDATE)
@PutMapping
public R<String> edit(@RequestBody PatientPreHospitalization preHospitalization) {
@ -87,7 +87,7 @@ public class PatientPreHospitalizationController extends BaseController {
/**
* 删除预住院患者信息
*/
@PreAuthorize("@ss.hasPermi('manage:patientInfo:remove')")
@PreAuthorize("@ss.hasPermi('manage:preHospitalized:remove')")
@Log(title = "患者信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {

3
postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java
View File

@ -347,7 +347,8 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
}
// 查询院区id
if (StringUtils.isNotBlank(item.getCampusAgencyName())) {
agency.setAgencyName(item.getWardName());
agency.setParentId(patientVisitRecord.getHospitalAgencyId());
agency.setAgencyName(item.getCampusAgencyName());
agency.setNodeType(NodeTypeConstants.CAMPUS);
List<Agency> campusList = agencyMapper.selectAgencyList(agency);
if (CollectionUtils.isNotEmpty(campusList)) {

7
postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
View File

@ -22,6 +22,7 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 专病路径-管理节点信息Service业务层处理
@ -116,6 +117,12 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
if (CollectionUtils.isEmpty(specialDiseaseNode.getSpecialDiseaseNodeList())) {
return AjaxResult.success();
}
List<Integer> routeNodeDayList = specialDiseaseNode.getSpecialDiseaseNodeList().stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getRouteNodeDay())).map(SpecialDiseaseNode::getRouteNodeDay).collect(Collectors.toList());
long size = routeNodeDayList.stream().distinct().count();
if (routeNodeDayList.size() != size) {
log.info("专病路径管理节点天数重复");
throw new ServiceException("专病路径管理节点天数重复！");
}
ArrayList<SpecialDiseaseNodeVO> specialDiseaseNodeVOS = new ArrayList<>();
for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) {
if (StringUtils.isNotBlank(diseaseNode.getRouteNodeName()) && Objects.nonNull(diseaseNode.getRouteNodeDay()) && StringUtils.isNotBlank(diseaseNode.getTaskType()) && StringUtils.isNotBlank(diseaseNode.getTaskSubdivision()) && StringUtils.isNotBlank(diseaseNode.getTaskStatus())) {

4
postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java
View File

@ -53,8 +53,8 @@ public class HomePageController extends BaseController {
* 问卷记录信息
*/
@GetMapping("/selectQuestionSubmit")
public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId) {
return homePageService.selectQuestionSubmit(patientQuestionSubmitResultId);
public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId,Long patientTaskExecuteRecordId) {
return homePageService.selectQuestionSubmit(patientQuestionSubmitResultId,patientTaskExecuteRecordId);
}
/**

2
postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java
View File

@ -42,7 +42,7 @@ public interface HomePageService {
* @param patientQuestionSubmitResultId 记录表id
* @return AjaxResult
*/
AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId);
AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId,Long patientTaskExecuteRecordId);
/**
* 问卷提交

4
postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java
View File

@ -152,8 +152,8 @@ public class HomePageServiceImpl implements HomePageService {
* @return AjaxResult
*/
@Override
public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId) {
return AjaxResult.success(submitResultMapper.selectResultByTaskExecuteRecordId(null, patientQuestionSubmitResultId));
public AjaxResult selectQuestionSubmit(Long patientQuestionSubmitResultId, Long patientTaskExecuteRecordId) {
return AjaxResult.success(submitResultMapper.selectResultByTaskExecuteRecordId(patientTaskExecuteRecordId, patientQuestionSubmitResultId));
}
/**