diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index ea6230d..22f5ea0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -131,18 +131,20 @@ public class BabyCheckFacade { //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面 BabyModel bm = new BabyModel(); //添加结案字段 - bm.setEndCase(request.getEndCase()); - if (1 == request.getEndCase()) { - bm.setOutcome(request.getOutcome()); - bm.setEndCaseTime(new Date()); - } - bm.setModified(new Date()); - if (request.getHighRisk() == null) { - bm.setLastHighRisk(0); - } else { - bm.setLastHighRisk(request.getHighRisk()); + if (null != request.getEndCase()) { + bm.setEndCase(request.getEndCase()); + if (1 == request.getEndCase()) { + bm.setOutcome(request.getOutcome()); + bm.setEndCaseTime(new Date()); + } + bm.setModified(new Date()); + if (request.getHighRisk() == null) { + bm.setLastHighRisk(0); + } else { + bm.setLastHighRisk(request.getHighRisk()); - bm.setHighRiskInfo(request.getHighRiskInfo()); + bm.setHighRiskInfo(request.getHighRiskInfo()); + } } //高危儿因素添加 if (request.getWeakSon() == null) { 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 ac2f501..dba9506 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 @@ -1428,6 +1428,24 @@ public class MatDeliverFacade { maternalDeliverResult.setDeliverDoctor(map); + //督导医生 + String supervisorDoctorId = deliverModel.getSupervisorDoctor(); + Map supervisorMap = new HashMap<>(); + try { + Users users = usersService.getUsers(Integer.valueOf(supervisorDoctorId)); + + if (null != users) { + supervisorMap.put("id", users.getId() + ""); + supervisorMap.put("name", users.getName()); + } + } catch (Exception e) { + supervisorMap.put("id", "-1"); + supervisorMap.put("name", doctorId); + } + + + maternalDeliverResult.setSupervisorDoctor(supervisorMap); + //获取新生儿信息 List babyIdList = deliverModel.getBaby(); List babyList = new ArrayList(); @@ -1828,8 +1846,7 @@ public class MatDeliverFacade { matDeliverQuery.setFmHospitalList(hospitalList); matDeliverQuery.setFsHospital(hospitalId); - if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) - { + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) { matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId()); } matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult()); 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 afb5a81..8bfc299 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 @@ -374,7 +374,7 @@ public class MatDeliverAddRequest implements IBasicRequestConvert * Created by Administrator on 2016/6/16 0016. */ -public class MaternalDeliverResult { +public class MaternalDeliverResult { private String id; //产妇id @@ -22,7 +23,7 @@ public class MaternalDeliverResult { //分娩时间 private String dueDate; //手工分娩孕周 - private Map handDueWeek; + private Map handDueWeek; //分娩孕周 private String dueWeek; // 产次 @@ -42,7 +43,7 @@ public class MaternalDeliverResult { //手术原因 private String operationCause; //产程 h 小时 m 分 - private Map prodprocess; + private Map prodprocess; //总产程 private Map totalprocess; //会阴情况 @@ -81,9 +82,20 @@ public class MaternalDeliverResult { private List babies; //分娩医院 - private Map fmHospital; + private Map fmHospital; //接生医生 - private Map deliverDoctor; + private Map deliverDoctor; + + //督导医生 + private Map supervisorDoctor; + + public Map getSupervisorDoctor() { + return supervisorDoctor; + } + + public void setSupervisorDoctor(Map supervisorDoctor) { + this.supervisorDoctor = supervisorDoctor; + } public String getDeathCauseText() { return deathCauseText; @@ -128,11 +140,11 @@ public class MaternalDeliverResult { /*******威海再次新增字段（12月计划中）*******/ private Integer gravidity;//孕次 private String department;//科室(1：产一；2：产二) - private Map myzd;//母婴阻断 + private Map myzd;//母婴阻断 private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩） private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切） private String ssRecord;//手术记录 - private Map ssCount;//手术清点 + private Map ssCount;//手术清点 private String ssProcedure;//所施手术 private String pgcCxl;//剖宫产出血量 private String totalTwoCxl;//阴道分娩产后2小时总出血量 @@ -155,10 +167,49 @@ public class MaternalDeliverResult { private String xsebz;//新生儿备注 + /*******威海再再次新增字段（201905月计划中）*******/ + private String comment;//指正 任意输入 + private String afv;// 羊水量 ml + private String parturientTime; //临产时间 + private String vaginaBloodAmount;//阴道出血量 + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + public String getAfv() { + return afv; + } + + public void setAfv(String afv) { + this.afv = afv; + } + + public String getParturientTime() { + return parturientTime; + } + + public void setParturientTime(String parturientTime) { + this.parturientTime = parturientTime; + } + + public String getVaginaBloodAmount() { + return vaginaBloodAmount; + } + + public void setVaginaBloodAmount(String vaginaBloodAmount) { + this.vaginaBloodAmount = vaginaBloodAmount; + } + public String getYsqk() { return ysqk; } + public void setYsqk(String ysqk) { this.ysqk = ysqk; } @@ -315,11 +366,11 @@ public class MaternalDeliverResult { this.department = department; } - public Map getMyzd() { + public Map getMyzd() { return myzd; } - public void setMyzd(Map myzd) { + public void setMyzd(Map myzd) { this.myzd = myzd; } @@ -545,10 +596,14 @@ public class MaternalDeliverResult { setTotalOneCxl(destModel.getTotalOneCxl()); setXsebz(destModel.getXsebz()); + /*******威海再再次新增字段（201905月计划中）*******/ + setComment(destModel.getComment()); + setAfv(destModel.getAfv()); + setParturientTime(DateUtil.gety_m_dhm(destModel.getParturientTime())); return this; } - public class Placenta{ + public class Placenta { //心率 private double heartRate; //胎方位 @@ -590,7 +645,8 @@ public class MaternalDeliverResult { this.join = join; } } - public class Baby{ + + public class Baby { private String id; //新生儿性别; @@ -764,8 +820,15 @@ public class MaternalDeliverResult { private String cjfy;//刺激反应 private String zl;//张力 - public Baby(){}//增加无参构造方法 - public Baby(MaternalDeliverModel.Baby babyModel){ + /*********201905计划威海妇幼新增字段*********/ + private String babyQX; + private String otherInfo; + + + public Baby() { + }//增加无参构造方法 + + public Baby(MaternalDeliverModel.Baby babyModel) { setId(babyModel.getId()); setBabyGender(babyModel.getBabyGender() + ""); setBabyWeight(babyModel.getBabyWeight()); @@ -876,7 +939,10 @@ public class MaternalDeliverResult { setYs(babyModel.getYs()); setCjfy(babyModel.getCjfy()); setZl(babyModel.getZl()); - + setBabyQX(babyModel.getBabyQX()); + if ("4".equals(babyModel.getBabyQX())) { + setOtherInfo(babyModel.getOtherInfo()); + } } public String getHx() { @@ -895,6 +961,22 @@ public class MaternalDeliverResult { this.xt = xt; } + 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 getYs() { return ys; } @@ -1742,7 +1824,6 @@ public class MaternalDeliverResult { } - public String getDeathCause() { return deathCause; } @@ -1816,7 +1897,6 @@ public class MaternalDeliverResult { } - public String getNeedleNum() { return needleNum; } @@ -1826,8 +1906,6 @@ public class MaternalDeliverResult { } - - public String getOperationCause() { return operationCause; } @@ -1869,7 +1947,6 @@ public class MaternalDeliverResult { } - public String getPulse() { return pulse; } @@ -1993,11 +2070,12 @@ public class MaternalDeliverResult { public void setProdprocess(Map prodprocess) { this.prodprocess = prodprocess; } - public static void main(String[] args){ + + public static void main(String[] args) { Map b = - (Map)JsonUtil.str2Obj("{\"one\":{\"h\":\"123\",\"m\":\"234\"},\"two\":{\"h\":\"123\",\"m\":\"234\"},\"three\":{\"h\":\"123\",\"m\":\"234\"}}", Map.class); + (Map) JsonUtil.str2Obj("{\"one\":{\"h\":\"123\",\"m\":\"234\"},\"two\":{\"h\":\"123\",\"m\":\"234\"},\"three\":{\"h\":\"123\",\"m\":\"234\"}}", Map.class); - ObjectMapper objectMapper = new ObjectMapper(); + ObjectMapper objectMapper = new ObjectMapper(); Map acc = null;