xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化；

Browse Source
This commit is contained in:
mengkuiliang 2023-10-10 14:40:09 +08:00
parent 151dae3aff
commit d7e5267293
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/pojo/vo/ScreeningProjectVo.java
View File

@ -51,13 +51,13 @@ public class ScreeningProjectVo {
* 机构ID
*/
@ApiModelProperty("机构ID")
private String deptId;
private String hospitalId;
/**
* 所属机构名称
*/
@ApiModelProperty("机构名称")
private String deptName;
private String hospitalName;
/**
* 服务内容

7
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentPatientInfoServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.xinelu.familydoctor.applet.service.impl;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@ -280,6 +281,9 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
// 获取当前选中的
List<PatientInfo> currentList = list.stream().filter(p -> p.getIsChecked().equals("1")).collect(Collectors.toList());
if (currentList.size() > 0) {
if(!StringUtils.isBlank(currentList.get(0).getDisease())) {
currentList.get(0).setDiseaseList(Arrays.asList(currentList.get(0).getDisease().split(",")));
}
return currentList.get(0);
} else {
// 没有已选择的，则取最新注册的一条数据
@ -287,6 +291,9 @@ public class ResidentPatientInfoServiceImpl implements IResidentPatientInfoServi
// 更新选择标识
residentPatientInfoMapper.updateChecked(list.get(0).getPatientCode(), "1");
if(!StringUtils.isBlank(list.get(0).getDisease())) {
list.get(0).setDiseaseList(Arrays.asList(list.get(0).getDisease().split(",")));
}
list.get(0).setIsChecked("1");
return list.get(0);
}

10
xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/applet/service/impl/ResidentServiceApplyServiceImpl.java
View File

@ -287,8 +287,8 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
for (PerformanceDetailVo per : perList) {
sp = new ScreeningProjectVo();
sp.setSourceType("1");
sp.setDeptId(per.getOrgNo());
sp.setDeptName(per.getOrgName());
sp.setHospitalId(per.getOrgNo());
sp.setHospitalName(per.getOrgName());
sp.setPackageId(per.getPackageNo());
sp.setPackageName(per.getPackageName());
sp.setProjectId(per.getFormNo());
@ -315,15 +315,15 @@ public class ResidentServiceApplyServiceImpl implements IResidentServiceAppletSe
if(Hospital != null) {
// 获取筛查项目
ScreeningProject query = new ScreeningProject();
query.setHospitalId(String.valueOf(Hospital.getId()));
query.setHospitalId(Hospital.getId());
List<ScreeningProject> screeningProjectList = screeningProjectService.findList(query);
if(screeningProjectList != null && screeningProjectList.size() > 0) {
ScreeningProjectVo sp;
for(ScreeningProject project: screeningProjectList) {
sp = new ScreeningProjectVo();
sp.setSourceType("2");
sp.setDeptId(project.getHospitalId());
sp.setDeptName(project.getHospitalName());
sp.setHospitalId(String.valueOf(project.getHospitalId()));
sp.setHospitalName(project.getHospitalName());
sp.setProjectId(project.getProjectId());
sp.setProjectName(project.getProjectName());
sp.setPrice(project.getPrice());