jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 044536648fe28928bc9f022db5c84d5cdc0ec9fa

Authored by litao@lymsh.com
1 parent 1bda09e70e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

加字段

Showing 8 changed files with 188 additions and 7 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/QuickenEnums.java View file @ 0445366
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import com.lyms.platform.common.utils.StringUtils;
  4 +
  5 +/**
  6 + * 胎动情况
  7 + */
  8 +public enum QuickenEnums {
  9 + ONE(0, "自述良好"),
  10 + TWO(1, "胎动频繁"),
  11 + THREE(2, "胎动少"),
  12 + FOUR(3, "胎动消失"),
  13 + FIVE(4, "不详");
  14 +
  15 + private Integer id;
  16 + private String name;
  17 +
  18 + public static QuickenEnums get(Integer id) {
  19 + QuickenEnums[] values = QuickenEnums.values();
  20 + for (QuickenEnums value : values) {
  21 + if (value.getId() == id) {
  22 + return value;
  23 + }
  24 + }
  25 + return null;
  26 + }
  27 +
  28 + public static String getName(String id) {
  29 + if(StringUtils.isEmpty(id)) {
  30 + return null;
  31 + }
  32 + int i = Integer.parseInt(id);
  33 + QuickenEnums[] values = QuickenEnums.values();
  34 + for (QuickenEnums value : values) {
  35 + if (value.id == i) {
  36 + return value.name;
  37 + }
  38 + }
  39 + return null;
  40 + }
  41 +
  42 + QuickenEnums(Integer id, String name){
  43 + this.id = id;
  44 + this.name = name;
  45 + }
  46 +
  47 + public Integer getId() {
  48 + return id;
  49 + }
  50 +
  51 + public void setId(Integer id) {
  52 + this.id = id;
  53 + }
  54 +
  55 + public String getName() {
  56 + return name;
  57 + }
  58 +
  59 + public void setName(String name) {
  60 + this.name = name;
  61 + }
  62 +
  63 +}
platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java View file @ 0445366
... ... @@ -21,6 +21,26 @@
21 21 /** 处理意见 */
22 22 private Map<String, List<String>> treatmentOpinion2;
23 23 private List<String> treatmentOpinion2Types;
  24 + /** 胎动 */
  25 + private String quicken;
  26 + /** 胎动备注 */
  27 + private String quickenRemark;
  28 +
  29 + public String getQuicken() {
  30 + return quicken;
  31 + }
  32 +
  33 + public void setQuicken(String quicken) {
  34 + this.quicken = quicken;
  35 + }
  36 +
  37 + public String getQuickenRemark() {
  38 + return quickenRemark;
  39 + }
  40 +
  41 + public void setQuickenRemark(String quickenRemark) {
  42 + this.quickenRemark = quickenRemark;
  43 + }
24 44  
25 45 public List<String> getTreatmentOpinion2Types() {
26 46 return treatmentOpinion2Types;
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 0445366
... ... @@ -21,6 +21,26 @@
21 21 /** 处理意见 */
22 22 private Map<String, List<String>> treatmentOpinion2;
23 23 private List<String> treatmentOpinion2Types;
  24 + /** 胎动 */
  25 + private String quicken;
  26 + /** 胎动备注 */
  27 + private String quickenRemark;
  28 +
  29 + public String getQuicken() {
  30 + return quicken;
  31 + }
  32 +
  33 + public void setQuicken(String quicken) {
  34 + this.quicken = quicken;
  35 + }
  36 +
  37 + public String getQuickenRemark() {
  38 + return quickenRemark;
  39 + }
  40 +
  41 + public void setQuickenRemark(String quickenRemark) {
  42 + this.quickenRemark = quickenRemark;
  43 + }
24 44  
25 45 public List<String> getTreatmentOpinion2Types() {
26 46 return treatmentOpinion2Types;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 0445366
... ... @@ -5,10 +5,7 @@
5 5 import com.lyms.platform.common.enums.*;
6 6 import com.lyms.platform.common.result.BaseObjectResponse;
7 7 import com.lyms.platform.common.result.BaseResponse;
8   -import com.lyms.platform.common.utils.Assert;
9   -import com.lyms.platform.common.utils.DateUtil;
10   -import com.lyms.platform.common.utils.JsonUtil;
11   -import com.lyms.platform.common.utils.SystemConfig;
  8 +import com.lyms.platform.common.utils.*;
12 9 import com.lyms.platform.operate.web.request.*;
13 10 import com.lyms.platform.operate.web.result.*;
14 11 import com.lyms.platform.operate.web.utils.InitDataUtils;
... ... @@ -24,6 +21,7 @@
24 21 import org.apache.commons.collections.MapUtils;
25 22 import org.apache.commons.lang.StringUtils;
26 23 import org.apache.commons.lang.math.NumberUtils;
  24 +import org.apache.tools.ant.taskdefs.Ant;
27 25 import org.slf4j.Logger;
28 26 import org.slf4j.LoggerFactory;
29 27 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -1936,6 +1934,18 @@
1936 1934 antExChuQuery.setStart(max);
1937 1935 //获取初诊记录
1938 1936 List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
  1937 + if (CollectionUtils.isNotEmpty(antExChulist)) {
  1938 + AntExChuModel latelyAntExChuModel = null; /** 最近的一次初诊 */
  1939 + for (AntExChuModel antExChuModel : antExChulist) {
  1940 + if(latelyAntExChuModel == null || antExChuModel.getCheckTime().getTime() > latelyAntExChuModel.getCheckTime().getTime()) {
  1941 + latelyAntExChuModel = antExChuModel;
  1942 + }
  1943 + }
  1944 + latelyAntExChuModel.setPregnancyTimes(latelyAntExChuModel.getPregnancyTimes()); // 孕次
  1945 + latelyAntExChuModel.setProdTime(latelyAntExChuModel.getProdTime()); // 产次
  1946 + latelyAntExChuModel.setAbortion(latelyAntExChuModel.getAbortion()); // 流产
  1947 + latelyAntExChuModel.setSurvFetus(latelyAntExChuModel.getSurvFetus()); // 存活胎儿数
  1948 + }
1939 1949  
1940 1950 HighScoreResult highScoreResult = findLastRisk(patients.getPid(), false);
1941 1951 AntExQuery antExQuery = new AntExQuery();
... ... @@ -2116,6 +2126,8 @@
2116 2126 }
2117 2127 antenatalExaminationResult.setTreatmentOpinion2(restTreatmentOpinion2);
2118 2128 antenatalExaminationResult.setTreatmentOpinion2Types(examinationModel.getTreatmentOpinion2Types());
  2129 + antenatalExaminationResult.setQuicken(examinationModel.getQuicken());
  2130 + antenatalExaminationResult.setQuickenRemark(examinationModel.getQuickenRemark());
2119 2131  
2120 2132 antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
2121 2133 antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
... ... @@ -2178,6 +2190,8 @@
2178 2190 }
2179 2191 antexChuResult.setTreatmentOpinion2(restTreatmentOpinion2);
2180 2192 antexChuResult.setTreatmentOpinion2Types(antExChuModel.getTreatmentOpinion2Types());
  2193 + antexChuResult.setQuicken(antExChuModel.getQuicken());
  2194 + antexChuResult.setQuickenRemark(antExChuModel.getQuickenRemark());
2181 2195  
2182 2196 object = antexChuResult;
2183 2197 }
... ... @@ -2314,6 +2328,9 @@
2314 2328  
2315 2329 public BaseResponse getEnums() {
2316 2330 Map<String, Object> map = new HashMap<>();
  2331 + // 胎动情况
  2332 + map.put("quickenEnum", EnumUtil.toJson(QuickenEnums.class));
  2333 +
2317 2334 map.put("getFetPosition", InitDataUtils.getFetPosition());
2318 2335 map.put("getFetal",InitDataUtils. getFetal());
2319 2336 map.put("getJoin", InitDataUtils.getJoin());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 0445366
... ... @@ -1770,9 +1770,6 @@
1770 1770  
1771 1771 Map<String, Object> map = new HashMap<>();
1772 1772  
1773   - map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
1774   - map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
1775   -
1776 1773 /* 基本信息 */
1777 1774 //孕妇基本信息
1778 1775 map.put("id", data.getId());
... ... @@ -1806,6 +1803,8 @@
1806 1803  
1807 1804 map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
1808 1805 map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types()));
  1806 + map.put("quicken", QuickenEnums.getName(data.getQuicken()));
  1807 + map.put("quickenRemark", data.getQuickenRemark());
1809 1808  
1810 1809 //早孕期病毒检测
1811 1810 // private String zyqbdjc;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java View file @ 0445366
... ... @@ -22,7 +22,27 @@
22 22  
23 23 private Map<String, List<String>> treatmentOpinion2;
24 24 private List<String> treatmentOpinion2Types;
  25 + /** 胎动 */
  26 + private String quicken;
  27 + /** 胎动备注 */
  28 + private String quickenRemark;
25 29  
  30 + public String getQuicken() {
  31 + return quicken;
  32 + }
  33 +
  34 + public void setQuicken(String quicken) {
  35 + this.quicken = quicken;
  36 + }
  37 +
  38 + public String getQuickenRemark() {
  39 + return quickenRemark;
  40 + }
  41 +
  42 + public void setQuickenRemark(String quickenRemark) {
  43 + this.quickenRemark = quickenRemark;
  44 + }
  45 +
26 46 public Map<String, List<String>> getTreatmentOpinion2() {
27 47 return treatmentOpinion2;
28 48 }
... ... @@ -1208,6 +1228,8 @@
1208 1228  
1209 1229 antExChuModel.setTreatmentOpinion2(treatmentOpinion2);
1210 1230 antExChuModel.setTreatmentOpinion2Types(treatmentOpinion2Types);
  1231 + antExChuModel.setQuicken(quicken);
  1232 + antExChuModel.setQuickenRemark(quickenRemark);
1211 1233  
1212 1234 antExChuModel.setAntExcAddOthers(antExcAddOthers);
1213 1235 antExChuModel.setSurvFetus(survFetus);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 0445366
... ... @@ -18,6 +18,26 @@
18 18 /** 处理意见 */
19 19 private Map<String, List<Map<String, Object>>> treatmentOpinion2;
20 20 private List<String> treatmentOpinion2Types;
  21 + /** 胎动 */
  22 + private String quicken;
  23 + /** 胎动备注 */
  24 + private String quickenRemark;
  25 +
  26 + public String getQuicken() {
  27 + return quicken;
  28 + }
  29 +
  30 + public void setQuicken(String quicken) {
  31 + this.quicken = quicken;
  32 + }
  33 +
  34 + public String getQuickenRemark() {
  35 + return quickenRemark;
  36 + }
  37 +
  38 + public void setQuickenRemark(String quickenRemark) {
  39 + this.quickenRemark = quickenRemark;
  40 + }
21 41  
22 42 public List<String> getTreatmentOpinion2Types() {
23 43 return treatmentOpinion2Types;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 0445366
... ... @@ -18,6 +18,26 @@
18 18 /** 处理意见 */
19 19 private Map<String, List<Map<String, Object>>> treatmentOpinion2;
20 20 private List<String> treatmentOpinion2Types;
  21 + /** 胎动 */
  22 + private String quicken;
  23 + /** 胎动备注 */
  24 + private String quickenRemark;
  25 +
  26 + public String getQuicken() {
  27 + return quicken;
  28 + }
  29 +
  30 + public void setQuicken(String quicken) {
  31 + this.quicken = quicken;
  32 + }
  33 +
  34 + public String getQuickenRemark() {
  35 + return quickenRemark;
  36 + }
  37 +
  38 + public void setQuickenRemark(String quickenRemark) {
  39 + this.quickenRemark = quickenRemark;
  40 + }
21 41  
22 42 public List<String> getTreatmentOpinion2Types() {
23 43 return treatmentOpinion2Types;