jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1c45d72974da868d74354c3f88fcc09c10c68a8b

Authored by liquanyu
1 parent b4a7034b1e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

儿童疾病

Showing 8 changed files with 68 additions and 29 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java View file @ 1c45d72
... ... @@ -55,7 +55,8 @@
55 55 XTTX(41,"血糖测量提醒",21,"1"),
56 56 XYTX(42,"血压测量提醒",21,"1"),
57 57 NOSERVICE(43,"无服务",18,"0,1,2,3,4"),
58   - CHWJTX(44,"产后问卷提醒",4,"3");
  58 + CHWJTX(44,"产后问卷提醒",4,"3"),
  59 + ETJBTX(15,"儿保疾病提醒",14,"2");
59 60  
60 61 private SmsServiceEnums(int id,String name,int pid,String serviceObj){
61 62 this.id = id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 1c45d72
... ... @@ -1688,6 +1688,8 @@
1688 1688 result.setDueWeek(model.getDueWeek());
1689 1689 result.setDueDay(model.getDueDay());
1690 1690  
  1691 + result.setOpenDisease(StringUtils.isNotEmpty(model.getOpenDisease()) ? model.getOpenDisease() : "1");
  1692 +
1691 1693 if (StringUtils.isNotEmpty(model.getDeliverOrg())) {
1692 1694 result.setDeliverOrg(model.getDeliverOrg());
1693 1695 // if (org.apache.commons.lang.math.NumberUtils.isNumber(model.getDeliverOrg())) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 1c45d72
... ... @@ -1982,6 +1982,7 @@
1982 1982 model.setEyeAdviceName(eyeAdviceName);
1983 1983 model.setEyeGuideSuggestions(checkModel.getEyeGuideSuggestions());
1984 1984 model.setConfigItemId(checkModel.getConfigItemId());
  1985 + model.setDiseases(checkModel.getDiseases());
1985 1986 return model;
1986 1987  
1987 1988 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 1c45d72
... ... @@ -18,6 +18,7 @@
18 18 import java.util.Set;
19 19  
20 20 import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
  21 +import com.lyms.platform.common.enums.*;
21 22 import com.lyms.platform.common.utils.*;
22 23 import com.lyms.platform.common.utils.HttpClientUtil;
23 24 import com.lyms.platform.operate.web.request.MessagesResult;
... ... @@ -63,34 +64,6 @@
63 64 import com.lyms.platform.biz.service.YunBookbuildingService;
64 65 import com.lyms.platform.common.constants.ErrorCodeConstants;
65 66 import com.lyms.platform.common.dao.operator.MongoQuery;
66   -import com.lyms.platform.common.enums.BasisEnums;
67   -import com.lyms.platform.common.enums.CZFmTypeEnums;
68   -import com.lyms.platform.common.enums.CfEnums;
69   -import com.lyms.platform.common.enums.DeathCauseEnums;
70   -import com.lyms.platform.common.enums.EyeExaminationEnums;
71   -import com.lyms.platform.common.enums.FetalEnums;
72   -import com.lyms.platform.common.enums.FetalPositionEnums;
73   -import com.lyms.platform.common.enums.FitnessEnums;
74   -import com.lyms.platform.common.enums.FmTypeEnums;
75   -import com.lyms.platform.common.enums.FuZhongEnums;
76   -import com.lyms.platform.common.enums.FyTypeEnums;
77   -import com.lyms.platform.common.enums.GestaMonthEnums;
78   -import com.lyms.platform.common.enums.GongJingEnums;
79   -import com.lyms.platform.common.enums.JoinEnums;
80   -import com.lyms.platform.common.enums.PregnancyExceptionEnums;
81   -import com.lyms.platform.common.enums.PregnancyMethodEnums;
82   -import com.lyms.platform.common.enums.QiDaiEnums;
83   -import com.lyms.platform.common.enums.QuickenEnums;
84   -import com.lyms.platform.common.enums.RenShenJieJuEnums;
85   -import com.lyms.platform.common.enums.SXCauseEnums;
86   -import com.lyms.platform.common.enums.SYJGEums;
87   -import com.lyms.platform.common.enums.ServiceStatusEnums;
88   -import com.lyms.platform.common.enums.ServiceTypeEnums;
89   -import com.lyms.platform.common.enums.SexEnum;
90   -import com.lyms.platform.common.enums.TaiShuEnums;
91   -import com.lyms.platform.common.enums.TpmcTypeEnums;
92   -import com.lyms.platform.common.enums.WyTypeEnums;
93   -import com.lyms.platform.common.enums.YnEnums;
94 67 import com.lyms.platform.common.result.BaseObjectResponse;
95 68 import com.lyms.platform.common.result.BaseResponse;
96 69 import com.lyms.platform.common.result.RespBuilder;
... ... @@ -5788,6 +5761,20 @@
5788 5761 }
5789 5762  
5790 5763 model.setNextCheckItem(nextCheckItem);
  5764 +
  5765 + StringBuffer diseases = new StringBuffer();
  5766 + if (CollectionUtils.isNotEmpty(checkModel.getDiseases()))
  5767 + {
  5768 + for (int i = 0, len = checkModel.getDiseases().size(); i < len; i++) {
  5769 + if (i != len - 1) {
  5770 + diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(checkModel.getDiseases().get(i))));
  5771 + diseases.append(",");
  5772 + } else {
  5773 + diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(checkModel.getDiseases().get(i))));
  5774 + }
  5775 + }
  5776 + }
  5777 + model.setDiseases(diseases.toString());
5791 5778  
5792 5779 return model;
5793 5780  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ 1c45d72
... ... @@ -276,6 +276,18 @@
276 276 //居住类别
277 277 private String liveType;
278 278  
  279 +
  280 + //是否开通疾病发生推送 1或者空没有开通 2开通
  281 + private String openDisease;
  282 +
  283 + public String getOpenDisease() {
  284 + return openDisease;
  285 + }
  286 +
  287 + public void setOpenDisease(String openDisease) {
  288 + this.openDisease = openDisease;
  289 + }
  290 +
279 291 public String getLiveType() {
280 292 return liveType;
281 293 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ 1c45d72
... ... @@ -673,6 +673,18 @@
673 673  
674 674 private List<String> messages;
675 675  
  676 +
  677 + //儿童疾病
  678 + private String diseases;
  679 +
  680 + public String getDiseases() {
  681 + return diseases;
  682 + }
  683 +
  684 + public void setDiseases(String diseases) {
  685 + this.diseases = diseases;
  686 + }
  687 +
676 688 public String getNextCheckItem() {
677 689 return nextCheckItem;
678 690 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java View file @ 1c45d72
... ... @@ -556,6 +556,17 @@
556 556 private Integer endCase;
557 557 private String outcome;
558 558  
  559 + //儿童疾病
  560 + private List<String> diseases;
  561 +
  562 + public List<String> getDiseases() {
  563 + return diseases;
  564 + }
  565 +
  566 + public void setDiseases(List<String> diseases) {
  567 + this.diseases = diseases;
  568 + }
  569 +
559 570 /*秦皇岛修改的儿保检查内容*/
560 571 public String getExercise() {
561 572 return exercise;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java View file @ 1c45d72
... ... @@ -273,6 +273,17 @@
273 273  
274 274 private String numberCode;
275 275  
  276 + //是否开通疾病发生推送 1或者空没有开通 2开通
  277 + private String openDisease;
  278 +
  279 + public String getOpenDisease() {
  280 + return openDisease;
  281 + }
  282 +
  283 + public void setOpenDisease(String openDisease) {
  284 + this.openDisease = openDisease;
  285 + }
  286 +
276 287 public String getNumberCode() {
277 288 return numberCode;
278 289 }
... ... @@ -1133,6 +1144,8 @@
1133 1144 setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
1134 1145 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
1135 1146 setFileCode(destModel.getFileCode());
  1147 +
  1148 + setOpenDisease((StringUtils.isEmpty(destModel.getOpenDisease()) || "1".equals(destModel.getOpenDisease())) ? "未开通" : "已开通" );
1136 1149 return this;
1137 1150 }
1138 1151