diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 36ce8b4..8029ed3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -53,10 +53,12 @@ public class SieveFacade { * @return */ public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest,Integer userId) { + SieveResultModel sieveResultModel =sieveAddRequest.convertToDataModel(); + sieveService.addSieve(sieveResultModel); - sieveService.addSieve(sieveAddRequest.convertToDataModel()); SieveQuery sieveQuery=new SieveQuery(); sieveQuery.setParentId(sieveAddRequest.getParentId()); + sieveQuery.setYn(YnEnums.YES.getId()); String hospitalId = autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); List list = sieveService.queryList(sieveQuery); @@ -64,6 +66,7 @@ public class SieveFacade { sieveModel.setStatus(3); sieveModel.setId(list.get(0).getId()); sieveModel.setHospitalId(hospitalId); + sieveModel.setZtfx(sieveAddRequest.getMax()); sieveService.updateOneChanQianDiaSieve(sieveModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index ab0326d..9fbbb2b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -4,6 +4,10 @@ import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.pojo.SieveModel; import com.lyms.platform.pojo.SieveResultModel; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** * 增加产筛结果 * @@ -106,4 +110,21 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.setPublishName(publishName); return sieveModel; } + public Integer getMax(){ + List list =new ArrayList<>(); + + if(null!=tszhz){ + list.add(Integer.valueOf(tszhz)); + } + if(null!=sjgjx){ + list.add(Integer.valueOf(sjgjx)); + } + if(null!=sbst){ + list.add(Integer.valueOf(sbst)); + } + if(null!=dzhpx){ + list.add(Integer.valueOf(dzhpx)); + } + return Collections.max(list); + } }