Commit 139319141ee172a9442207ee35cbfbfd0be9c64c

Authored by yangfei
1 parent bd8eae44bf
Exists in master and in 1 other branch dev

产检增加字段

Showing 3 changed files with 345 additions and 25 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/GongJingEnums.java View file @ 1393191
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + * @auther yangfei
  5 + * @createTime 2017年06月13日 10时40分
  6 + * @discription
  7 + */
  8 +public class GongJingEnums {
  9 +
  10 + //横指
  11 + public enum HengZhi {
  12 + QISHANG("一横指", "1"),
  13 + QIXIA("二横指", "2"),
  14 + QICHIZJ ("三横指", "3");
  15 +
  16 + HengZhi(String name, String value) {
  17 + this.name = name;
  18 + this.value = value;
  19 + }
  20 +
  21 + private String name;
  22 + private String value;
  23 +
  24 + public String getName() {
  25 + return name;
  26 + }
  27 +
  28 + public void setName(String name) {
  29 + this.name = name;
  30 + }
  31 +
  32 + public String getValue() {
  33 + return value;
  34 + }
  35 +
  36 + public void setValue(String value) {
  37 + this.value = value;
  38 + }
  39 + }
  40 +
  41 + //阴道检测
  42 + public enum GongGao {
  43 + QISHANG("脐上", "1"),
  44 + QIXIA("脐下", "2"),
  45 + QICHIZJ ("脐耻之间", "3"),
  46 + CGLHS("耻骨联合上", "4");
  47 +
  48 + GongGao(String name, String value) {
  49 + this.name = name;
  50 + this.value = value;
  51 + }
  52 +
  53 + private String name;
  54 + private String value;
  55 +
  56 + public String getName() {
  57 + return name;
  58 + }
  59 +
  60 + public void setName(String name) {
  61 + this.name = name;
  62 + }
  63 +
  64 + public String getValue() {
  65 + return value;
  66 + }
  67 +
  68 + public void setValue(String value) {
  69 + this.value = value;
  70 + }
  71 + }
  72 +
  73 + //阴道检测
  74 + public enum YDJianCe {
  75 + YiZuo("已做", "1"),
  76 + WeiZzuo("未做", "2");
  77 +
  78 + YDJianCe(String name, String value) {
  79 + this.name = name;
  80 + this.value = value;
  81 + }
  82 +
  83 + private String name;
  84 + private String value;
  85 +
  86 + public String getName() {
  87 + return name;
  88 + }
  89 +
  90 + public void setName(String name) {
  91 + this.name = name;
  92 + }
  93 +
  94 + public String getValue() {
  95 + return value;
  96 + }
  97 +
  98 + public void setValue(String value) {
  99 + this.value = value;
  100 + }
  101 + }
  102 +
  103 + //先露位置
  104 + public enum XLWeiZhi {
  105 + O("S-4", "1"),
  106 + O1("S-3", "2"),
  107 + O2("S-2", "3"),
  108 + O3("S-1", "4"),
  109 + O4("S+1", "5"),
  110 + O5("S+2", "6"),
  111 + O6("S+3", "7");
  112 +
  113 +
  114 + XLWeiZhi(String name, String value) {
  115 + this.name = name;
  116 + this.value = value;
  117 + }
  118 +
  119 + private String name;
  120 + private String value;
  121 +
  122 + public String getName() {
  123 + return name;
  124 + }
  125 +
  126 + public void setName(String name) {
  127 + this.name = name;
  128 + }
  129 +
  130 + public String getValue() {
  131 + return value;
  132 + }
  133 +
  134 + public void setValue(String value) {
  135 + this.value = value;
  136 + }
  137 + }
  138 +
  139 +
  140 + //宫颈位置
  141 + public enum WeiZhi {
  142 + // 宫颈硬度(选择框为:软、中、硬、其他(填写))
  143 + // 4.宫颈位置(选择框为:前、中、后、其他(填写))
  144 + Ruan("前", "前"), Zhong("中", "中"), Ying("后", "后");
  145 +
  146 + WeiZhi(String name, String value) {
  147 + this.name = name;
  148 + this.value = value;
  149 + }
  150 +
  151 + private String name;
  152 + private String value;
  153 +
  154 + public String getName() {
  155 + return name;
  156 + }
  157 +
  158 + public void setName(String name) {
  159 + this.name = name;
  160 + }
  161 +
  162 + public String getValue() {
  163 + return value;
  164 + }
  165 +
  166 + public void setValue(String value) {
  167 + this.value = value;
  168 + }
  169 + }
  170 +
  171 + //宫颈硬度
  172 + public enum YinDu {
  173 + // 宫颈硬度(选择框为:软、中、硬、其他(填写))
  174 + // 4.宫颈位置(选择框为:前、中、后、其他(填写))
  175 + Ruan("软", "软"), Zhong("中", "中"), Ying("硬", "硬");
  176 +
  177 + YinDu(String name, String value) {
  178 + this.name = name;
  179 + this.value = value;
  180 + }
  181 +
  182 + private String name;
  183 + private String value;
  184 +
  185 + public String getName() {
  186 + return name;
  187 + }
  188 +
  189 + public void setName(String name) {
  190 + this.name = name;
  191 + }
  192 +
  193 + public String getValue() {
  194 + return value;
  195 + }
  196 +
  197 + public void setValue(String value) {
  198 + this.value = value;
  199 + }
  200 + }
  201 +
  202 +
  203 +}
platform-common/src/main/java/com/lyms/platform/common/enums/TaiShuEnums.java View file @ 1393191
... ... @@ -7,18 +7,18 @@
7 7 * Created by Administrator on 2016/6/21 0021.
8 8 */
9 9 public enum TaiShuEnums {
10   - O("单胎","1"),
11   - O1("双胎","2"),
12   - O2("三胎","3"),
13   - O3("四胎","4"),
14   - O4("五胎","5"),
15   - O5("六胎","6"),
16   - O6("七胎","7");
  10 + O("单胎", "1"),
  11 + O1("双胎", "2"),
  12 + O2("三胎", "3"),
  13 + O3("四胎", "4"),
  14 + O4("五胎", "5"),
  15 + O5("六胎", "6"),
  16 + O6("七胎", "7");
17 17  
18   - public static String getTitle(String id){
19   - if (StringUtils.isNotEmpty(id)){
20   - for(TaiShuEnums enums:values()){
21   - if(enums.getId().equals(id)){
  18 + public static String getTitle(String id) {
  19 + if (StringUtils.isNotEmpty(id)) {
  20 + for (TaiShuEnums enums : values()) {
  21 + if (enums.getId().equals(id)) {
22 22 return enums.getName();
23 23 }
24 24 }
... ... @@ -26,16 +26,9 @@
26 26 return null;
27 27 }
28 28  
29   - public enum TaiPanEnums{
30   - O("1个","1"),
31   - O1("2个","2"),
32   - O2("3个","3"),
33   - O3("4个","4"),
34   - O4("5个","5"),
35   - O5("6个","6"),
36   - O6("7个","7");
37   -
38   - private TaiPanEnums(String name,String id){
  29 + public enum TmEnums {
  30 + O("未破","1"),O1("已破","2");
  31 + private TmEnums(String name,String id){
39 32 this.name=name;
40 33 this.id=id;
41 34 }
42 35  
43 36  
... ... @@ -59,15 +52,48 @@
59 52 }
60 53 }
61 54  
  55 + public enum TaiPanEnums {
  56 + O("1个", "1"),
  57 + O1("2个", "2"),
  58 + O2("3个", "3"),
  59 + O3("4个", "4"),
  60 + O4("5个", "5"),
  61 + O5("6个", "6"),
  62 + O6("7个", "7");
  63 +
  64 + private TaiPanEnums(String name, String id) {
  65 + this.name = name;
  66 + this.id = id;
  67 + }
  68 +
  69 + private String name;
  70 + private String id;
  71 +
  72 + public String getId() {
  73 + return id;
  74 + }
  75 +
  76 + public void setId(String id) {
  77 + this.id = id;
  78 + }
  79 +
  80 + public String getName() {
  81 + return name;
  82 + }
  83 +
  84 + public void setName(String name) {
  85 + this.name = name;
  86 + }
  87 + }
  88 +
62 89 public static String getTpNameById(String id) {
63 90  
64   - if (StringUtils.isEmpty(id)){
  91 + if (StringUtils.isEmpty(id)) {
65 92 return null;
66 93 }
67 94  
68 95 for (TpEnums e : TpEnums.values()) {
69   - if (e.getId().equals(id))
70   - {
  96 + if (e.getId().equals(id)) {
71 97 return e.getName();
72 98 }
73 99 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 1393191
... ... @@ -2148,6 +2148,13 @@
2148 2148 map.put("getTaiPan", getTaiPan());
2149 2149 map.put("getTaiShu", getTaiShu());
2150 2150 map.put("fuzhong", getFuZhong());
  2151 + map.put("getTaiMo", getTm());
  2152 + map.put("getGjyd", getGJYD());
  2153 + map.put("getGjwz", getGJWZ());
  2154 + map.put("getXlwz", getXLWZ());
  2155 + map.put("getYdjc", getYDJC());
  2156 + map.put("getGongGao", getGongGao());
  2157 + map.put("getHengZhi", getHengZhi());
2151 2158 map.put("getHighRisk", basicConfigFacade.getHighRisk());
2152 2159 map.put("jws", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.JIWANGSHI_ID));
2153 2160 map.put("xx", basicConfigFacade.getBaseicConfigByParentId(SystemConfig.XUEXING));
... ... @@ -2195,6 +2202,90 @@
2195 2202 }
2196 2203 return list;
2197 2204 }
  2205 +
  2206 + //胎膜
  2207 + public List<Object> getTm() {
  2208 + List<Object> list = new ArrayList<>();
  2209 + for (TaiShuEnums.TmEnums enums : TaiShuEnums.TmEnums.values()) {
  2210 + Map<String, Object> resultMap = new HashMap<>();
  2211 + resultMap.put("id", enums.getId());
  2212 + resultMap.put("name", enums.getName());
  2213 + list.add(resultMap);
  2214 + }
  2215 + return list;
  2216 + }
  2217 + //宫颈硬度
  2218 + public List<Object> getGJYD() {
  2219 + List<Object> list = new ArrayList<>();
  2220 + for (GongJingEnums.YinDu enums : GongJingEnums.YinDu.values()) {
  2221 + Map<String, Object> resultMap = new HashMap<>();
  2222 + resultMap.put("id", enums.getValue());
  2223 + resultMap.put("name", enums.getName());
  2224 + list.add(resultMap);
  2225 + }
  2226 + return list;
  2227 + }
  2228 + //宫颈位置
  2229 + public List<Object> getGJWZ() {
  2230 + List<Object> list = new ArrayList<>();
  2231 + for (GongJingEnums.WeiZhi enums : GongJingEnums.WeiZhi.values()) {
  2232 + Map<String, Object> resultMap = new HashMap<>();
  2233 + resultMap.put("id", enums.getValue());
  2234 + resultMap.put("name", enums.getName());
  2235 + list.add(resultMap);
  2236 + }
  2237 + return list;
  2238 + }
  2239 +
  2240 + //先露位置
  2241 + public List<Object> getXLWZ() {
  2242 + List<Object> list = new ArrayList<>();
  2243 + for (GongJingEnums.XLWeiZhi enums : GongJingEnums.XLWeiZhi.values()) {
  2244 + Map<String, Object> resultMap = new HashMap<>();
  2245 + resultMap.put("id", enums.getValue());
  2246 + resultMap.put("name", enums.getName());
  2247 + list.add(resultMap);
  2248 + }
  2249 + return list;
  2250 + }
  2251 +
  2252 + //阴道检测
  2253 + public List<Object> getYDJC() {
  2254 + List<Object> list = new ArrayList<>();
  2255 + for (GongJingEnums.YDJianCe enums : GongJingEnums.YDJianCe.values()) {
  2256 + Map<String, Object> resultMap = new HashMap<>();
  2257 + resultMap.put("id", enums.getValue());
  2258 + resultMap.put("name", enums.getName());
  2259 + list.add(resultMap);
  2260 + }
  2261 + return list;
  2262 + }
  2263 +
  2264 + //宫高
  2265 + public List<Object> getGongGao() {
  2266 + List<Object> list = new ArrayList<>();
  2267 + for (GongJingEnums.GongGao enums : GongJingEnums.GongGao.values()) {
  2268 + Map<String, Object> resultMap = new HashMap<>();
  2269 + resultMap.put("id", enums.getValue());
  2270 + resultMap.put("name", enums.getName());
  2271 + list.add(resultMap);
  2272 + }
  2273 + return list;
  2274 + }
  2275 +
  2276 + //横zhi
  2277 + public List<Object> getHengZhi() {
  2278 + List<Object> list = new ArrayList<>();
  2279 + for (GongJingEnums.HengZhi enums : GongJingEnums.HengZhi.values()) {
  2280 + Map<String, Object> resultMap = new HashMap<>();
  2281 + resultMap.put("id", enums.getValue());
  2282 + resultMap.put("name", enums.getName());
  2283 + list.add(resultMap);
  2284 + }
  2285 + return list;
  2286 + }
  2287 +
  2288 +
2198 2289  
2199 2290 //胎方位
2200 2291 public List<Object> getFetPosition() {