fangcheng / regional-platform

Download as
Browse Code »

Commit e068223bb0c51df490605f1c24baf90b70272f9b

Authored by jiangjiazhi
2 parents ff92befb24 a48296978b
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java View file @ e068223
... ... @@ -77,7 +77,7 @@
77 77 public static String getNameById(Integer id)
78 78 {
79 79 for(ServiceStatusEnums s : ServiceStatusEnums.values()) {
80   - if (s.getId() == id)
  80 + if (id != null && s.getId() == id)
81 81 {
82 82 return s.getName();
83 83 }
platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java View file @ e068223
... ... @@ -32,9 +32,9 @@
32 32 public String getName() {
33 33 return name;
34 34 }
35   - public static String getTitleById(int id){
  35 + public static String getTitleById(Integer id){
36 36 for(ServiceTypeEnums enums:values()){
37   - if(id==enums.getId()){
  37 + if(id != null && id==enums.getId()){
38 38 return enums.getName();
39 39 }
40 40 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ e068223
... ... @@ -209,9 +209,21 @@
209 209 patientsQuery.sethScoreEnd(riskPatientsQueryRequest.getEndHScore());
210 210 patientsQuery.setrFactor(riskPatientsQueryRequest.getrFacotr());
211 211 Date currentDate = DateUtil.formatDate(new Date());
212   - if (null != riskPatientsQueryRequest.getServiceType()) {
  212 +
  213 + //服务类型
  214 + if (null != riskPatientsQueryRequest.getServiceType() && ServiceTypeEnums.ALL_SERVICE.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceType())) {
213 215 patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType()));
214 216 }
  217 +
  218 + //服务状态
  219 + if (null != riskPatientsQueryRequest.getServiceStatus()) {
  220 + if (ServiceStatusEnums.STANDARD_ALL.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceStatus()) && ServiceStatusEnums.ADD_ALL.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceStatus()))
  221 + {
  222 + patientsQuery.setServiceStatus(Integer.valueOf(riskPatientsQueryRequest.getServiceStatus()));
  223 + }
  224 +
  225 + }
  226 +
215 227 patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
216 228 patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
217 229 patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
... ... @@ -259,7 +271,6 @@
259 271 patientsQuery.setLimit(riskPatientsQueryRequest.getLimit());
260 272 patientsQuery.setPage(riskPatientsQueryRequest.getPage());
261 273 patientsQuery.setIsHighRisk(isHighRisk);
262   - patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
263 274 patientsQuery.setYn(YnEnums.YES.getId());
264 275 // patientsQuery.setBuildType(1);
265 276 //0 未分娩建档 2 自动分娩类型 http://jira.healthbaby.com.cn/browse/WEB-639
... ... @@ -382,6 +393,9 @@
382 393 }
383 394 }
384 395 }
  396 +
  397 + chanResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType()));
  398 + chanResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus()));
385 399 chanResult.setNextCheckTime(nextCheckTime);
386 400 data.add(chanResult);
387 401 }
... ... @@ -470,6 +484,9 @@
470 484 }
471 485 }
472 486 }
  487 +
  488 + quanPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType()));
  489 + quanPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus()));
473 490 HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
474 491 quanPatientsResult.setcTime(nextCheckTime);
475 492 quanPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel()));
... ... @@ -553,6 +570,9 @@
553 570 }
554 571 }
555 572  
  573 +
  574 + riskPatientsResult.setServiceType(ServiceTypeEnums.getTitleById(patients.getServiceType()));
  575 + riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus()));
556 576 riskPatientsResult.setcTime(nextCheckTime);
557 577 riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr());
558 578 riskPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ e068223
... ... @@ -40,6 +40,28 @@
40 40 private String nextCheckTime;
41 41 private String pid;
42 42  
  43 + //服务类型
  44 + private String serviceType;
  45 +
  46 + //服务状态
  47 + private String serviceStatus;
  48 +
  49 + public String getServiceType() {
  50 + return serviceType;
  51 + }
  52 +
  53 + public void setServiceType(String serviceType) {
  54 + this.serviceType = serviceType;
  55 + }
  56 +
  57 + public String getServiceStatus() {
  58 + return serviceStatus;
  59 + }
  60 +
  61 + public void setServiceStatus(String serviceStatus) {
  62 + this.serviceStatus = serviceStatus;
  63 + }
  64 +
43 65 public String getRealPhone() {
44 66 return realPhone;
45 67 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ e068223
... ... @@ -49,7 +49,19 @@
49 49 private String cTime;
50 50 //服务类型
51 51 private String serviceType;
  52 +
  53 + //服务状态
  54 + private String serviceStatus;
  55 +
52 56 private String pid;
  57 +
  58 + public String getServiceStatus() {
  59 + return serviceStatus;
  60 + }
  61 +
  62 + public void setServiceStatus(String serviceStatus) {
  63 + this.serviceStatus = serviceStatus;
  64 + }
53 65  
54 66 public String getRealPhone() {
55 67 return realPhone;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java View file @ e068223
... ... @@ -63,6 +63,28 @@
63 63 //预约产检时间
64 64 private String cTime;
65 65  
  66 + //服务类型
  67 + private String serviceType;
  68 +
  69 + //服务状态
  70 + private String serviceStatus;
  71 +
  72 + public String getServiceType() {
  73 + return serviceType;
  74 + }
  75 +
  76 + public void setServiceType(String serviceType) {
  77 + this.serviceType = serviceType;
  78 + }
  79 +
  80 + public String getServiceStatus() {
  81 + return serviceStatus;
  82 + }
  83 +
  84 + public void setServiceStatus(String serviceStatus) {
  85 + this.serviceStatus = serviceStatus;
  86 + }
  87 +
66 88 public String getId() {
67 89 return id;
68 90 }