diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index 784c0d4..28da401 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -184,7 +184,8 @@ public class AntenatalExaminationController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/antex") @ResponseBody @TokenRequired - public BaseResponse findOneAntById(@Valid AntExQueryRequest antExQueryRequest) { + public BaseResponse findOneAntById(@Valid AntExQueryRequest antExQueryRequest, HttpServletRequest request) { + antExQueryRequest.setUserId(getUserId(request)); return antenatalExaminationFacade.findOneAntExById(antExQueryRequest); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 1e5d5d4..602dcaa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -1,10 +1,12 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.SequenceConstant; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; @@ -26,6 +28,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import org.springframework.util.StopWatch; @@ -81,6 +86,8 @@ public class AntenatalExaminationFacade { private DischargeAbstractMotherService dischargeAbstractMotherService; @Autowired private MongoUtil mongoUtil; + @Autowired + private MongoTemplate mongoTemplate; /** * 处理区域隐藏建档 @@ -2069,6 +2076,8 @@ public class AntenatalExaminationFacade { */ public BaseResponse findOneAntExById(AntExQueryRequest antExQueryRequest) { Object object = null; + Integer userId = antExQueryRequest.getUserId(); + List configModele = mongoTemplate.find(Query.query(Criteria.where("yn").ne("0").and("userId").is(userId).and("type").is(SequenceConstant.CUSTOM_TYPE)).with(new Sort(Sort.Direction.DESC,"createDate")), PlantformConfigModel.class); //复诊 if ("1".equals(antExQueryRequest.getType())) { AntenatalExaminationModel examinationModel = antenatalExaminationService.findOneById(antExQueryRequest.getId()); @@ -2113,7 +2122,6 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setCheckDoctor(map1); } - antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types()); Map> treatmentOpinion2 = examinationModel.getTreatmentOpinion2(); Map>> restTreatmentOpinion2 = new HashMap<>(); @@ -2128,6 +2136,7 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types()); antenatalExaminationResult.setQuicken(examinationModel.getQuicken()); antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark()); + antenatalExaminationResult.setmHighRiskReason(configModele); antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId())); antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1); @@ -2192,6 +2201,7 @@ public class AntenatalExaminationFacade { antexChuResult.setTreatmentOpinion2Types(antExChuModel.getTreatmentOpinion2Types()); antexChuResult.setQuicken(antExChuModel.getQuicken()); antexChuResult.setQuickenRemark(antExChuModel.getQuickenRemark()); + antexChuResult.setmHighRiskReason(configModele); object = antexChuResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExQueryRequest.java index 3b0d669..5200ad4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExQueryRequest.java @@ -17,6 +17,9 @@ public class AntExQueryRequest { @FormParam @NotEmpty(message = "id不能为空.") private String id; + + private Integer userId; + //1是复诊 0 是初诊 @FormParam @Pattern(regexp = "^[0|1]$",message = "type 只能为0或者1") @@ -37,4 +40,12 @@ public class AntExQueryRequest { public void setType(String type) { this.type = type; } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index abe1a8e..2948607 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -15,6 +15,8 @@ import java.util.Map; */ public class AntenatalExaminationResult implements IBasicResultConvert { + private List mHighRiskReason; + /** 处理意见 */ private Map>> treatmentOpinion2; private List treatmentOpinion2Types; @@ -23,6 +25,14 @@ public class AntenatalExaminationResult implements IBasicResultConvert>> treatmentOpinion2; private List treatmentOpinion2Types;