From 620708068a6dcd963e276a3668030624fc188853 Mon Sep 17 00:00:00 2001 From: shiyang Date: Wed, 1 Sep 2021 20:46:09 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 10 +-- .../java/com/lyms/platform/pojo/BabyModel.java | 81 ++++++++++++++++++++++ .../web/service/impl/BabyEyeCheckServiceImpl.java | 18 ++++- 3 files changed, 103 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index 94fe08e..cd2cfe4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -437,19 +437,19 @@ public class BabyEyeCheck extends BaseModel { * 第3类:基层转诊 选择基层机构（院方提供基层数据） * 第4类:本院 */ - private String source; //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院 + private String babySource; //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院 private Integer healthCheckType;//1：健康查体: 1：散居、2:整体 private String healthCheckTypeScattered; //1:散居（手输） private String healthCheckTypeWhole; //2:整体（直接存选中的名字） private String kindergarten;//2：幼儿园转诊--幼儿园机构（直接存选中的名字） private String basicOrganization;//3:基层转诊--基层机构（直接存选中的名字） - public String getSource() { - return source; + public String getBabySource() { + return babySource; } - public void setSource(String source) { - this.source = source; + public void setBabySource(String babySource) { + this.babySource = babySource; } public Integer getHealthCheckType() { 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 27bd32a..42c5d8c 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 @@ -624,6 +624,87 @@ public class BabyModel extends BaseModel { /********************************************/ + /** + * 秦皇岛 + * 儿童眼保健检查-新增页面 底部加 分类下拉列 + * 分类-1.近视高危、2.弱视高危、3.异常高危 + */ + private Integer classify; + + public Integer getClassify() { + return classify; + } + + public void setClassify(Integer classify) { + this.classify = classify; + } + /****************************************/ + + /** + * 秦皇岛 + * 儿童眼保健检查-新增页面 检查套餐上面加“来源”这四类可以多选。 + * 第1类:健康查体 又分为 ，散居 手动输入 ，整体 选择幼儿园机构（院方提供商的幼儿园数据） + * 第2类:幼儿园转诊 选择幼儿园机构（院方提供幼儿园数据） + * 第3类:基层转诊 选择基层机构（院方提供基层数据） + * 第4类:本院 + */ + private String babySource; //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院 + private Integer healthCheckType;//1：健康查体: 1：散居、2:整体 + private String healthCheckTypeScattered; //1:散居（手输） + private String healthCheckTypeWhole; //2:整体（直接存选中的名字） + private String kindergarten;//2：幼儿园转诊--幼儿园机构（直接存选中的名字） + private String basicOrganization;//3:基层转诊--基层机构（直接存选中的名字） + + public String getBabySource() { + return babySource; + } + + public void setBabySource(String babySource) { + this.babySource = babySource; + } + + public Integer getHealthCheckType() { + return healthCheckType; + } + + public void setHealthCheckType(Integer healthCheckType) { + this.healthCheckType = healthCheckType; + } + + public String getHealthCheckTypeScattered() { + return healthCheckTypeScattered; + } + + public void setHealthCheckTypeScattered(String healthCheckTypeScattered) { + this.healthCheckTypeScattered = healthCheckTypeScattered; + } + + public String getHealthCheckTypeWhole() { + return healthCheckTypeWhole; + } + + public void setHealthCheckTypeWhole(String healthCheckTypeWhole) { + this.healthCheckTypeWhole = healthCheckTypeWhole; + } + + public String getKindergarten() { + return kindergarten; + } + + public void setKindergarten(String kindergarten) { + this.kindergarten = kindergarten; + } + + public String getBasicOrganization() { + return basicOrganization; + } + + public void setBasicOrganization(String basicOrganization) { + this.basicOrganization = basicOrganization; + } + + /****************************************/ + public Integer getDeafnessGene() { return deafnessGene; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index a68f79d..f720a18 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -443,9 +443,25 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModel.setY2(StringUtils.isEmpty(babyEyeCheck.getY2()) ? "" : babyEyeCheck.getY2()); babyModel.setRefraction2(StringUtils.isEmpty(babyEyeCheck.getRefraction2()) ? "" : babyEyeCheck.getRefraction2()); + //秦皇岛-儿保眼科-分类-1.近视高危、2.弱视高危、3.异常高危 + babyModel.setClassify(null==babyEyeCheck.getClassify()?null:babyEyeCheck.getClassify()); + + //儿童眼保健检查-新增页面 检查套餐上面加“来源”这四类可以多选。 + //来源多选 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院 + babyModel.setBabySource(StringUtils.isEmpty(babyEyeCheck.getBabySource())?null:babyEyeCheck.getBabySource()); + //1：健康查体: 1：散居、2:整体 + babyModel.setHealthCheckType(null==babyEyeCheck.getHealthCheckType()?null:babyEyeCheck.getHealthCheckType()); + //1:散居（手输） + babyModel.setHealthCheckTypeScattered(StringUtils.isEmpty(babyEyeCheck.getHealthCheckTypeScattered())?null:babyEyeCheck.getHealthCheckTypeScattered()); + //2:整体（直接存选中的名字） + babyModel.setHealthCheckTypeWhole(StringUtils.isEmpty(babyEyeCheck.getHealthCheckTypeWhole())?null:babyEyeCheck.getHealthCheckTypeWhole()); + //2：幼儿园转诊--幼儿园机构（直接存选中的名字） + babyModel.setKindergarten(StringUtils.isEmpty(babyEyeCheck.getKindergarten())?null:babyEyeCheck.getKindergarten()); + //3:基层转诊--基层机构（直接存选中的名字） + babyModel.setBasicOrganization(StringUtils.isEmpty(babyEyeCheck.getBasicOrganization())?null:babyEyeCheck.getBasicOrganization()); + Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyModel.getId())), update, BabyModel.class); - } -- 1.8.3.1