From 3963178047a0302fade237caabde30a2da3b8b5c Mon Sep 17 00:00:00 2001 From: wtt Date: Mon, 14 Dec 2020 11:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=B5=E5=8C=96=E9=9C=80=E6=B1=82=E4=B8=A4?= =?UTF-8?q?=E7=99=8C=E3=80=81=E5=85=A5=E5=9B=AD=E6=A3=80=E6=9F=A5=E3=80=81?= =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyModel.java | 11 ++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 3 +++ .../web/request/BabyBookbuildingAddRequest.java | 10 ++++++++ .../web/request/BabyKindergartenCheckRequest.java | 29 ++++++++++++++++++++++ .../operate/web/result/BabyBuildResult.java | 11 +++++++- .../operate/web/result/BabyPageResult.java | 11 +++++++- 6 files changed, 73 insertions(+), 2 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 943f042..294e316 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -39,6 +39,9 @@ public class BabyModel extends BaseModel { //卡介苗接种注射者 private String bCGInjectUserName; + //遵化定制 路北辖区状态 null|| ""未选择、 1 ○ 否 、2○是 + private String zhlbxqState; + //是否接种乙肝疫苗 1 已接种 0 未接种 private Integer isHBV; //乙肝疫苗接种日期 @@ -2637,6 +2640,14 @@ public class BabyModel extends BaseModel { return hBIGInjectUserName; } + public String getZhlbxqState() { + return zhlbxqState; + } + + public void setZhlbxqState(String zhlbxqState) { + this.zhlbxqState = zhlbxqState; + } + public void sethBIGInjectUserName(String hBIGInjectUserName) { this.hBIGInjectUserName = hBIGInjectUserName; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 5ff64c4..fd92f55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1246,6 +1246,8 @@ public class BabyBookbuildingFacade { private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) { // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段 BabyModel bm = new BabyModel(); + //遵化定制 路北辖区状态 + bm.setZhlbxqState(b.getZhlbxqState()); if (b.getDataStatus() != null && b.getDataStatus() == 1) { bm.setDataStatus(0); @@ -1604,6 +1606,7 @@ public class BabyBookbuildingFacade { if (models != null && models.size() > 0) { BabyModel model = models.get(0); result = getBabyBuildResult(model); + result.setZhlbxqState(model.getZhlbxqState()); BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id); List patientSerResults = (List ) baseResponse.getObject(); result.setPatientSerResults(patientSerResults); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java index c1b42e6..5de9e82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java @@ -56,6 +56,8 @@ public class BabyBookbuildingAddRequest { public void setmHighRiskReason(List mHighRiskReason) { this.mHighRiskReason = mHighRiskReason; } + //遵化定制 路北辖区状态 null|| ""未选择、 1 ○ 否 、2○是 + private String zhlbxqState; //建档Id private String id; @@ -1321,6 +1323,14 @@ public class BabyBookbuildingAddRequest { return vipEndTime; } + public String getZhlbxqState() { + return zhlbxqState; + } + + public void setZhlbxqState(String zhlbxqState) { + this.zhlbxqState = zhlbxqState; + } + public void setVipEndTime(String vipEndTime) { this.vipEndTime = vipEndTime; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java index 8926e53..7e6f24c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyKindergartenCheckRequest.java @@ -63,10 +63,15 @@ public class BabyKindergartenCheckRequest { // 既往史 "yeaOrNo", "yes" "no" , xtxxz:true 先天性心脏病，dx:true 癫痫，gr:true 高热，xc:true 哮喘，qt:true 其它 qtc: 其它内容 private Map pastHistory; + private String pastHistoryStr; //传染病史 private Map infectDiseases; + private String infectDiseasesStr; + //过敏史 private Map ywgmHistory; + private String ywgmHistoryStr; + //家长确认签字 private String qurenqianzi; @@ -185,6 +190,30 @@ public class BabyKindergartenCheckRequest { this.rightRefractionDS = rightRefractionDS; } + public String getPastHistoryStr() { + return pastHistoryStr; + } + + public void setPastHistoryStr(String pastHistoryStr) { + this.pastHistoryStr = pastHistoryStr; + } + + public String getInfectDiseasesStr() { + return infectDiseasesStr; + } + + public void setInfectDiseasesStr(String infectDiseasesStr) { + this.infectDiseasesStr = infectDiseasesStr; + } + + public String getYwgmHistoryStr() { + return ywgmHistoryStr; + } + + public void setYwgmHistoryStr(String ywgmHistoryStr) { + this.ywgmHistoryStr = ywgmHistoryStr; + } + public String getRightRefractionDC() { return rightRefractionDC; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java index 07cef01..d7f0a49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java @@ -44,7 +44,8 @@ public class BabyBuildResult { //文化程度ID private String mommyLevelId; - + //遵化定制 路北辖区状态 null|| ""未选择、 1 ○ 否 、2○是 + private String zhlbxqState; //职业类别 private String mommyProfessionTypeId; @@ -1282,6 +1283,14 @@ public class BabyBuildResult { this.apgarScore = apgarScore; } + public String getZhlbxqState() { + return zhlbxqState; + } + + public void setZhlbxqState(String zhlbxqState) { + this.zhlbxqState = zhlbxqState; + } + public void setmHighRiskReason2(List mHighRiskReason2) { this.mHighRiskReason2 = mHighRiskReason2; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java index 260c92a..fd857a7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java @@ -30,7 +30,8 @@ public class BabyPageResult implements IBasicResultConvert patientSerResults; - + //遵化定制 路北辖区状态 null|| ""未选择、 1 ○ 否 、2○是 + private String zhlbxqState; //建档Id private String id; @@ -1205,6 +1206,8 @@ public class BabyPageResult implements IBasicResultConvert list = destModel.getmHighRiskReason(); + setZhlbxqState(destModel.getZhlbxqState()); + /*滦平 start */ setEsfs(destModel.getEsfs()); setTxng(destModel.getTxng()); @@ -1349,5 +1352,11 @@ public class BabyPageResult implements IBasicResultConvert