jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a9b945a5d4388e1533b94050e5c46db05c2476b8

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

孕产妇管理 建档孕周添加

Showing 3 changed files with 117 additions and 77 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ a9b945a
... ... @@ -13,7 +13,7 @@
13 13 * Created by Administrator on 2016/6/23 0023.
14 14 */
15 15 public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patients> {
16   - public static final String SPIT="-";
  16 + public static final String SPIT = "-";
17 17 private String id;
18 18 //名称
19 19 private String name;
20 20  
... ... @@ -24,10 +24,10 @@
24 24 //产后时间
25 25 private String cTime;
26 26 //产检次数
27   - private int cTimes=0;
  27 + private int cTimes = 0;
28 28  
29 29 //产检次数
30   - private int cHTimes=0;
  30 + private int cHTimes = 0;
31 31  
32 32 //产检医生
33 33 private String checkDoctor;
... ... @@ -68,6 +68,10 @@
68 68 //建档号
69 69 private String fileCode;
70 70  
  71 + //建档孕周
  72 + private String createdWeek;
  73 +
  74 +
71 75 /*********唐山滦县导出产妇健康管理增加字段********/
72 76 private String lastMenses;
73 77 private int cjTimes;
... ... @@ -80,6 +84,14 @@
80 84 private String chfs;
81 85 private String chfc;
82 86  
  87 + public String getCreatedWeek() {
  88 + return createdWeek;
  89 + }
  90 +
  91 + public void setCreatedWeek(String createdWeek) {
  92 + this.createdWeek = createdWeek;
  93 + }
  94 +
83 95 public String getLastMenses() {
84 96 return lastMenses;
85 97 }
... ... @@ -161,7 +173,7 @@
161 173 }
162 174  
163 175 public String getFileCode() {
164   - if(null==fileCode){
  176 + if (null == fileCode) {
165 177 return SPIT;
166 178 }
167 179 return fileCode;
... ... @@ -172,7 +184,7 @@
172 184 }
173 185  
174 186 public String getTireNumber() {
175   - if(StringUtils.isEmpty(tireNumber)){
  187 + if (StringUtils.isEmpty(tireNumber)) {
176 188 return SPIT;
177 189 }
178 190 return tireNumber;
... ... @@ -191,7 +203,7 @@
191 203 }
192 204  
193 205 public String getbTime() {
194   - if(StringUtils.isEmpty(bTime)){
  206 + if (StringUtils.isEmpty(bTime)) {
195 207 return SPIT;
196 208 }
197 209  
... ... @@ -203,7 +215,7 @@
203 215 }
204 216  
205 217 public String getRegisterAddr() {
206   - if(StringUtils.isEmpty(registerAddr)){
  218 + if (StringUtils.isEmpty(registerAddr)) {
207 219 return SPIT;
208 220 }
209 221 return registerAddr;
... ... @@ -214,7 +226,7 @@
214 226 }
215 227  
216 228 public String getAddr() {
217   - if(StringUtils.isEmpty(addr)){
  229 + if (StringUtils.isEmpty(addr)) {
218 230 return SPIT;
219 231 }
220 232 return addr;
... ... @@ -225,7 +237,7 @@
225 237 }
226 238  
227 239 public String getFirstBH() {
228   - if(StringUtils.isEmpty(firstBH)){
  240 + if (StringUtils.isEmpty(firstBH)) {
229 241 return SPIT;
230 242 }
231 243 return firstBH;
... ... @@ -236,7 +248,7 @@
236 248 }
237 249  
238 250 public String getfCh() {
239   - if(StringUtils.isEmpty(fCh)){
  251 + if (StringUtils.isEmpty(fCh)) {
240 252 return SPIT;
241 253 }
242 254 return fCh;
... ... @@ -296,7 +308,7 @@
296 308  
297 309 public String getNextCheckTime() {
298 310  
299   - if(org.apache.commons.lang.StringUtils.isEmpty(nextCheckTime)){
  311 + if (org.apache.commons.lang.StringUtils.isEmpty(nextCheckTime)) {
300 312 return SPIT;
301 313 }
302 314 return nextCheckTime;
... ... @@ -315,7 +327,7 @@
315 327 }
316 328  
317 329 public String getCheckDoctor() {
318   - if(null==checkDoctor){
  330 + if (null == checkDoctor) {
319 331 return SPIT;
320 332 }
321 333 return checkDoctor;
... ... @@ -326,7 +338,7 @@
326 338 }
327 339  
328 340 public String getcTime() {
329   - if(org.apache.commons.lang.StringUtils.isEmpty(cTime)){
  341 + if (org.apache.commons.lang.StringUtils.isEmpty(cTime)) {
330 342 return SPIT;
331 343 }
332 344 return cTime;
... ... @@ -346,7 +358,7 @@
346 358  
347 359  
348 360 public String getDueWeek() {
349   - if(null==dueWeek){
  361 + if (null == dueWeek) {
350 362 return SPIT;
351 363 }
352 364 return dueWeek;
353 365  
... ... @@ -366,9 +378,10 @@
366 378  
367 379 public String getlName() {
368 380  
369   - if(null==lName){
  381 + if (null == lName) {
370 382 return SPIT;
371   - }return lName;
  383 + }
  384 + return lName;
372 385 }
373 386  
374 387 public void setlName(String lName) {
... ... @@ -376,7 +389,7 @@
376 389 }
377 390  
378 391 public String getName() {
379   - if(null==name){
  392 + if (null == name) {
380 393 return SPIT;
381 394 }
382 395 return name;
383 396  
384 397  
385 398  
386 399  
387 400  
388 401  
389 402  
390 403  
391 404  
... ... @@ -397,35 +410,36 @@
397 410 @Override
398 411 public QuanChanResult convertToResult(Patients destModel) {
399 412 setId(destModel.getId());
400   - setAge(DateUtil.getAge(destModel.getBirth(),destModel.getFmDate()));
  413 + setAge(DateUtil.getAge(destModel.getBirth(), destModel.getFmDate()));
401 414 setName(destModel.getUsername());
402 415 setRealPhone(destModel.getPhone());
403 416 setPhone(StringUtils.encryPhone(destModel.getPhone()));
  417 + setCreatedWeek(DateUtil.getWeek(destModel.getLastMenses(), destModel.getCreated()) + "周");
404 418  
405 419 setFileCode(destModel.getFileCode());
406 420 if (null != destModel.getFmDate()) {
407 421 Integer dueStatus = destModel.getDueStatus();
408   - if(null==dueStatus){
  422 + if (null == dueStatus) {
409 423 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
410   - }else if(1==dueStatus){
  424 + } else if (1 == dueStatus) {
411 425 setDueWeek("终止妊娠");
412   - }else{
  426 + } else {
413 427 setDueWeek(DateUtil.getyyyy_MM_dd(destModel.getFmDate()));
414 428 }
415   - if(null!=destModel.getDueStatus() &&1 ==destModel.getDueStatus()){
  429 + if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) {
416 430 setcTime("终止妊娠");
417   - }else{
  431 + } else {
418 432 setcTime(DateUtil.daysBetween(destModel.getFmDate(), new Date()) + "天");
419 433 }
420 434 }
421 435 // 全部产妇管理-如果当前孕妇已终止妊娠则分娩日期显示为“终止妊娠” 2、全部产妇管理-如果当前孕妇自动分娩则分娩日期显示为“-”
422   - if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
  436 + if (null != destModel.getBuildType() && 2 == destModel.getBuildType()) {
423 437 setDueWeek("-");
424 438 }
425   - if(null!=destModel.getServiceType()){
  439 + if (null != destModel.getServiceType()) {
426 440 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
427 441 }
428   - if(null!=destModel.getServiceStatus()){
  442 + if (null != destModel.getServiceStatus()) {
429 443 setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
430 444 }
431 445 setPid(destModel.getPid());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ a9b945a
... ... @@ -14,11 +14,11 @@
14 14  
15 15 /**
16 16 * 全部孕妇管理
17   - *
  17 + * <p>
18 18 * Created by Administrator on 2016/6/23 0023.
19 19 */
20   -public class QuanPatientsResult implements IBasicResultConvert<QuanPatientsResult, Patients> {
21   - public static final String SPIT="-";
  20 +public class QuanPatientsResult implements IBasicResultConvert<QuanPatientsResult, Patients> {
  21 + public static final String SPIT = "-";
22 22 private String id;
23 23 //名称
24 24 private String name;
... ... @@ -72,6 +72,9 @@
72 72 //建档号
73 73 private String fileCode;
74 74  
  75 + private String createdWeek;
  76 +
  77 +
75 78 /******唐山滦县导出增加字段*******/
76 79 private String lastMenses;//末次月经
77 80 private String yi;
78 81  
... ... @@ -80,7 +83,14 @@
80 83 private String si;
81 84 private String wu;
82 85  
  86 + public String getCreatedWeek() {
  87 + return createdWeek;
  88 + }
83 89  
  90 + public void setCreatedWeek(String createdWeek) {
  91 + this.createdWeek = createdWeek;
  92 + }
  93 +
84 94 public String getLastMenses() {
85 95 return lastMenses;
86 96 }
... ... @@ -130,7 +140,7 @@
130 140 }
131 141  
132 142 public String getFileCode() {
133   - if(null==fileCode){
  143 + if (null == fileCode) {
134 144 return SPIT;
135 145 }
136 146 return fileCode;
... ... @@ -141,7 +151,7 @@
141 151 }
142 152  
143 153 public String getbTime() {
144   - if(StringUtils.isEmpty(bTime)){
  154 + if (StringUtils.isEmpty(bTime)) {
145 155 return SPIT;
146 156 }
147 157  
... ... @@ -153,7 +163,7 @@
153 163 }
154 164  
155 165 public String getRegisterAddr() {
156   - if(StringUtils.isEmpty(registerAddr)){
  166 + if (StringUtils.isEmpty(registerAddr)) {
157 167 return SPIT;
158 168 }
159 169 return registerAddr;
... ... @@ -165,7 +175,7 @@
165 175  
166 176 public String getAddr() {
167 177  
168   - if(StringUtils.isEmpty(addr)){
  178 + if (StringUtils.isEmpty(addr)) {
169 179 return SPIT;
170 180 }
171 181 return addr;
... ... @@ -177,7 +187,7 @@
177 187  
178 188 public String getFirstBH() {
179 189  
180   - if(StringUtils.isEmpty(firstBH)){
  190 + if (StringUtils.isEmpty(firstBH)) {
181 191 return SPIT;
182 192 }
183 193 return firstBH;
... ... @@ -188,7 +198,7 @@
188 198 }
189 199  
190 200 public String getCurrentCh() {
191   - if(StringUtils.isEmpty(currentCh)){
  201 + if (StringUtils.isEmpty(currentCh)) {
192 202 return SPIT;
193 203 }
194 204 return currentCh;
... ... @@ -255,9 +265,9 @@
255 265 }
256 266  
257 267 public String getCheckDoctor() {
258   - if(null==checkDoctor){
259   - return SPIT;
260   - }
  268 + if (null == checkDoctor) {
  269 + return SPIT;
  270 + }
261 271 return checkDoctor;
262 272 }
263 273  
... ... @@ -267,7 +277,7 @@
267 277  
268 278 public String getcTime() {
269 279  
270   - if(org.apache.commons.lang.StringUtils.isEmpty(cTime)){
  280 + if (org.apache.commons.lang.StringUtils.isEmpty(cTime)) {
271 281 return SPIT;
272 282 }
273 283 return cTime;
274 284  
... ... @@ -287,9 +297,10 @@
287 297  
288 298 public String getDueDate() {
289 299  
290   - if(null==dueDate){
  300 + if (null == dueDate) {
291 301 return SPIT;
292   - }return dueDate;
  302 + }
  303 + return dueDate;
293 304 }
294 305  
295 306 public void setDueDate(String dueDate) {
... ... @@ -297,7 +308,7 @@
297 308 }
298 309  
299 310 public String getDueWeek() {
300   - if(null==dueWeek){
  311 + if (null == dueWeek) {
301 312 return SPIT;
302 313 }
303 314 return dueWeek;
... ... @@ -317,7 +328,7 @@
317 328  
318 329 public String getlName() {
319 330  
320   - if(null==lName){
  331 + if (null == lName) {
321 332 return SPIT;
322 333 }
323 334 return lName;
... ... @@ -328,7 +339,7 @@
328 339 }
329 340  
330 341 public String getName() {
331   - if(null==name){
  342 + if (null == name) {
332 343 return SPIT;
333 344 }
334 345 return name;
... ... @@ -355,7 +366,7 @@
355 366 }
356 367  
357 368 public String getServiceType() {
358   - if(org.apache.commons.lang.StringUtils.isEmpty(serviceType)){
  369 + if (org.apache.commons.lang.StringUtils.isEmpty(serviceType)) {
359 370 return SPIT;
360 371 }
361 372 return serviceType;
362 373  
363 374  
... ... @@ -370,17 +381,18 @@
370 381 setId(destModel.getId());
371 382 setName(destModel.getUsername());
372 383 setAge(destModel.getAge());
373   - if(null!=destModel.getLastMenses()){
374   - int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
375   - this.dueWeek=StringUtils.dueWeek(days);
  384 + setCreatedWeek(DateUtil.getWeek(destModel.getLastMenses(), destModel.getCreated()) + "周");
  385 + if (null != destModel.getLastMenses()) {
  386 + int days = DateUtil.daysBetween(destModel.getLastMenses(), new Date());
  387 + this.dueWeek = StringUtils.dueWeek(days);
376 388 setLastMenses(DateUtil.getyyyy_MM_dd(destModel.getLastMenses()));
377 389 }
378 390 setRealPhone(destModel.getPhone());
379 391 // setrLevel(destModel.getRiskLevelId());
380   - if(null!=destModel.getNextCheckTime()) {
  392 + if (null != destModel.getNextCheckTime()) {
381 393 setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
382 394 }
383   - if(null!=destModel.getDueDate()){
  395 + if (null != destModel.getDueDate()) {
384 396 setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
385 397 }
386 398 setFileCode(destModel.getFileCode());
387 399  
... ... @@ -388,10 +400,10 @@
388 400 setPhone(StringUtils.encryPhone(destModel.getPhone()));
389 401 setCheckDoctor(destModel.getLastReportDoctorName());
390 402 setlName(destModel.getPublishName());
391   - if(null!=destModel.getServiceType()){
  403 + if (null != destModel.getServiceType()) {
392 404 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
393 405 }
394   - if(null!=destModel.getServiceStatus()){
  406 + if (null != destModel.getServiceStatus()) {
395 407 setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
396 408 }
397 409 return this;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java View file @ a9b945a
... ... @@ -18,7 +18,7 @@
18 18 * Created by Administrator on 2016/6/22 0022.
19 19 */
20 20 public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResult, Patients> {
21   - public static final String SPIT="-";
  21 + public static final String SPIT = "-";
22 22  
23 23 //孕妇
24 24 private String id;
... ... @@ -39,7 +39,7 @@
39 39 //产检次数
40 40 private int cTimes;
41 41 //本院产检次数
42   - private int cHTimes;
  42 + private int cHTimes;
43 43 //预产期
44 44 private String dueDate;
45 45 //产检医生
... ... @@ -55,6 +55,7 @@
55 55 public void setPid(String pid) {
56 56 this.pid = pid;
57 57 }
  58 +
58 59 @JsonIgnore
59 60 private String realPhone;
60 61 //联系方式
61 62  
... ... @@ -81,8 +82,19 @@
81 82 //建档号
82 83 private String fileCode;
83 84  
  85 + //建档孕周
  86 + private String createdWeek;
  87 +
  88 + public String getCreatedWeek() {
  89 + return createdWeek;
  90 + }
  91 +
  92 + public void setCreatedWeek(String createdWeek) {
  93 + this.createdWeek = createdWeek;
  94 + }
  95 +
84 96 public String getScreenResult() {
85   - if(org.apache.commons.lang.StringUtils.isEmpty(screenResult)){
  97 + if (org.apache.commons.lang.StringUtils.isEmpty(screenResult)) {
86 98 return SPIT;
87 99 }
88 100 return screenResult;
... ... @@ -93,7 +105,7 @@
93 105 }
94 106  
95 107 public String getFileCode() {
96   - if(null==fileCode){
  108 + if (null == fileCode) {
97 109 return SPIT;
98 110 }
99 111 return fileCode;
100 112  
... ... @@ -102,8 +114,9 @@
102 114 public void setFileCode(String fileCode) {
103 115 this.fileCode = fileCode;
104 116 }
  117 +
105 118 public String getbTime() {
106   - if(StringUtils.isEmpty(bTime)){
  119 + if (StringUtils.isEmpty(bTime)) {
107 120 return SPIT;
108 121 }
109 122 return bTime;
... ... @@ -115,7 +128,7 @@
115 128  
116 129 public String getRegisterAddr() {
117 130  
118   - if(StringUtils.isEmpty(registerAddr)){
  131 + if (StringUtils.isEmpty(registerAddr)) {
119 132 return SPIT;
120 133 }
121 134 return registerAddr;
... ... @@ -127,7 +140,7 @@
127 140  
128 141 public String getAddr() {
129 142  
130   - if(StringUtils.isEmpty(addr)){
  143 + if (StringUtils.isEmpty(addr)) {
131 144 return SPIT;
132 145 }
133 146 return addr;
... ... @@ -139,7 +152,7 @@
139 152  
140 153 public String getFirstBH() {
141 154  
142   - if(StringUtils.isEmpty(firstBH)){
  155 + if (StringUtils.isEmpty(firstBH)) {
143 156 return SPIT;
144 157 }
145 158 return firstBH;
... ... @@ -151,7 +164,7 @@
151 164  
152 165 public String getCurrentCh() {
153 166  
154   - if(StringUtils.isEmpty(currentCh)){
  167 + if (StringUtils.isEmpty(currentCh)) {
155 168 return SPIT;
156 169 }
157 170 return currentCh;
... ... @@ -186,7 +199,7 @@
186 199 }
187 200  
188 201 public String getAge() {
189   - if(null==age){
  202 + if (null == age) {
190 203 return SPIT;
191 204 }
192 205 return age;
... ... @@ -213,7 +226,7 @@
213 226 }
214 227  
215 228 public String getcTime() {
216   - if(null==cTime){
  229 + if (null == cTime) {
217 230 return SPIT;
218 231 }
219 232  
... ... @@ -225,7 +238,7 @@
225 238 }
226 239  
227 240 public String getDueWeek() {
228   - if(null==dueWeek){
  241 + if (null == dueWeek) {
229 242 return SPIT;
230 243 }
231 244 return dueWeek;
... ... @@ -236,7 +249,7 @@
236 249 }
237 250  
238 251 public Integer gethScore() {
239   - if(null==hScore){
  252 + if (null == hScore) {
240 253 return 0;
241 254 }
242 255 return hScore;
... ... @@ -256,7 +269,7 @@
256 269  
257 270 public String getPhone() {
258 271  
259   - if(null==phone){
  272 + if (null == phone) {
260 273 return SPIT;
261 274 }
262 275 return phone;
... ... @@ -267,7 +280,7 @@
267 280 }
268 281  
269 282 public String getrFactor() {
270   - if(org.apache.commons.lang.StringUtils.isEmpty(rFactor)){
  283 + if (org.apache.commons.lang.StringUtils.isEmpty(rFactor)) {
271 284 return SPIT;
272 285 }
273 286 return rFactor;
... ... @@ -287,7 +300,7 @@
287 300  
288 301 public String getCheckDoctor() {
289 302  
290   - if(null==checkDoctor){
  303 + if (null == checkDoctor) {
291 304 return SPIT;
292 305 }
293 306 return checkDoctor;
... ... @@ -307,7 +320,7 @@
307 320  
308 321 public String getDueDate() {
309 322  
310   - if(null==dueDate){
  323 + if (null == dueDate) {
311 324 return SPIT;
312 325 }
313 326 return dueDate;
... ... @@ -318,7 +331,7 @@
318 331 }
319 332  
320 333 public String getlName() {
321   - if(null==lName){
  334 + if (null == lName) {
322 335 return SPIT;
323 336 }
324 337 return lName;
... ... @@ -333,8 +346,8 @@
333 346 setId(destModel.getId());
334 347 setName(destModel.getUsername());
335 348 Integer age = destModel.getAge();
336   - if(null!=age){
337   - setAge(age+"");
  349 + if (null != age) {
  350 + setAge(age + "");
338 351 }
339 352 setFileCode(destModel.getFileCode());
340 353 setRealPhone(destModel.getPhone());
341 354  
342 355  
343 356  
... ... @@ -343,23 +356,24 @@
343 356 setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
344 357 setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
345 358 setPhone(StringUtils.encryPhone(destModel.getPhone()));
  359 + setCreatedWeek(DateUtil.getWeek(destModel.getLastMenses(), destModel.getCreated()) + "周");
346 360 if (null != destModel.getDueStatus() && 1 == destModel.getDueStatus()) {
347 361 this.dueWeek = "终止妊娠";
348 362 } else if (3 == destModel.getType()) {
349 363 this.dueWeek = "已分娩";
350 364 } else {
351   - if(null!=destModel.getLastMenses()){
352   - int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
353   - this.dueWeek=StringUtils.dueWeek(days);
  365 + if (null != destModel.getLastMenses()) {
  366 + int days = DateUtil.daysBetween(destModel.getLastMenses(), new Date());
  367 + this.dueWeek = StringUtils.dueWeek(days);
354 368 }
355 369 }
356 370  
357 371 setPid(destModel.getPid());
358 372  
359   - if(null!=destModel.getServiceType()){
  373 + if (null != destModel.getServiceType()) {
360 374 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
361 375 }
362   - if(null!=destModel.getServiceStatus()){
  376 + if (null != destModel.getServiceStatus()) {
363 377 setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
364 378 }
365 379 return this;