From 5c5182119ad75ad9184699f35734eb91f729149c Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Tue, 21 May 2019 17:11:36 +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 --- .../lyms/platform/pojo/MaternalDeliverModel.java | 95 +++++++++++++++------- .../operate/web/facade/BabyCheckFacade.java | 6 +- .../operate/web/request/MatDeliverAddRequest.java | 86 +++++++++++++++----- .../operate/web/result/BabyBasicResult.java | 27 ++++-- 4 files changed, 155 insertions(+), 59 deletions(-) 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 f9d1f8a..dd2048b 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 @@ -21,11 +21,13 @@ public class MaternalDeliverModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.MaternalDeliverModel.getCid(); private String id; - /**新加字段***/ + /** + * 新加字段 + ***/ //产次 private Integer dueCount; //手工分娩孕周 - private Map handDueWeek; + private Map handDueWeek; //产妇id private String parentId; private String pid; @@ -353,7 +355,7 @@ public class MaternalDeliverModel extends BaseModel { this.deathCauseText = deathCauseText; } - public static class Baby implements Serializable{ + public static class Baby implements Serializable { private static final long serialVersionUID = SerialIdEnum.Baby.getCid(); @@ -405,23 +407,23 @@ public class MaternalDeliverModel extends BaseModel { //腭裂 private boolean jxEl; //腭裂左中右 - private Map jxelSele; + private Map jxelSele; //唇裂 private boolean jxCl; //腭裂左中右 - private Map jxClSele; + private Map jxClSele; //唇裂合并腭裂 private boolean jxClhb; //唇裂合并腭裂左中右 - private Map jxClhbSele; + private Map jxClhbSele; //小耳(包括无耳) private boolean jxXe; //小耳(包括无耳)左右 - private Map jxXeSele; + private Map jxXeSele; //外耳其他畸形(小耳、无耳除外) private boolean jxWe; //外耳其他畸形(小耳、无耳除外)左右 - private Map jxWeSele; + private Map jxWeSele; //食道闭锁或狭窄 private boolean jxSdbs; //直肠肛门闭锁或狭窄(包括无肛) @@ -433,29 +435,29 @@ public class MaternalDeliverModel extends BaseModel { //马蹄内翻足 private boolean jxMtn; //马蹄内翻足左右 - private Map jxMtnSele; + private Map jxMtnSele; //多指 private boolean jxDz; //多指左右 - private Map jxDzSele; + private Map jxDzSele; //多趾 private boolean jxDc; //多趾左右 - private Map jxDcSele; + private Map jxDcSele; //并指 private boolean jxBz; //并指左右 - private Map jxBzSele; + private Map jxBzSele; //并趾 private boolean jxBc; //并趾左右 - private Map jxBcSele; + private Map jxBcSele; //肢体短缩包括缺指(趾)、裂手(足)] private boolean jxZtds; //肢体短缩包括缺指上肢左右 - private Map jxZtdsTopSele; + private Map jxZtdsTopSele; //肢体短缩包括缺指下肢左右 - private Map jxZtdsBottomSele; + private Map jxZtdsBottomSele; //先天性隔疝 private boolean jxXtxe; //脐膨出 @@ -469,7 +471,7 @@ public class MaternalDeliverModel extends BaseModel { //先天性心脏病 private boolean jxXtx; //其他(写明病名并详细描述) - private Map jxOther; + private Map jxOther; /*********威海妇幼新增字段*********/ @@ -536,7 +538,7 @@ public class MaternalDeliverModel extends BaseModel { private String cjfy;//刺激反应 private String zl;//张力 - public Baby(){ + public Baby() { } @@ -636,15 +638,15 @@ public class MaternalDeliverModel extends BaseModel { this.dueTime = dueTime; } - public Baby(BabyModel babyModel){ + public Baby(BabyModel babyModel) { setAsphyxiaM(babyModel.getAsphyxiaM()); if (null != babyModel.getSex()) { - setBabyGender(babyModel.getSex()+""); + setBabyGender(babyModel.getSex() + ""); } setApgarScore(babyModel.getApgarScore()); setBabyHealthy(babyModel.getBabyHealthy()); - if(NumberUtils.isNumber(babyModel.getBabyWeight())){ - setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+""); + if (NumberUtils.isNumber(babyModel.getBabyWeight())) { + setBabyWeight((Integer.valueOf(babyModel.getBabyWeight()) * 1000) + ""); } setBabyHeight(babyModel.getBabyHeight()); setDeformity(babyModel.getMalformation()); @@ -1445,7 +1447,7 @@ public class MaternalDeliverModel extends BaseModel { private String tpCondition;//胎盘情况 private String tpShape;//胎盘形状 private String qdfz;//脐带附着 - private Integer twining ;//缠绕 + private Integer twining;//缠绕 private String tightness;//松紧程度 private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整） @@ -1868,11 +1870,11 @@ public class MaternalDeliverModel extends BaseModel { /*******威海再次新增字段（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小时总出血量 @@ -1897,6 +1899,43 @@ public class MaternalDeliverModel extends BaseModel { private String totalOneCxl;//阴道分娩产后1小时总出血量 private String xsebz;//新生儿备注 + /*******威海再再次新增字段（201905月计划中）*******/ + private String comment;//指正 任意输入 + private String AFV;// 羊水量 ml + private Date 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 Date getParturientTime() { + return parturientTime; + } + + public void setParturientTime(Date parturientTime) { + this.parturientTime = parturientTime; + } + + public String getVaginaBloodAmount() { + return vaginaBloodAmount; + } + + public void setVaginaBloodAmount(String vaginaBloodAmount) { + this.vaginaBloodAmount = vaginaBloodAmount; + } public String getYsqk() { return ysqk; @@ -2130,11 +2169,11 @@ public class MaternalDeliverModel extends BaseModel { this.department = department; } - public Map getMyzd() { + public Map getMyzd() { return myzd; } - public void setMyzd(Map myzd) { + public void setMyzd(Map myzd) { this.myzd = myzd; } @@ -2162,11 +2201,11 @@ public class MaternalDeliverModel extends BaseModel { this.ssRecord = ssRecord; } - public Map getSsCount() { + public Map getSsCount() { return ssCount; } - public void setSsCount(Map ssCount) { + public void setSsCount(Map ssCount) { this.ssCount = ssCount; } 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 54e5a53..ea6230d 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 @@ -761,6 +761,7 @@ public class BabyCheckFacade { checkRecord.put("tcType", cmodel.getTcType().toString()); checkRecord.put("hospitalId", models.get(0).getHospitalId()); + //查询建档医院 Organization org = organizationService.getOrganization(Integer.valueOf(models.get(0).getHospitalId())); if (org != null) { @@ -837,6 +838,7 @@ public class BabyCheckFacade { base.setId(id); base.setSex(model.getSex()); base.setDueWeek(model.getDueWeek()); + base.setEndCase(String.valueOf(model.getEndCase())); base.setName(model.getName()); base.setCardNo(model.getMcertNo()); @@ -924,8 +926,8 @@ public class BabyCheckFacade { // 把增值服务标记到页面,医生能够知晓，在接种过程中可以适当给予更多关爱 List patientServiceList = patientServiceService.getServiceListByParentId(model.getId(), 2); ArrayList serTypeNameList = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(patientServiceList)){ - for (PatientService patientService : patientServiceList){ + if (CollectionUtils.isNotEmpty(patientServiceList)) { + for (PatientService patientService : patientServiceList) { Integer serType = patientService.getSerType(); String serTypeName = areaCountFacade.getSerTypeName(serType.toString()); serTypeNameList.add(serTypeName); 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 1f63e87..74590d8 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 @@ -18,10 +18,12 @@ import java.util.Map; * Created by Administrator on 2016/6/17 0017. */ @Form -public class MatDeliverAddRequest implements IBasicRequestConvert{ +public class MatDeliverAddRequest implements IBasicRequestConvert { private String id; - /**新加字段***/ + /** + * 新加字段 + ***/ //产次 private Integer dueCount; //手工分娩孕周 @@ -229,11 +231,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert getMyzd() { + public Map getMyzd() { return myzd; } - public void setMyzd(Map myzd) { + public void setMyzd(Map myzd) { this.myzd = myzd; } @@ -261,11 +263,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert getSsCount() { + public Map getSsCount() { return ssCount; } - public void setSsCount(Map ssCount) { + public void setSsCount(Map ssCount) { this.ssCount = ssCount; } @@ -330,11 +332,11 @@ public class MatDeliverAddRequest implements IBasicRequestConvert 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;//所施手术(0：无；1：局部麻醉；2：神经阻滞麻醉) private String pgcCxl;//剖宫产出血量 private String totalTwoCxl;//阴道分娩产后2小时总出血量 @@ -359,12 +361,16 @@ public class MatDeliverAddRequest implements IBasicRequestConvert{ + public static class Baby implements IBasicRequestConvert { private String id; //新生儿性别; @@ -1207,15 +1248,19 @@ public class MatDeliverAddRequest implements IBasicRequestConvert> mHighRiskReason; + private List> mHighRiskReason; - public List> getmHighRiskReason() { + public List> getmHighRiskReason() { return mHighRiskReason; } - public void setmHighRiskReason(List> mHighRiskReason) { + public void setmHighRiskReason(List> mHighRiskReason) { this.mHighRiskReason = mHighRiskReason; } @@ -53,9 +53,12 @@ public class BabyBasicResult { private Integer dueWeek; //预产期 private String dueDate; + //结案状态 + private String endCase; + /** - * 1, "有效",0, "无效" - * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 + * 1, "有效",0, "无效" + * 如果是孕妇分娩自动建档则无效，当完善时修改成有效 */ private Integer yn; /** @@ -74,6 +77,14 @@ public class BabyBasicResult { */ private List serviceList; + public String getEndCase() { + return endCase; + } + + public void setEndCase(String endCase) { + this.endCase = endCase; + } + public List getServiceList() { return serviceList; } @@ -138,13 +149,11 @@ public class BabyBasicResult { this.pregnantCertificateTypeId = pregnantCertificateTypeId; } - public String getSourceId() - { + public String getSourceId() { return sourceId; } - public void setSourceId(String sourceId) - { + public void setSourceId(String sourceId) { this.sourceId = sourceId; } -- 1.8.3.1