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

pc端科室人员代码格式化

Browse Source
This commit is contained in:
zhangheng 2023-10-27 15:35:40 +08:00
parent 637e0ddfd5
commit 8000fbc1a1
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java
View File

@ -47,9 +47,9 @@ public class ResidentPatientInfoController extends BaseController {
@ApiOperation("注册完善信息") @ApiOperation("注册完善信息")
@PostMapping("") @PostMapping("")
public R<String> register(@Validated @RequestBody PatientInfoBody body) { public R<String> register(@Validated @RequestBody PatientInfoBody body) {
if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) { /*if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) {
return R.fail("请选择基础疾病"); return R.fail("请选择基础疾病");
} }*/
try { try {
residentPatientInfoService.register(body); residentPatientInfoService.register(body);
return R.ok(); return R.ok();

4
xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
View File

@ -183,6 +183,7 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
} }
if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getAreaCode())) { if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getAreaCode())) {
SysAreaVO codeName = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(patientDisease.getAreaCode()); SysAreaVO codeName = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(patientDisease.getAreaCode());
if (Objects.nonNull(codeName)) {
String provinceName = StringUtils.isBlank(codeName.getProvinceName()) ? "" : codeName.getProvinceName(); String provinceName = StringUtils.isBlank(codeName.getProvinceName()) ? "" : codeName.getProvinceName();
String cityName = StringUtils.isBlank(codeName.getCityName()) ? "" : codeName.getCityName(); String cityName = StringUtils.isBlank(codeName.getCityName()) ? "" : codeName.getCityName();
String regionName = StringUtils.isBlank(codeName.getRegionName()) ? "" : codeName.getRegionName(); String regionName = StringUtils.isBlank(codeName.getRegionName()) ? "" : codeName.getRegionName();
@ -191,6 +192,9 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
} else { } else {
patientDisease.setAreaName(""); patientDisease.setAreaName("");
} }
} else {
patientDisease.setAreaName("");
}
//查询所有商品订单 //查询所有商品订单
List<GoodsOrder> goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId); List<GoodsOrder> goodsOrders = nurseAppLoginMapper.selectGoodsOrderListByPatient(patientId);
if (CollectionUtils.isEmpty(goodsOrders)) { if (CollectionUtils.isEmpty(goodsOrders)) {

17
xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java
View File

@ -15,19 +15,13 @@ import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO; import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import java.util.List;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import javax.annotation.Resource;
import org.springframework.web.bind.annotation.PostMapping; import javax.servlet.http.HttpServletResponse;
import org.springframework.web.bind.annotation.RequestBody; import java.util.List;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/** /**
* 健康咨询-科室人员信息Controller * 健康咨询-科室人员信息Controller
@ -112,7 +106,6 @@ public class HospitalPersonInfoController extends BaseController {
/** /**
* 修改健康咨询-科室人员信息 * 修改健康咨询-科室人员信息
* @return
*/ */
@PostMapping("/update") @PostMapping("/update")
public AjaxResult update(@RequestBody HospitalPersonInfoDtoo hospitalPersonInfo) { public AjaxResult update(@RequestBody HospitalPersonInfoDtoo hospitalPersonInfo) {