diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 0237390..5392f9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -1063,92 +1063,174 @@ public class MatDeliverFacade { childbirthManagerQueryModel.setPatientId(patients.getId()); childbirthManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId()); // 居住地 - childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + if (childbirthManagerRequest.getInitQuery().contains("address")) { + childbirthManagerQueryModel.setAddress(CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService)); + } // 电话转换 childbirthManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); childbirthManagerQueryModel.setHusbandPhone(DefenceUtils.getPhone(patients.getHusbandPhone())); // 加密身份证号 childbirthManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo())); // 查询分娩方式 - String deliveryModeJson = maternalDeliverModel.getDeliveryMode(); - Map deliveryModeMap = JsonUtil.getMap(deliveryModeJson); - if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) { - for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) { - if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) { - childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName()); - break; + if (childbirthManagerRequest.getInitQuery().contains("deliveryMode")) { + String deliveryModeJson = maternalDeliverModel.getDeliveryMode(); + Map deliveryModeMap = JsonUtil.getMap(deliveryModeJson); + if (MapUtils.isNotEmpty(deliveryModeMap) && StringUtils.isNotEmpty(deliveryModeMap.get("fmfs"))) { + for (FmTypeEnums fmTypeEnums : FmTypeEnums.values()) { + if (fmTypeEnums.getId().equals(deliveryModeMap.get("fmfs"))) { + childbirthManagerQueryModel.setDeliveryMode(fmTypeEnums.getName()); + break; + } } + } else { + childbirthManagerQueryModel.setDeliveryMode(""); } - } else { - childbirthManagerQueryModel.setDeliveryMode(""); } // 产妇情况 - if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) { - for (CfEnums cfEnums : CfEnums.values()) { - if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) { - childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName()); - break; + if (childbirthManagerRequest.getInitQuery().contains("maternalInfo")) { + if (StringUtils.isNotBlank(maternalDeliverModel.getMaternalInfo())) { + for (CfEnums cfEnums : CfEnums.values()) { + if (cfEnums.getId().equals(maternalDeliverModel.getMaternalInfo())) { + childbirthManagerQueryModel.setMaternalInfo(cfEnums.getName()); + break; + } } } } // 查询接生医生 try { - childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName()); + if (childbirthManagerRequest.getInitQuery().contains("deliverDoctor")) { + childbirthManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName()); + } } catch (Exception e) { // 什么都不干，这么干是为了避开原始数据的问题 } childbirthManagerQueryModel.setAge(DateUtil.getAge(patients.getBirth())); // 查询活产数 - BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setParentId(patients.getId()); - babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); - List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); - if (CollectionUtils.isNotEmpty(babyModelList)) { - childbirthManagerQueryModel.setLivingNumber(babyModelList.size()); - }else{ - childbirthManagerQueryModel.setLivingNumber(0); + if (childbirthManagerRequest.getInitQuery().contains("livingNumber")) { + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setParentId(patients.getId()); + babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); + List babyModelList = babyService.queryBabyWithQuery(babyModelQuery); + if (CollectionUtils.isNotEmpty(babyModelList)) { + childbirthManagerQueryModel.setLivingNumber(babyModelList.size()); + } else { + childbirthManagerQueryModel.setLivingNumber(0); + } + + // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形 + if (childbirthManagerRequest.getInitQuery().contains("pregnancyOut") || childbirthManagerRequest.getInitQuery().contains("sex") || childbirthManagerRequest.getInitQuery().contains("babyWeight") || childbirthManagerRequest.getInitQuery().contains("babyHeight") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf1") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf5") || childbirthManagerRequest.getInitQuery().contains("apgarScorePf10") || childbirthManagerRequest.getInitQuery().contains("asphyxiaM") || childbirthManagerRequest.getInitQuery().contains("babyHealthy") || childbirthManagerRequest.getInitQuery().contains("malformation")) { + if (CollectionUtils.isNotEmpty(babyModelList)) { + String pregnancyOut = ""; + String sex = ""; + String babyWeight = ""; + String babyHeight = ""; + String apgarScorePf1 = ""; + String apgarScorePf5 = ""; + String apgarScorePf10 = ""; + String asphyxiaM = ""; + String babyHealthy = ""; + String malformation = ""; + try { + for (BabyModel babyModel : babyModelList) { + if (childbirthManagerRequest.getInitQuery().contains("pregnancyOut")) { + for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) { + if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) { + pregnancyOut += renShenJieJuEnums.getName() + ","; + break; + } + } + } + if (childbirthManagerRequest.getInitQuery().contains("sex")) { + for (SexEnum sexEnum : SexEnum.values()) { + if (sexEnum.getId().equals(babyModel.getSex())) { + sex += sexEnum.getText() + ","; + break; + } + } + } + babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ","; + babyHeight += babyModel.getBabyHeight() == null ? "" : babyModel.getBabyHeight() + ","; + asphyxiaM += babyModel.getAsphyxiaM() == null ? "" : babyModel.getAsphyxiaM() + ","; + babyHealthy += babyModel.getBabyHealthy() == null ? "" : babyModel.getBabyHealthy() + ","; + malformation += babyModel.getMalformation() == null ? "" : babyModel.getMalformation() + ","; + Map map = JsonUtil.getMap(babyModel.getApgarScore()); + if (MapUtils.isNotEmpty(map)) { + apgarScorePf1 += map.get("pf1") == null ? "" : map.get("pf1") + ","; + apgarScorePf5 += map.get("pf5") == null ? "" : map.get("pf5") + ","; + apgarScorePf10 += map.get("pf10") == null ? "" : map.get("pf10") + ","; + } + } + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 + } + childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1)); + childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1)); + childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1)); + childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1)); + childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1)); + childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1)); + childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1)); + childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1)); + childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1)); + childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1)); + } + } + try { + if (childbirthManagerRequest.getInitQuery().contains("fmHospital")) { + childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName()); + } + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 + } + } // 开始拼装自定义查询结果 // 胎方位，胎心率，胎先露 - // 这个泛型不会出错，传入的就是这个 - @SuppressWarnings("unchecked") - List placentaList = maternalDeliverModel.getPlacentas(); - if (CollectionUtils.isNotEmpty(placentaList)) { - String fetalPosition = ""; - String heartRate = ""; - String fetalPresentation = ""; - for (Object obj : placentaList) { - if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) { - MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj; - for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { - if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) { - fetalPosition += fetalPositionEnums.getName() + ","; - break; + if (childbirthManagerRequest.getInitQuery().contains("fetalPosition") || childbirthManagerRequest.getInitQuery().contains("heartRate") || childbirthManagerRequest.getInitQuery().contains("fetalPresentation")) { + // 这个泛型不会出错，传入的就是这个 + @SuppressWarnings("unchecked") + List placentaList = maternalDeliverModel.getPlacentas(); + if (CollectionUtils.isNotEmpty(placentaList)) { + String fetalPosition = ""; + String heartRate = ""; + String fetalPresentation = ""; + for (Object obj : placentaList) { + if ("com.lyms.platform.operate.web.request.MatDeliverAddRequest$Placenta".equals(obj.getClass().getName())) { + MatDeliverAddRequest.Placenta placenta = (MatDeliverAddRequest.Placenta) obj; + if (childbirthManagerRequest.getInitQuery().contains("fetalPosition")) { + for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { + if (fetalPositionEnums.getId().equals(placenta.getFetalPosition())) { + fetalPosition += fetalPositionEnums.getName() + ","; + break; + } + } } + heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ","; + fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ","; } - heartRate += placenta.getHeartRate() == null ? "" : placenta.getHeartRate().toString() + ","; - fetalPresentation += placenta.getFetalPresentation() == null ? "" : placenta.getFetalPresentation() + ","; - } - if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { - Map placenta = JsonUtil.getMap(obj.toString()); - if (MapUtils.isNotEmpty(placenta)) { - for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { - if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) { - fetalPosition += fetalPositionEnums.getName() + ","; - break; + if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) { + Map placenta = JsonUtil.getMap(obj.toString()); + if (childbirthManagerRequest.getInitQuery().contains("fetalPosition")) { + if (MapUtils.isNotEmpty(placenta)) { + for (FetalPositionEnums fetalPositionEnums : FetalPositionEnums.values()) { + if (fetalPositionEnums.getId().equals(placenta.get("fetalPosition"))) { + fetalPosition += fetalPositionEnums.getName() + ","; + break; + } + } + heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ","; + fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation") + ","; } } - heartRate += placenta.get("heartRate") == null ? "" : placenta.get("heartRate") + ","; - fetalPresentation += placenta.get("fetalPresentation") == null ? "" : placenta.get("fetalPresentation") + ","; } } + childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1)); + childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1)); + childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1)); } - - childbirthManagerQueryModel.setFetalPosition(fetalPosition.length() == 0 ? "" : fetalPosition.substring(0, fetalPosition.length() - 1)); - childbirthManagerQueryModel.setHeartRate(heartRate.length() == 0 ? "" : heartRate.substring(0, heartRate.length() - 1)); - childbirthManagerQueryModel.setFetalPresentation(fetalPresentation.length() == 0 ? "" : fetalPresentation.substring(0, fetalPresentation.length() - 1)); } // 第一产程，第二产程，第三产程 Map> prodprocessMap = JsonUtil.getDoubleMap(maternalDeliverModel.getProdprocess()); @@ -1178,94 +1260,41 @@ public class MatDeliverFacade { childbirthManagerQueryModel.setChBpSzy1(chBpMap.get("szy")); } // 胎盘娩出方式，胎盘大小，胎盘重量，脐带长度，脐带是否异常，脐带异常类型 - List extPlacentaList = maternalDeliverModel.getExtPlacentas(); - if (CollectionUtils.isNotEmpty(extPlacentaList)) { - String tpmcType = ""; - String tpSize = ""; - String tpWeight = ""; - String umbilicalCordLength = ""; - String umbilicalCordEx = ""; - String umbilicalCordExType = ""; - try { - for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) { - for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) { - if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) { - tpmcType += tpmcTypeEnums.getName() + ","; - break; - } - } - tpSize += extPlacenta.getTpSize() == null ? "" : extPlacenta.getTpSize() + ","; - tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ","; - umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ","; - umbilicalCordEx += extPlacenta.getUmbilicalCordEx() == null ? "" : extPlacenta.getUmbilicalCordEx() + ","; - umbilicalCordExType += extPlacenta.getUmbilicalCordExType() == null ? "" : extPlacenta.getUmbilicalCordExType() + ","; - } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 - } - childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1)); - childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1)); - childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1)); - childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1)); - childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1)); - childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1)); - } - // 妊娠结局，儿童性别，儿童体重，儿童身长，Apgar1分钟，Apgar5分钟，Apgar10分钟，窒息分钟数，新生儿疾病，畸形 - if (CollectionUtils.isNotEmpty(babyModelList)) { - String pregnancyOut = ""; - String sex = ""; - String babyWeight = ""; - String babyHeight = ""; - String apgarScorePf1 = ""; - String apgarScorePf5 = ""; - String apgarScorePf10 = ""; - String asphyxiaM = ""; - String babyHealthy = ""; - String malformation = ""; - try { - for (BabyModel babyModel : babyModelList) { - for (RenShenJieJuEnums renShenJieJuEnums : RenShenJieJuEnums.values()) { - if (renShenJieJuEnums.getId().equals(babyModel.getPregnancyOut())) { - pregnancyOut += renShenJieJuEnums.getName() + ","; - break; - } - } - for (SexEnum sexEnum : SexEnum.values()) { - if (sexEnum.getId().equals(babyModel.getSex())) { - sex += sexEnum.getText() + ","; - break; + if (childbirthManagerRequest.getInitQuery().contains("tpmcType") || childbirthManagerRequest.getInitQuery().contains("tpSize") || childbirthManagerRequest.getInitQuery().contains("tpWeight") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordLength") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordEx") || childbirthManagerRequest.getInitQuery().contains("umbilicalCordExType")) { + List extPlacentaList = maternalDeliverModel.getExtPlacentas(); + if (CollectionUtils.isNotEmpty(extPlacentaList)) { + String tpmcType = ""; + String tpSize = ""; + String tpWeight = ""; + String umbilicalCordLength = ""; + String umbilicalCordEx = ""; + String umbilicalCordExType = ""; + try { + for (MaternalDeliverModel.ExtPlacenta extPlacenta : extPlacentaList) { + if (childbirthManagerRequest.getInitQuery().contains("tpmcType")) { + for (TpmcTypeEnums tpmcTypeEnums : TpmcTypeEnums.values()) { + if (tpmcTypeEnums.getId().equals(extPlacenta.getTpmcType())) { + tpmcType += tpmcTypeEnums.getName() + ","; + break; + } + } } + tpSize += extPlacenta.getTpSize() == null ? "" : extPlacenta.getTpSize() + ","; + tpWeight += extPlacenta.getTpWeight() == null ? "" : extPlacenta.getTpWeight() + ","; + umbilicalCordLength += extPlacenta.getUmbilicalCordLength() == null ? "" : extPlacenta.getUmbilicalCordLength() + ","; + umbilicalCordEx += extPlacenta.getUmbilicalCordEx() == null ? "" : extPlacenta.getUmbilicalCordEx() + ","; + umbilicalCordExType += extPlacenta.getUmbilicalCordExType() == null ? "" : extPlacenta.getUmbilicalCordExType() + ","; } - babyWeight += babyModel.getBabyWeight() == null ? "" : babyModel.getBabyWeight() + ","; - babyHeight += babyModel.getBabyHeight() == null ? "" : babyModel.getBabyHeight() + ","; - asphyxiaM += babyModel.getAsphyxiaM() == null ? "" : babyModel.getAsphyxiaM() + ","; - babyHealthy += babyModel.getBabyHealthy() == null ? "" : babyModel.getBabyHealthy() + ","; - malformation += babyModel.getMalformation() == null ? "" : babyModel.getMalformation() + ","; - Map map = JsonUtil.getMap(babyModel.getApgarScore()); - if (MapUtils.isNotEmpty(map)) { - apgarScorePf1 += map.get("pf1") == null ? "" : map.get("pf1") + ","; - apgarScorePf5 += map.get("pf5") == null ? "" : map.get("pf5") + ","; - apgarScorePf10 += map.get("pf10") == null ? "" : map.get("pf10") + ","; - } + } catch (Exception e) { + // 什么都不干，这么干是为了避开原始数据的问题 } - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 + childbirthManagerQueryModel.setTpmcType(tpmcType.length() == 0 ? "" : tpmcType.substring(0, tpmcType.length() - 1)); + childbirthManagerQueryModel.setTpSize(tpSize.length() == 0 ? "" : tpSize.substring(0, tpSize.length() - 1)); + childbirthManagerQueryModel.setTpWeight(tpWeight.length() == 0 ? "" : tpWeight.substring(0, tpWeight.length() - 1)); + childbirthManagerQueryModel.setUmbilicalCordLength(umbilicalCordLength.length() == 0 ? "" : umbilicalCordLength.substring(0, umbilicalCordLength.length() - 1)); + childbirthManagerQueryModel.setUmbilicalCordEx(umbilicalCordEx.length() == 0 ? "" : umbilicalCordEx.substring(0, umbilicalCordEx.length() - 1)); + childbirthManagerQueryModel.setUmbilicalCordExType(umbilicalCordExType.length() == 0 ? "" : umbilicalCordExType.substring(0, umbilicalCordExType.length() - 1)); } - childbirthManagerQueryModel.setPregnancyOut(pregnancyOut.length() == 0 ? "" : pregnancyOut.substring(0, pregnancyOut.length() - 1)); - childbirthManagerQueryModel.setSex(sex.length() == 0 ? "" : sex.substring(0, sex.length() - 1)); - childbirthManagerQueryModel.setBabyWeight(babyWeight.length() == 0 ? "" : babyWeight.substring(0, babyWeight.length() - 1)); - childbirthManagerQueryModel.setBabyHeight(babyHeight.length() == 0 ? "" : babyHeight.substring(0, babyHeight.length() - 1)); - childbirthManagerQueryModel.setApgarScorePf1(apgarScorePf1.length() == 0 ? "" : apgarScorePf1.substring(0, apgarScorePf1.length() - 1)); - childbirthManagerQueryModel.setApgarScorePf5(apgarScorePf5.length() == 0 ? "" : apgarScorePf5.substring(0, apgarScorePf5.length() - 1)); - childbirthManagerQueryModel.setApgarScorePf10(apgarScorePf10.length() == 0 ? "" : apgarScorePf10.substring(0, apgarScorePf10.length() - 1)); - childbirthManagerQueryModel.setAsphyxiaM(asphyxiaM.length() == 0 ? "" : asphyxiaM.substring(0, asphyxiaM.length() - 1)); - childbirthManagerQueryModel.setBabyHealthy(babyHealthy.length() == 0 ? "" : babyHealthy.substring(0, babyHealthy.length() - 1)); - childbirthManagerQueryModel.setMalformation(malformation.length() == 0 ? "" : malformation.substring(0, malformation.length() - 1)); - } - try { - childbirthManagerQueryModel.setFmHospital(organizationService.getOrganization(Integer.valueOf(maternalDeliverModel.getFmHospital())).getName()); - } catch (Exception e) { - // 什么都不干，这么干是为了避开原始数据的问题 } // 拼装自定义查询结果结束 @@ -1296,6 +1325,7 @@ public class MatDeliverFacade { } } babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType()); + babyModelQuery.setParentId(StringUtils.isEmpty(newBabyManagerRequest.getPatientId()) ? null : newBabyManagerRequest.getPatientId()); if (!newBabyManagerRequest.isExcel()) { babyModelQuery.setPage(newBabyManagerRequest.getPage()); babyModelQuery.setLimit(newBabyManagerRequest.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java index 5d950b2..21805c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java @@ -32,6 +32,16 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { private Integer operatorId; + private String patientId; + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + public boolean isExcel() { return isExcel; }