diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java index 333638c..d5b9f78 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java @@ -55,7 +55,8 @@ public enum SmsServiceEnums { XTTX(41,"血糖测量提醒",21,"1"), XYTX(42,"血压测量提醒",21,"1"), NOSERVICE(43,"无服务",18,"0,1,2,3,4"), - CHWJTX(44,"产后问卷提醒",4,"3"); + CHWJTX(44,"产后问卷提醒",4,"3"), + ETJBTX(15,"儿保疾病提醒",14,"2"); private SmsServiceEnums(int id,String name,int pid,String serviceObj){ this.id = id; 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 42f008e..ea9fd77 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 @@ -1688,6 +1688,8 @@ public class BabyBookbuildingFacade { result.setDueWeek(model.getDueWeek()); result.setDueDay(model.getDueDay()); + result.setOpenDisease(StringUtils.isNotEmpty(model.getOpenDisease()) ? model.getOpenDisease() : "1"); + if (StringUtils.isNotEmpty(model.getDeliverOrg())) { result.setDeliverOrg(model.getDeliverOrg()); // if (org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())) { 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 9987672..5f8efb1 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 @@ -1982,6 +1982,7 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setEyeAdviceName(eyeAdviceName); model.setEyeGuideSuggestions(checkModel.getEyeGuideSuggestions()); model.setConfigItemId(checkModel.getConfigItemId()); + model.setDiseases(checkModel.getDiseases()); return model; } 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 cbf240c..acec9c3 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 @@ -18,6 +18,7 @@ import java.util.Map; import java.util.Set; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.utils.*; import com.lyms.platform.common.utils.HttpClientUtil; import com.lyms.platform.operate.web.request.MessagesResult; @@ -63,34 +64,6 @@ import com.lyms.platform.biz.service.StopPregnancyService; import com.lyms.platform.biz.service.YunBookbuildingService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.enums.BasisEnums; -import com.lyms.platform.common.enums.CZFmTypeEnums; -import com.lyms.platform.common.enums.CfEnums; -import com.lyms.platform.common.enums.DeathCauseEnums; -import com.lyms.platform.common.enums.EyeExaminationEnums; -import com.lyms.platform.common.enums.FetalEnums; -import com.lyms.platform.common.enums.FetalPositionEnums; -import com.lyms.platform.common.enums.FitnessEnums; -import com.lyms.platform.common.enums.FmTypeEnums; -import com.lyms.platform.common.enums.FuZhongEnums; -import com.lyms.platform.common.enums.FyTypeEnums; -import com.lyms.platform.common.enums.GestaMonthEnums; -import com.lyms.platform.common.enums.GongJingEnums; -import com.lyms.platform.common.enums.JoinEnums; -import com.lyms.platform.common.enums.PregnancyExceptionEnums; -import com.lyms.platform.common.enums.PregnancyMethodEnums; -import com.lyms.platform.common.enums.QiDaiEnums; -import com.lyms.platform.common.enums.QuickenEnums; -import com.lyms.platform.common.enums.RenShenJieJuEnums; -import com.lyms.platform.common.enums.SXCauseEnums; -import com.lyms.platform.common.enums.SYJGEums; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.ServiceTypeEnums; -import com.lyms.platform.common.enums.SexEnum; -import com.lyms.platform.common.enums.TaiShuEnums; -import com.lyms.platform.common.enums.TpmcTypeEnums; -import com.lyms.platform.common.enums.WyTypeEnums; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; @@ -5789,6 +5762,20 @@ public class ViewFacade { model.setNextCheckItem(nextCheckItem); + StringBuffer diseases = new StringBuffer(); + if (CollectionUtils.isNotEmpty(checkModel.getDiseases())) + { + for (int i = 0, len = checkModel.getDiseases().size(); i < len; i++) { + if (i != len - 1) { + diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(checkModel.getDiseases().get(i)))); + diseases.append(","); + } else { + diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(checkModel.getDiseases().get(i)))); + } + } + } + model.setDiseases(diseases.toString()); + return model; } 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 6f8c525..81f06e7 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 @@ -276,6 +276,18 @@ public class BabyBuildResult { //居住类别 private String liveType; + + //是否开通疾病发生推送 1或者空没有开通 2开通 + private String openDisease; + + public String getOpenDisease() { + return openDisease; + } + + public void setOpenDisease(String openDisease) { + this.openDisease = openDisease; + } + public String getLiveType() { return liveType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java index 8f5a0d7..9037b65 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java @@ -673,6 +673,18 @@ public class BabyCheckPageResult { private List messages; + + //儿童疾病 + private String diseases; + + public String getDiseases() { + return diseases; + } + + public void setDiseases(String diseases) { + this.diseases = diseases; + } + public String getNextCheckItem() { return nextCheckItem; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java index e8efdde..35a1180 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java @@ -556,6 +556,17 @@ public class BabyCheckResult { private Integer endCase; private String outcome; + //儿童疾病 + private List diseases; + + public List getDiseases() { + return diseases; + } + + public void setDiseases(List diseases) { + this.diseases = diseases; + } + /*秦皇岛修改的儿保检查内容*/ public String getExercise() { return exercise; 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 2cd9c55..e4773b5 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 @@ -273,6 +273,17 @@ public class BabyPageResult implements IBasicResultConvert