From 39946cd6b5be884ec475373eb71b4709648cd2a7 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Wed, 22 May 2019 14:43:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=AD=97=E6=AE=B5=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/PostpartumRecordsEnums.java | 34 +++++++++------- .../lyms/platform/pojo/MaternalDeliverModel.java | 43 +++++++++++++++++--- .../platform/operate/web/facade/ViewFacade.java | 35 ++++++++++++++-- .../operate/web/request/MatDeliverAddRequest.java | 46 ++++++++++++++++++---- 4 files changed, 126 insertions(+), 32 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumRecordsEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumRecordsEnums.java index 03b9a36..99d3321 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumRecordsEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumRecordsEnums.java @@ -4,25 +4,29 @@ package com.lyms.platform.common.enums; * Created by Administrator on 2019/1/14. */ public enum PostpartumRecordsEnums { - O("给缩宫素20U入余液体静滴，行心电监护，按摩子宫。","2"), - O1("新生儿置母亲腹部进行全裸皮肤接触。","3"), - O2("观察新生儿肤色红润，正在吸吮。","4"), - O3("按摩子宫质硬。","5"), - O4("向病人交待伤口注意事项，同时指导产妇与家属学习母乳喂养技巧。","6"), - O5("已母婴皮肤接触并吸吮90分钟。","7"), - O6("内诊、肛查无异常，遵医嘱停液体，母婴安返病区。","8"); - - private PostpartumRecordsEnums(String name, String id){ - this.id=id; - this.name=name; + O("给缩宫素20U入余液体静滴，行心电监护，按摩子宫。", "2"), + O1("新生儿置母亲腹部进行全裸皮肤接触。", "3"), + O2("观察新生儿肤色红润，正在吸吮。", "4"), + O3("按摩子宫质硬。", "5"), + O4("向病人交待伤口注意事项，同时指导产妇与家属学习母乳喂养技巧。", "6"), + O5("已母婴皮肤接触并吸吮90分钟。", "7"), + O6("内诊、肛查无异常，遵医嘱停液体，母婴安返病区。", "8"), + O7("向产妇交代产后注意事项，，同时指导产妇母乳喂养技巧，宣教母乳喂养知识。", "9"), + O8("按摩子宫质硬，内诊无异常，累计出血量300ml。", "10"), + O9("停心电监护。", "11"), + O10("停止皮肤接触及早吸吮。", "12"); + + private PostpartumRecordsEnums(String name, String id) { + this.id = id; + this.name = name; } - public static String getTitles(String id){ - if (id==null){ + public static String getTitles(String id) { + if (id == null) { return ""; } - for (CfEnums cfEnums:CfEnums.values()){ - if (id.equals(cfEnums.getId())){ + for (CfEnums cfEnums : CfEnums.values()) { + if (id.equals(cfEnums.getId())) { return cfEnums.getName(); } } 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 dd2048b..2bf7a5f 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 @@ -120,6 +120,10 @@ public class MaternalDeliverModel extends BaseModel { private String fsHospital; //接生医生 private String deliverDoctor; + + //督导医生 + private String supervisorDoctor; + private Integer yn; private Date created; private Date modified; @@ -167,6 +171,14 @@ public class MaternalDeliverModel extends BaseModel { private List fmChildTimes; + public String getSupervisorDoctor() { + return supervisorDoctor; + } + + public void setSupervisorDoctor(String supervisorDoctor) { + this.supervisorDoctor = supervisorDoctor; + } + public Integer getFmAge() { return fmAge; } @@ -538,10 +550,31 @@ public class MaternalDeliverModel extends BaseModel { private String cjfy;//刺激反应 private String zl;//张力 + /*********201905计划威海妇幼新增字段*********/ + + private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他 + private String otherInfo; + public Baby() { } + public String getBabyQX() { + return babyQX; + } + + public void setBabyQX(String babyQX) { + this.babyQX = babyQX; + } + + public String getOtherInfo() { + return otherInfo; + } + + public void setOtherInfo(String otherInfo) { + this.otherInfo = otherInfo; + } + public String getHx() { return hx; } @@ -1901,7 +1934,7 @@ public class MaternalDeliverModel extends BaseModel { /*******威海再再次新增字段（201905月计划中）*******/ private String comment;//指正 任意输入 - private String AFV;// 羊水量 ml + private String afv;// 羊水量 ml private Date parturientTime; //临产时间 private String vaginaBloodAmount;//阴道出血量 @@ -1913,12 +1946,12 @@ public class MaternalDeliverModel extends BaseModel { this.comment = comment; } - public String getAFV() { - return AFV; + public String getAfv() { + return afv; } - public void setAFV(String AFV) { - this.AFV = AFV; + public void setAfv(String afv) { + this.afv = afv; } public Date getParturientTime() { 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 3b1ae28..0cf1b41 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 @@ -2768,6 +2768,14 @@ public class ViewFacade { map.put("zypbfm", data.getZypbfm()); map.put("totalOneCxl", data.getTotalOneCxl()); map.put("xsebz", data.getXsebz()); + /* private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他 + private String otherInfo;*/ + + /*******威海再再次新增字段（201905月计划中）*******/ + + map.put("comment", data.getComment()); + map.put("afv", data.getAfv()); + map.put("parturientTime", DateUtil.getyyyy_MM_dd_hms(data.getParturientTime())); /* 产后生理 */ @@ -2823,7 +2831,6 @@ public class ViewFacade { map.put("tHloseBloodL", UnitUtils.unitSplice(data.gettHloseBloodL(), UnitConstants.ML)); map.put("rHloseBloodL", UnitUtils.unitSplice(data.getrHloseBloodL(), UnitConstants.ML)); map.put("sHloseBloodL", UnitUtils.unitSplice(data.getsHloseBloodL(), UnitConstants.ML)); - String loseBloodCause = ""; if (StringUtils.isNotEmpty(data.getLoseBloodCause())) { String loseBloodCauseJson = data.getLoseBloodCause(); @@ -2878,7 +2885,6 @@ public class ViewFacade { extMap.put("tpSizeList", sizeMap); } extMap.put("tpSize", tpSize); - extMap.put("tpWeight", UnitUtils.unitSplice(temp.getTpWeight(), UnitConstants.G)); extMap.put("umbilicalCordLength", UnitUtils.unitSplice(temp.getUmbilicalCordLength(), UnitConstants.CM)); @@ -2968,8 +2974,11 @@ public class ViewFacade { babyMap.put("jxTszh", temp.isJxTszh()); babyMap.put("jxXtx", temp.isJxXtx()); babyMap.put("jxOther", temp.getJxOther()); - - + /***威海市妇幼加字段***/ + babyMap.put("babyQX", temp.getBabyQX()); + if ("4".equals(temp.getBabyQX())) { + babyMap.put("otherInfo", temp.getOtherInfo()); + } babyMap.put("babyId", temp.getId()); babyMap.put("dueTime", temp.getDueTime()); babyMap.put("pregnancyOut", temp.getPregnancyOut() == null ? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut())); @@ -5065,6 +5074,24 @@ public class ViewFacade { map.put("deliverDoctor", deliverDoctor); + //督导医生 + String supervisorDoctor = ""; + + if (StringUtils.isNotEmpty(data.getSupervisorDoctor())) { + if (com.lyms.platform.common.utils.StringUtils.isNum(data.getSupervisorDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(data.getSupervisorDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + supervisorDoctor = users.getName(); + } + } else { + supervisorDoctor = data.getSupervisorDoctor(); + } + } + + //督导医生 + map.put("supervisorDoctor", supervisorDoctor); + + String qfDate = DateUtil.getYmd(new Date()); //签发日期 map.put("signDateYear", qfDate.substring(0, 4)); 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 89c0fb6..afb5a81 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 @@ -95,6 +95,8 @@ public class MatDeliverAddRequest implements IBasicRequestConvert