From a74dd8e6dab431634a6f538bdfcfb4fdf42a8c96 Mon Sep 17 00:00:00 2001 From: shiyang Date: Thu, 26 Aug 2021 13:56:39 +0800 Subject: [PATCH] update --- .../lyms/platform/common/enums/FmTypeEnums.java | 43 ++++++++++++++++++++++ .../lyms/platform/pojo/MaternalDeliverModel.java | 13 +++++++ .../main/java/com/lyms/platform/pojo/Patients.java | 15 ++++++++ .../operate/web/facade/MatDeliverFacade.java | 9 +++++ .../platform/operate/web/facade/ViewFacade.java | 6 +++ .../operate/web/request/MatDeliverAddRequest.java | 17 +++++++++ .../operate/web/result/MaternalDeliverResult.java | 19 ++++++++++ 7 files changed, 122 insertions(+) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java index 83f60df..6154266 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java @@ -226,4 +226,47 @@ public enum FmTypeEnums { this.name = name; } } + + public enum FmCesareanTimeType{ + + a("1", "首次抛宫产"), + b("2", "二次分娩首次抛宫产"), + c("3", "二次抛宫产"), + d("4", "三次抛宫产"); + + + FmCesareanTimeType(String id, String name) { + this.id = id; + this.name = name; + } + + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + } + public static String getFmCesareanTimeType(String id) + { + for (FmCesareanTimeType e : FmCesareanTimeType.values()) { + if (e.getId().equals(id)) + { + return e.getName(); + } + } + return null; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 3fa2958..4145460 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -2476,4 +2476,17 @@ public class MaternalDeliverModel extends BaseModel { public void setGjOther(String gjOther) { this.gjOther = gjOther; } + /**抛宫产次数类型 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 + */ + private Integer cesareanTimeType; + + public Integer getCesareanTimeType() { + return cesareanTimeType; + } + + public void setCesareanTimeType(Integer cesareanTimeType) { + this.cesareanTimeType = cesareanTimeType; + } + /****************************************************/ } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 2baebf7..eac2019 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -410,6 +410,21 @@ public class Patients extends BaseModel { //初诊时间 private Date firstCheckTime; + /**抛宫产次数类型 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产 + */ + private Integer cesareanTimeType; + + public Integer getCesareanTimeType() { + return cesareanTimeType; + } + + public void setCesareanTimeType(Integer cesareanTimeType) { + this.cesareanTimeType = cesareanTimeType; + } + + /****************************************************/ + public String getIsYyzyfmHospital() { return isYyzyfmHospital; } 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 9e0c545..1a27081 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 @@ -30,6 +30,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; +import com.mchange.lang.IntegerUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.Transformer; @@ -294,6 +295,10 @@ public class MatDeliverFacade { } } Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId()); + //分娩类型是抛宫产-分娩次数类型 + if(null!=maternalDeliverModel.getCesareanTimeType()){ + patients2.setCesareanTimeType(maternalDeliverModel.getCesareanTimeType()); + } //增加 if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) { MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); @@ -577,6 +582,10 @@ public class MatDeliverFacade { System.out.println(patients1.getId() + "：这条数据的末日月经和分娩时间异常"); // 跳过 } + //分娩类型是抛宫产-分娩次数类型 + if(null!=maternalDeliverModel.getCesareanTimeType()){ + patients1.setCesareanTimeType(maternalDeliverModel.getCesareanTimeType()); + } // HuJiaqi添加结束 patientsService.updatePatient(patients1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 3c0d2b6..c5c2be4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4007,6 +4007,12 @@ public class ViewFacade { map.put("operationCause", data.getOperationCause() == null ? "--" : data.getOperationCause()); } + //抛宫产次数类型-展示页面 + String cesareanTimeType = ""; + if(null!=data.getCesareanTimeType()){ + cesareanTimeType=FmTypeEnums.getFmCesareanTimeType(data.getCesareanTimeType().toString()); + } + map.put("cesareanTimeType",StringUtils.isNotEmpty(cesareanTimeType)?cesareanTimeType:null); findProcess(data.getProdprocess(), map);//1,2,3产程 findTotalProcess(data.getTotalprocess(), map);//总产程 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java index a80e260..0a17f61 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java @@ -440,6 +440,19 @@ public class MatDeliverAddRequest implements IBasicRequestConvert