diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/VisitStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/VisitStatusEnums.java index 6a84d1a..83171c3 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/VisitStatusEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/VisitStatusEnums.java @@ -8,7 +8,7 @@ package com.lyms.platform.common.enums; */ public enum VisitStatusEnums { - VISITED(1,"已访视"),UNVISIT(2,"未访视"); + VISITED(1,"已访视"),UNVISIT(0,"未访视"); private VisitStatusEnums(int id,String title){ this.id=id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index 3931433..67d3916 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -281,20 +281,16 @@ public class OrganizationController extends BaseController { return frontEndResult; } - private Map convert(Organization organization){ - Map map = new HashMap<>(); - map.put("id",organization.getId()); - map.put("name",organization.getName()); - map.put("areaId",organization.getAreaId()); - map.put("area",organization.getArea()); - map.put("city",organization.getCity()); - map.put("cityId",organization.getCityId()); - map.put("province",organization.getProvince()); - map.put("provinceId",organization.getProvinceId()); - return map; - } - @RequestMapping("/") - public void build(){ - + private Map convert(Organization organization) { + Map map = new HashMap<>(); + map.put("id", organization.getId()); + map.put("name", organization.getName()); + map.put("areaId", organization.getAreaId()); + map.put("area", organization.getArea()); + map.put("city", organization.getCity()); + map.put("cityId", organization.getCityId()); + map.put("province", organization.getProvince()); + map.put("provinceId", organization.getProvinceId()); + return map; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 280f414..ee32ae4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.VisitStatusEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -164,7 +165,7 @@ public class VisitFacade { patients.setId(null); patients.setCreated(new Date()); patients.setModified(new Date()); - patients.setIsVisit(0); + patients.setIsVisit(VisitStatusEnums.UNVISIT.getId()); parentId = patientsService.addPatient(patients).getId(); } @@ -185,7 +186,7 @@ public class VisitFacade { } Patients patients = new Patients(); patients.setId(parentId); - patients.setIsVisit(1); + patients.setIsVisit(VisitStatusEnums.VISITED.getId()); patients.setModified(new Date()); patientsService.updatePatient(patients); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -220,7 +221,7 @@ public class VisitFacade { if (CollectionUtils.isNotEmpty(patientses)) { babyModel.setParentId(patientses.get(0).getId()); } - babyModel.setVisitstatus(0); + babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId()); babyId = babyService.addOneBaby(babyModel).getId(); } else { //修改小孩基本信息 @@ -237,7 +238,7 @@ public class VisitFacade { //添加成功后修改新生儿的访视状态 BabyModel babyModel = new BabyModel(); babyModel.setId(babyId); - babyModel.setVisitstatus(1); + babyModel.setVisitstatus(VisitStatusEnums.VISITED.getId()); babyService.updateOneBaby(babyModel, babyId); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java index bdb7377..8abedf3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BabyModel; @@ -759,7 +760,7 @@ public class BabyVisitAddRequest implements IBasicRequestConvert public BabyModel getBabyModel() { BabyModel babyModel = new BabyModel(); babyModel.setSex(sex); - babyModel.setYn(1); + babyModel.setYn(YnEnums.YES.getId()); babyModel.setAddress(address); babyModel.setName(name); babyModel.setAreaId(areaId);