From dd9884f784ce4e1f72f09136efbb6e5f5ef03817 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Mon, 7 Jan 2019 16:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8D=A3=E6=88=90=E7=94=B7=E5=A5=B3=E5=A9=9A?= =?UTF-8?q?=E6=A3=80=E5=BB=BA=E6=A1=A3=E5=AD=97=E6=AE=B5=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/pojo/MaternalDeliverModel.java | 110 ++++++++++++++++++ .../lyms/hospitalapi/qhdfy/QhdJbgwInterface.java | 16 +-- .../platform/operate/web/facade/ViewFacade.java | 13 +++ .../operate/web/request/MatDeliverAddRequest.java | 125 +++++++++++++++++++++ .../operate/web/result/ResidentsPageResult.java | 84 ++++++++++++++ 5 files changed, 340 insertions(+), 8 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 a8e9f89..d02b753 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 @@ -530,10 +530,56 @@ public class MaternalDeliverModel extends BaseModel { private String impression;//印象 private String qzdbh;//亲子带编号 + private String hx;//呼吸 + private String xt;//心跳 + private String ys;//颜色 + private String cjfy;//刺激反应 + private String zl;//张力 + public Baby(){ } + public String getHx() { + return hx; + } + + public void setHx(String hx) { + this.hx = hx; + } + + public String getXt() { + return xt; + } + + public void setXt(String xt) { + this.xt = xt; + } + + public String getYs() { + return ys; + } + + public void setYs(String ys) { + this.ys = ys; + } + + public String getCjfy() { + return cjfy; + } + + public void setCjfy(String cjfy) { + this.cjfy = cjfy; + } + + public String getZl() { + return zl; + } + + public void setZl(String zl) { + this.zl = zl; + } + public String getQzdbh() { return qzdbh; } @@ -1832,6 +1878,70 @@ public class MaternalDeliverModel extends BaseModel { private String jmkz;//静脉扩张 private String zyDiagnosis;//主要诊断 + private String ysqk;//羊水情况（0:清；1:Ⅰ度；2:Ⅱ度；3:Ⅲ度） + private String zgnmz;//椎管内麻醉(0:未选择；1:已选择) + private String dlfm;//导乐分娩(0:未选择；1:已选择) + private String fmzty;//分娩镇痛仪(0:未选择；1:已选择) + private String zypbfm;//专业陪伴分娩(0:未选择；1:已选择) + private String totalOneCxl;//阴道分娩产后1小时总出血量 + private String xsebz;//新生儿备注 + + + public String getYsqk() { + return ysqk; + } + + public void setYsqk(String ysqk) { + this.ysqk = ysqk; + } + + public String getZgnmz() { + return zgnmz; + } + + public void setZgnmz(String zgnmz) { + this.zgnmz = zgnmz; + } + + public String getDlfm() { + return dlfm; + } + + public void setDlfm(String dlfm) { + this.dlfm = dlfm; + } + + public String getFmzty() { + return fmzty; + } + + public void setFmzty(String fmzty) { + this.fmzty = fmzty; + } + + public String getZypbfm() { + return zypbfm; + } + + public void setZypbfm(String zypbfm) { + this.zypbfm = zypbfm; + } + + public String getTotalOneCxl() { + return totalOneCxl; + } + + public void setTotalOneCxl(String totalOneCxl) { + this.totalOneCxl = totalOneCxl; + } + + public String getXsebz() { + return xsebz; + } + + public void setXsebz(String xsebz) { + this.xsebz = xsebz; + } public String getFhqk() { return fhqk; diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java index e157f3a..eadd610 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdJbgwInterface.java @@ -1053,17 +1053,17 @@ public class QhdJbgwInterface { ssy = chBpMap.get("ssy"); szy = chBpMap.get("szy"); } - map.put("SYSTILIC",ssy); - map.put("DIASTOLIC",szy); + map.put("SYSTILIC",szy); + map.put("DIASTOLIC",ssy); if(data.getBreast() != null){ - if("1".equals(data.getBreast())){ + if("1".equals(data.getBreast()) || 1 == data.getBreast()){ map.put("UBERCODE","1"); }else{ map.put("UBERCODE","2"); } } if(data.getLochia() != null){ - if("1".equals(data.getLochia())){ + if("1".equals(data.getLochia()) || 1 == data.getLochia()){ map.put("LOCHIACODE","1"); }else{ map.put("LOCHIACODE","2"); @@ -1071,7 +1071,7 @@ public class QhdJbgwInterface { } map.put("UTERUSABNORMDESC",data.getMatrix()); if(data.getWound() != null){ - if("1".equals(data.getWound())){ + if("1".equals(data.getWound()) || 1 == data.getWound()){ map.put("WOUNDCODE","1"); }else{ map.put("WOUNDCODE","2"); @@ -1079,7 +1079,7 @@ public class QhdJbgwInterface { } map.put("OTHERSDESC",data.getOtherDesc()); if(data.getHealthType() != null){ - if("1".equals(data.getHealthType())){ + if("1".equals(data.getHealthType()) || 1 == data.getHealthType()){ map.put("FOLLOWUPCLASSIFYCODE","1"); }else{ map.put("FOLLOWUPCLASSIFYCODE","2"); @@ -1088,7 +1088,7 @@ public class QhdJbgwInterface { map.put("FOLLOWUPCLASSIFYVALUE",null); map.put("BODYTEMPERATURE",data.getTemperature()); if(data.getIsRefer() != null){ - if("1".equals(data.getIsRefer())){ + if("1".equals(data.getIsRefer()) || 1 == data.getIsRefer()){ map.put("REFERRALCODE","1"); }else if("2".equals(data.getIsRefer())){ map.put("REFERRALCODE","2"); @@ -1161,7 +1161,7 @@ public class QhdJbgwInterface { mongoQuery.setModifiedStart(DateUtil.parseYMDHMS(startDate)); mongoQuery.setModifiedEnd(DateUtil.parseYMDHMS(endDate)); list1 = postReviewService.findWithList(mongoQuery); - if((null != list && list.size() > 0) && (null != list1 && list1.size() > 0)){ + if((null != list && list.size() > 0) || (null != list1 && list1.size() > 0)){ allList.addAll(list); allList.addAll(list1); } 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 40a386a..0bf6089 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 @@ -2786,6 +2786,9 @@ public class ViewFacade { map.put("jmkz",data.getJmkz()); map.put("zyDiagnosis",data.getZyDiagnosis() != null ? data.getZyDiagnosis().replace("\n","
") : ""); + map.put("ysqk",data.getYsqk()); + map.put("zgnmz",data.getZgnmz()); + /* 产后生理 */ map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo())); map.put("deathCause", com.lyms.platform.common.utils.StringUtils.isEmpty(data.getDeathCause()) ? "--" : DeathCauseEnums.getName(data.getDeathCause())); @@ -4702,6 +4705,16 @@ public class ViewFacade { result.setZnstzk(model.getZnstzk()); result.setJtbm(model.getJtbm()); + result.setIsOrNotrdl(model.getIsOrNotrdl()); + result.setIsOrNotSc(model.getIsOrNotSc()); + result.setIsOrNotSr(model.getIsOrNotSr()); + result.setIsOrNotXy(model.getIsOrNotXy()); + result.setJizhi(model.getJizhi()); + result.setIsOrNotBdXy(model.getIsOrNotBdXy()); + result.setBdXyHours(model.getBdXyHours()); + result.setIsOrNotYj(model.getIsOrNotYj()); + result.setYjMl(model.getYjMl()); + return result; } 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 6acf187..1f63e87 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 @@ -351,6 +351,16 @@ public class MatDeliverAddRequest implements IBasicRequestConvert