diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 8db4569..72c0c08 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -38,6 +38,7 @@ public class AntExChuModel extends BaseModel { /*end*/ private String bgValue; + private String bgValuehsly; private String genRemark; // 一般检查备注 private String gynRemark; // 妇科检查备注 @@ -1664,6 +1665,14 @@ public class AntExChuModel extends BaseModel { this.bld = bld; } + public String getBgValuehsly() { + return bgValuehsly; + } + + public void setBgValuehsly(String bgValuehsly) { + this.bgValuehsly = bgValuehsly; + } + public String getBloodSugar() { return bloodSugar; } 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 b12a4f7..5468b63 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 @@ -18,6 +18,10 @@ import java.util.Map; public class BabyModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.BabyModel.getCid(); + + //幼儿园名称,使用基础配置 + private String yeymcId; + //月龄下拉框 private String ylSelect; @@ -1073,6 +1077,14 @@ public class BabyModel extends BaseModel { return jxWeSele; } + public String getYeymcId() { + return yeymcId; + } + + public void setYeymcId(String yeymcId) { + this.yeymcId = yeymcId; + } + public void setJxWeSele(Map jxWeSele) { this.jxWeSele = jxWeSele; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index a353405..382ce84 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -687,6 +687,7 @@ public class AntenatalExaminationFacade { } } AntExChuModel antExChuModel = excAddRequest.convertToDataModel(); + antExChuModel.setBgValuehsly(excAddRequest.getBgValuehsly()); //表示区域的 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { String parentId = handHideBuild(excAddRequest.getPid(), excAddRequest.getParentId(), userId, 1); @@ -4219,7 +4220,7 @@ public class AntenatalExaminationFacade { } antexChuResult.convertToResult(antExChuModel); - + antexChuResult.setBgValuehsly(antExChuModel.getBgValuehsly()); antexChuResult.setDoctorSign(antExChuModel.getDoctorSign()); antexChuResult.setPatientSign(antExChuModel.getPatientSign()); 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 3fd4d72..6804a5c 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 @@ -1294,6 +1294,7 @@ public class BabyBookbuildingFacade { bm.setYlSelect(b.getYlSelect()); bm.setIsUNHS(b.getIsUNHS()); bm.setHearScrResult(b.getHearScrResult()); + bm.setYeymcId(b.getYeymcId()); //遵化定制 路北辖区状态 bm.setZhlbxqState(b.getZhlbxqState()); @@ -1635,7 +1636,24 @@ public class BabyBookbuildingFacade { } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - + /** + * 处理幼儿园好班级， + */ + private Map getBasicConfigYey(String id) { + if(com.lyms.platform.common.utils.StringUtils.isEmpty(id)){ + return new HashMap <>(); + } + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setId(id); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + Map map = new HashMap <>(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { + map.put("id", datas.get(0).getId()); + map.put("name", datas.get(0).getName()); + } + return map; + } /** * 儿童建档查询详情，根据ID、 * @@ -1657,6 +1675,12 @@ public class BabyBookbuildingFacade { if (models != null && models.size() > 0) { BabyModel model = models.get(0); result = getBabyBuildResult(model); + result.setYeymcId(model.getYeymcId()); + Map getYeymcId = getBasicConfigYey(model.getYeymcId()); + if (getYeymcId != null && getYeymcId.containsKey("name")) { + result.setYeymcIdMap(getYeymcId); + } + result.setYlSelect(model.getYlSelect()); result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); result.setIsUNHS(model.getIsUNHS()); 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 3e80af4..eee72fc 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 @@ -2315,6 +2315,7 @@ public class ViewFacade { map.put("totalBilirubin", UnitUtils.unitSplice(data.getTotalBilirubin(), UnitConstants.UMOLL)); map.put("jhBilirubin", UnitUtils.unitSplice(data.getJhBilirubin(), UnitConstants.UMOLL)); map.put("bg", FunvCommonUtil.checkYiGan(data.getBg())); + map.put("bgValuehsly", data.getBgValuehsly()); map.put("ygbmky", FunvCommonUtil.checkYiGan(data.getYgbmky())); map.put("ygbmkt", FunvCommonUtil.checkYiGan(data.getYgbmkt())); @@ -5235,6 +5236,12 @@ public class ViewFacade { result.setPatientSerResults(patientSerResults); result = result.convertToResult(model); + result.setYeymcId(model.getYeymcId()); + Map getYeymcId = getBasicConfigYey(model.getYeymcId()); + if (getYeymcId != null && getYeymcId.containsKey("name")) { + result.setYeymcIdMap(getYeymcId); + } + result.setYlSelect(model.getYlSelect()); result.setIsUNHS(model.getIsUNHS()); if(model.getIsUNHS()!=null && model.getIsUNHS() != 0){ @@ -5341,7 +5348,24 @@ public class ViewFacade { objectResponse.setErrormsg("成功"); return objectResponse; } - + /** + * 处理幼儿园好班级， + */ + private Map getBasicConfigYey(String id) { + if(com.lyms.platform.common.utils.StringUtils.isEmpty(id)){ + return new HashMap <>(); + } + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setYn(YnEnums.YES.getId()); + basicConfigQuery.setId(id); + List datas = basicConfigService.queryBasicConfig(basicConfigQuery); + Map map = new HashMap <>(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { + map.put("id", datas.get(0).getId()); + map.put("name", datas.get(0).getName()); + } + return map; + } /** * 通过pid获取儿童信息 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 821cf97..69c2d33 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -42,6 +42,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { /*end*/ private String bgValue; + private String bgValuehsly; private String genRemark; // 一般检查备注 private String gynRemark; // 妇科检查备注 @@ -1925,6 +1926,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.prodDoctor = prodDoctor; } + public String getBgValuehsly() { + return bgValuehsly; + } + + public void setBgValuehsly(String bgValuehsly) { + this.bgValuehsly = bgValuehsly; + } public String getTireNumber1() { return tireNumber1; 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 e653d83..ed5dc28 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 @@ -13,6 +13,12 @@ import java.util.Map; @Form public class BabyBookbuildingAddRequest { + //幼儿园名称,使用基础配置 + private String yeymcId; + + private Map yeymcIdMap;//不传 + + //月龄下拉框 private String ylSelect; @@ -682,6 +688,22 @@ public class BabyBookbuildingAddRequest { return highRiskInfo; } + public String getYeymcId() { + return yeymcId; + } + + public void setYeymcId(String yeymcId) { + this.yeymcId = yeymcId; + } + + public Map getYeymcIdMap() { + return yeymcIdMap; + } + + public void setYeymcIdMap(Map yeymcIdMap) { + this.yeymcIdMap = yeymcIdMap; + } + public void setHighRiskInfo(List highRiskInfo) { this.highRiskInfo = highRiskInfo; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index c9f90b7..43fef94 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -197,6 +197,7 @@ public class AntexChuResult { private String cDueWeek; private String bg; + private String bgValuehsly; // 月经周期开始天数 private String mensDay; // 月经周期开始天数 @@ -1746,6 +1747,14 @@ public class AntexChuResult { return textpjbc; } + public String getBgValuehsly() { + return bgValuehsly; + } + + public void setBgValuehsly(String bgValuehsly) { + this.bgValuehsly = bgValuehsly; + } + public void setTextpjbc(String textpjbc) { this.textpjbc = textpjbc; } 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 ff88b7a..f8cb924 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 @@ -8,6 +8,10 @@ import java.util.Map; * Created by lqy on 2016/6/17. */ public class BabyBuildResult { + + private String yeymcId;//幼儿园名称,使用基础配置 + private Map yeymcIdMap;//幼儿园名称,使用基础配置 + //月龄下拉框 private String ylSelect; //下次预约 @@ -869,6 +873,22 @@ public class BabyBuildResult { return jxTszh; } + public String getYeymcId() { + return yeymcId; + } + + public void setYeymcId(String yeymcId) { + this.yeymcId = yeymcId; + } + + public Map getYeymcIdMap() { + return yeymcIdMap; + } + + public void setYeymcIdMap(Map yeymcIdMap) { + this.yeymcIdMap = yeymcIdMap; + } + public void setJxTszh(boolean jxTszh) { this.jxTszh = jxTszh; } 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 8011f8b..07775fb 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 @@ -22,6 +22,9 @@ import java.util.Map; * Created by lqy on 2016/6/17. */ public class BabyPageResult implements IBasicResultConvert { + + private String yeymcId;//幼儿园名称,使用基础配置 + private Map yeymcIdMap;//幼儿园名称,使用基础配置 //月龄下拉框 private String ylSelect; //下次预约 @@ -566,6 +569,22 @@ public class BabyPageResult implements IBasicResultConvert