From 0dec6fa672a7f1f71e7e85f15019eb6c805342ed Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 4 Jul 2024 15:05:02 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=90=8E?= =?UTF-8?q?=E5=BA=B7=E5=A4=8D=E5=88=86=E5=A8=A9=E6=96=B9=E5=BC=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/model/FactorProjectEntity.java | 9 +++++ .../service/impl/FactorProjectServiceImpl.java | 1 + .../platform/operate/web/facade/PatientFacade.java | 41 +++++++++++++++++++--- .../operate/web/result/PatientBaseResult.java | 11 ++++++ 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java index 86febb3..e9fa16f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FactorProjectEntity.java @@ -5,9 +5,18 @@ import java.util.List; public class FactorProjectEntity { private List riskFactorNames; private String week; + private String tips; private List healthItemList; private List riskItemList; + public String getTips() { + return tips; + } + + public void setTips(String tips) { + this.tips = tips; + } + public String getWeek() { return week; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java index d9ef013..631cd1f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/FactorProjectServiceImpl.java @@ -114,6 +114,7 @@ public class FactorProjectServiceImpl implements FactorProjectService { if (CollectionUtils.isNotEmpty(projectList)) { FactorProjectEntity factorProjectManage = new FactorProjectEntity(); factorProjectManage.setWeek(week); + factorProjectManage.setTips(projectList.get(0).getTips()); List healthList = new ArrayList<>(); List riskList = new ArrayList<>(); List riskFactorNames = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index d949047..66d1662 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -33,10 +33,7 @@ import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.DataPermissionsModelQuery; -import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.Transformer; import org.slf4j.Logger; @@ -3734,6 +3731,42 @@ public class PatientFacade extends BaseServiceImpl { patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), type, false, patientQueryRequest.getPid(), false); PatientBaseResult patientBaseResult = new PatientBaseResult(); if (null != patients) { + if (type==3){ + MatDeliverQuery deliverQuery=new MatDeliverQuery(); + deliverQuery.setYn(1); + deliverQuery.setParentId(patients.getId()); + List modelList=matDeliverService.query(deliverQuery); + + String deliveryMode = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(modelList.get(0).getDeliveryMode())) { + + StringBuilder sb = new StringBuilder(); + Map m = JsonUtil.str2Obj(modelList.get(0).getDeliveryMode(), Map.class); + String fmfs = null; + if (m != null) { + Object b = m.get("fmfs"); + if (b != null) { + fmfs = b.toString(); + if (fmfs != null) { + if (fmfs.equals("1")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + sb.append(fmName); + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { + sb.append(","); + String scfs = m.get("scfs").toString(); + sb.append(FmTypeEnums.getFmScNameById(scfs)); + } + deliveryMode = sb.toString(); + } else if (fmfs.equals("2")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + deliveryMode = fmName; + } + } + } + } + } + patients.setFmType(deliveryMode); + } patientBaseResult.convert(patients); } try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index cbcbb8e..f1f946e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -69,6 +69,15 @@ public class PatientBaseResult { private String bmi; //户籍地址 private String maddress; + private String deliveryMode; + + public String getDeliveryMode() { + return deliveryMode; + } + + public void setDeliveryMode(String deliveryMode) { + this.deliveryMode = deliveryMode; + } public String getMaddress() { return maddress; @@ -284,8 +293,10 @@ public class PatientBaseResult { if (null != patients.getFmDate()) { //1 孕妇 0 产妇 setIsGravida("0"); + setDeliveryMode(patients.getFmType()); } else { setIsGravida("1"); + } setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth())); -- 1.8.3.1