jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7c99ab1607a79a8700e868996a30bb040ef37cf7

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

update

Showing 6 changed files with 73 additions and 60 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/BabySourceEnums.java View file @ 7c99ab1
1   -package com.lyms.platform.common.enums;
2   -
3   -import com.lyms.platform.common.utils.Config;
4   -import com.lyms.platform.common.utils.StringUtils;
5   -
6   -import java.util.ArrayList;
7   -import java.util.Arrays;
8   -import java.util.List;
9   -
10   -public enum BabySourceEnums {
11   - //来源 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院
12   - bs1(1,"健康查体"),
13   - bs2(2,"幼儿园转诊"),
14   - bs3(3,"基层转诊"),
15   - bs4(4,"本院")
16   - ;
17   -
18   - BabySourceEnums(Integer id, String name) {
19   - this.id = id;
20   - this.name = name;
21   - }
22   -
23   - private Integer id;
24   - private String name;
25   -
26   - public Integer getId() {
27   - return id;
28   - }
29   -
30   - public void setId(Integer id) {
31   - this.id = id;
32   - }
33   -
34   - public String getName() {
35   - return name;
36   - }
37   -
38   - public void setName(String name) {
39   - this.name = name;
40   - }
41   - //传进来ids有，号的字符,转成有，号的names
42   - public static String getNames(String ids){
43   - String names = "";
44   - String[] arrs = ids.split(",");
45   - for (String arr : arrs) {
46   - for (BabySourceEnums value : values()) {
47   - if (value.getId()==Integer.parseInt(arr)) {
48   - names+= value.getName()+",";
49   - }
50   - }
51   - }
52   - names = names.substring(0, names.lastIndexOf(","));
53   - return names;
54   - }
55   -}
platform-common/src/main/java/com/lyms/platform/common/enums/QhdBabyPsychologyEnums.java View file @ 7c99ab1
... ... @@ -98,6 +98,19 @@
98 98 }
99 99 return null;
100 100 }
  101 + public static String getNames(String ids){
  102 + String names = "";
  103 + String[] arrs = ids.split(",");
  104 + for (String arr : arrs) {
  105 + for (QhdBabyPsychologyEnums value : values()) {
  106 + if (value.getId()==Integer.parseInt(arr)) {
  107 + names+= value.getName()+",";
  108 + }
  109 + }
  110 + }
  111 + names = names.substring(0, names.lastIndexOf(","));
  112 + return names;
  113 + }
101 114 public static List<Map<String, Object>> getListMap(Integer mage) {
102 115 List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
103 116 for (QhdBabyPsychologyEnums value : values()) {
platform-common/src/main/java/com/lyms/platform/common/enums/QhdBabySourceEnums.java View file @ 7c99ab1
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +public enum QhdBabySourceEnums {
  4 + //来源 1：健康查体 2：幼儿园转诊 3:基层转诊 4：本院
  5 + bs1(1,"健康查体"),
  6 + bs2(2,"幼儿园转诊"),
  7 + bs3(3,"基层转诊"),
  8 + bs4(4,"本院")
  9 + ;
  10 +
  11 + QhdBabySourceEnums(Integer id, String name) {
  12 + this.id = id;
  13 + this.name = name;
  14 + }
  15 +
  16 + private Integer id;
  17 + private String name;
  18 +
  19 + public Integer getId() {
  20 + return id;
  21 + }
  22 +
  23 + public void setId(Integer id) {
  24 + this.id = id;
  25 + }
  26 +
  27 + public String getName() {
  28 + return name;
  29 + }
  30 +
  31 + public void setName(String name) {
  32 + this.name = name;
  33 + }
  34 + //传进来ids有，号的字符,转成有，号的names
  35 + public static String getNames(String ids){
  36 + String names = "";
  37 + String[] arrs = ids.split(",");
  38 + for (String arr : arrs) {
  39 + for (QhdBabySourceEnums value : values()) {
  40 + if (value.getId()==Integer.parseInt(arr)) {
  41 + names+= value.getName()+",";
  42 + }
  43 + }
  44 + }
  45 + names = names.substring(0, names.lastIndexOf(","));
  46 + return names;
  47 + }
  48 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 7c99ab1
... ... @@ -17,9 +17,7 @@
17 17 import com.lyms.platform.operate.web.service.BabyAfterVisitService;
18 18 import com.lyms.platform.operate.web.service.PatientWeightService;
19 19 import com.lyms.platform.operate.web.service.impl.BaseServiceImpl;
20   -import com.lyms.platform.operate.web.utils.BabyListTask;
21 20 import com.lyms.platform.operate.web.utils.MongoUtil;
22   -import com.lyms.platform.operate.web.utils.ReflectUtil;
23 21 import com.lyms.platform.permission.dao.master.CouponMapper;
24 22 import com.lyms.platform.permission.model.CheckItem;
25 23 import com.lyms.platform.permission.model.Organization;
... ... @@ -30,7 +28,6 @@
30 28 import com.lyms.platform.query.*;
31 29 import com.mongodb.BasicDBObject;
32 30 import org.apache.commons.collections.CollectionUtils;
33   -import org.apache.commons.lang.*;
34 31 import org.springframework.beans.factory.annotation.Autowired;
35 32 import org.springframework.beans.factory.annotation.Qualifier;
36 33 import org.springframework.data.domain.Sort;
... ... @@ -43,7 +40,6 @@
43 40 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
44 41 import org.springframework.stereotype.Component;
45 42  
46   -import javax.validation.constraints.Max;
47 43 import java.util.*;
48 44 import java.util.concurrent.Callable;
49 45 import java.util.concurrent.Future;
... ... @@ -1654,7 +1650,7 @@
1654 1650  
1655 1651 //秦皇岛 来源模块
1656 1652 base.setBabySource(StringUtils.isNotEmpty(model.getBabySource())?model.getBabySource():null);
1657   - base.setBabySourceNames(StringUtils.isNotEmpty(model.getBabySource())?BabySourceEnums.getNames(model.getBabySource()):null);
  1653 + base.setBabySourceNames(StringUtils.isNotEmpty(model.getBabySource())? QhdBabySourceEnums.getNames(model.getBabySource()):null);
1658 1654 base.setHealthCheckType(null!=model.getHealthCheckType()?model.getHealthCheckType():null);
1659 1655 base.setHealthCheckTypeScattered(StringUtils.isNotEmpty(model.getHealthCheckTypeScattered())?model.getHealthCheckTypeScattered():null);
1660 1656 base.setHealthCheckTypeWhole(null!=model.getHealthCheckTypeWhole()?model.getHealthCheckTypeWhole():null);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 7c99ab1
... ... @@ -6325,6 +6325,7 @@
6325 6325  
6326 6326 //秦皇岛-发育筛查模块
6327 6327 model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():"");
  6328 + model.setDevelopAssessNames(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?QhdBabyPsychologyEnums.getNames(checkModel.getDevelopAssess()):"");
6328 6329 model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():"");
6329 6330  
6330 6331 return model;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java View file @ 7c99ab1
... ... @@ -730,6 +730,8 @@
730 730 */
731 731 //发育评估
732 732 private String developAssess;
  733 + //展示页面使用
  734 + private String developAssessNames;
733 735 //其它
734 736 private String screeningOther;
735 737  
... ... @@ -739,6 +741,14 @@
739 741  
740 742 public void setDevelopAssess(String developAssess) {
741 743 this.developAssess = developAssess;
  744 + }
  745 +
  746 + public String getDevelopAssessNames() {
  747 + return developAssessNames;
  748 + }
  749 +
  750 + public void setDevelopAssessNames(String developAssessNames) {
  751 + this.developAssessNames = developAssessNames;
742 752 }
743 753  
744 754 public String getScreeningOther() {