jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7989c4df1c1088a20e228b8459ec056caa79ddcb

Authored by yangfei
2 parents c7d922ef76 54da2f759c
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 12 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java View file @ 7989c4d
... ... @@ -34,6 +34,17 @@
34 34 //操作人
35 35 private String operator;
36 36  
  37 + //申请时间
  38 + private Date applyTime;
  39 +
  40 + public Date getApplyTime() {
  41 + return applyTime;
  42 + }
  43 +
  44 + public void setApplyTime(Date applyTime) {
  45 + this.applyTime = applyTime;
  46 + }
  47 +
37 48 public String getOperator() {
38 49 return operator;
39 50 }
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java View file @ 7989c4d
... ... @@ -64,6 +64,38 @@
64 64 private Date modified;
65 65 private Integer yn;
66 66  
  67 + //结果录入时间
  68 + private Date resultTime;
  69 + //诊断结果时间
  70 + private Date diagnosisTime;
  71 +
  72 + //申请时间
  73 + private Date applyTime;
  74 +
  75 + public Date getResultTime() {
  76 + return resultTime;
  77 + }
  78 +
  79 + public void setResultTime(Date resultTime) {
  80 + this.resultTime = resultTime;
  81 + }
  82 +
  83 + public Date getDiagnosisTime() {
  84 + return diagnosisTime;
  85 + }
  86 +
  87 + public void setDiagnosisTime(Date diagnosisTime) {
  88 + this.diagnosisTime = diagnosisTime;
  89 + }
  90 +
  91 + public Date getApplyTime() {
  92 + return applyTime;
  93 + }
  94 +
  95 + public void setApplyTime(Date applyTime) {
  96 + this.applyTime = applyTime;
  97 + }
  98 +
67 99 public int getOrder() {
68 100 return order;
69 101 }
platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java View file @ 7989c4d
... ... @@ -33,6 +33,27 @@
33 33 private Date created;
34 34 private Date modified;
35 35  
  36 + //结果录入时间
  37 + private Date resultTime;
  38 + //诊断结果时间
  39 + private Date diagnosisTime;
  40 +
  41 + public Date getResultTime() {
  42 + return resultTime;
  43 + }
  44 +
  45 + public void setResultTime(Date resultTime) {
  46 + this.resultTime = resultTime;
  47 + }
  48 +
  49 + public Date getDiagnosisTime() {
  50 + return diagnosisTime;
  51 + }
  52 +
  53 + public void setDiagnosisTime(Date diagnosisTime) {
  54 + this.diagnosisTime = diagnosisTime;
  55 + }
  56 +
36 57 public String getStzhz13() {
37 58 return stzhz13;
38 59 }
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java View file @ 7989c4d
... ... @@ -63,6 +63,67 @@
63 63 //查询号
64 64 private String queryNo;
65 65  
  66 + //结果录入时间
  67 + private Date resultTimeStart;
  68 + private Date resultTimeEnd;
  69 +
  70 +
  71 + //诊断结果时间
  72 + private Date diagnosisTimeStart;
  73 + private Date diagnosisTimeEnd;
  74 +
  75 + //申请时间
  76 + private Date applyTimeStart;
  77 + private Date applyTimeEnd;
  78 +
  79 + public Date getApplyTimeStart() {
  80 + return applyTimeStart;
  81 + }
  82 +
  83 + public void setApplyTimeStart(Date applyTimeStart) {
  84 + this.applyTimeStart = applyTimeStart;
  85 + }
  86 +
  87 + public Date getApplyTimeEnd() {
  88 + return applyTimeEnd;
  89 + }
  90 +
  91 + public void setApplyTimeEnd(Date applyTimeEnd) {
  92 + this.applyTimeEnd = applyTimeEnd;
  93 + }
  94 +
  95 + public Date getResultTimeStart() {
  96 + return resultTimeStart;
  97 + }
  98 +
  99 + public void setResultTimeStart(Date resultTimeStart) {
  100 + this.resultTimeStart = resultTimeStart;
  101 + }
  102 +
  103 + public Date getResultTimeEnd() {
  104 + return resultTimeEnd;
  105 + }
  106 +
  107 + public void setResultTimeEnd(Date resultTimeEnd) {
  108 + this.resultTimeEnd = resultTimeEnd;
  109 + }
  110 +
  111 + public Date getDiagnosisTimeStart() {
  112 + return diagnosisTimeStart;
  113 + }
  114 +
  115 + public void setDiagnosisTimeStart(Date diagnosisTimeStart) {
  116 + this.diagnosisTimeStart = diagnosisTimeStart;
  117 + }
  118 +
  119 + public Date getDiagnosisTimeEnd() {
  120 + return diagnosisTimeEnd;
  121 + }
  122 +
  123 + public void setDiagnosisTimeEnd(Date diagnosisTimeEnd) {
  124 + this.diagnosisTimeEnd = diagnosisTimeEnd;
  125 + }
  126 +
66 127 public String getQueryNo() {
67 128 return queryNo;
68 129 }
... ... @@ -214,6 +275,55 @@
214 275 c1 = Criteria.where("lastMenses").lte(lastMensesEnd);
215 276 }
216 277 }
  278 +
  279 + if (null != resultTimeStart) {
  280 + if (null != c1) {
  281 + c1 = c1.and("resultTime").gte(resultTimeStart);
  282 + } else {
  283 + c1 = Criteria.where("resultTime").gte(resultTimeStart);
  284 + }
  285 + }
  286 +
  287 + if (null != resultTimeEnd) {
  288 + if (c1 != null) {
  289 + c1 = c1.lte(resultTimeEnd);
  290 + } else {
  291 + c1 = Criteria.where("resultTime").lte(resultTimeEnd);
  292 + }
  293 + }
  294 +
  295 + if (null != diagnosisTimeStart) {
  296 + if (null != c1) {
  297 + c1 = c1.and("diagnosisTime").gte(diagnosisTimeStart);
  298 + } else {
  299 + c1 = Criteria.where("diagnosisTime").gte(diagnosisTimeStart);
  300 + }
  301 + }
  302 +
  303 + if (null != diagnosisTimeEnd) {
  304 + if (c1 != null) {
  305 + c1 = c1.lte(diagnosisTimeEnd);
  306 + } else {
  307 + c1 = Criteria.where("diagnosisTime").lte(diagnosisTimeEnd);
  308 + }
  309 + }
  310 +
  311 + if (null != applyTimeStart) {
  312 + if (null != c1) {
  313 + c1 = c1.and("applyTime").gte(applyTimeStart);
  314 + } else {
  315 + c1 = Criteria.where("applyTime").gte(applyTimeStart);
  316 + }
  317 + }
  318 +
  319 + if (null != applyTimeEnd) {
  320 + if (c1 != null) {
  321 + c1 = c1.lte(applyTimeEnd);
  322 + } else {
  323 + c1 = Criteria.where("applyTime").lte(applyTimeEnd);
  324 + }
  325 + }
  326 +
217 327  
218 328 if (null != dueWeekStart) {
219 329 if (null != c1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 7989c4d
... ... @@ -390,6 +390,7 @@
390 390 List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
391 391 if (CollectionUtils.isNotEmpty(sieveModels)) {
392 392 SieveModel sieveModel = sieveModels.get(0);
  393 + sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime());
393 394 sieveModel.setStatus(2);
394 395 if (StringUtils.isNotEmpty(sieveApplyOrderModel.getCheckDate())) {
395 396 sieveModel.setApplyDate(DateUtil.parseYMD(sieveApplyOrderModel.getCheckDate()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 7989c4d
... ... @@ -108,6 +108,8 @@
108 108 sieveModel.setId(list.get(0).getId());
109 109 sieveModel.setHospitalId(hospitalId);
110 110 sieveModel.setZtfx(sieveAddRequest.getMax());
  111 + sieveModel.setResultTime(sieveResultModel.getResultTime());
  112 +
111 113 sieveService.updateOneChanQianDiaSieve(sieveModel);
112 114 SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId());
113 115 SieveService.handOrder(sieveModel1);
... ... @@ -223,6 +225,7 @@
223 225 sieveModel.setRenShenResult(chanQianDiaAddRequest.getPregnancyOutcome());
224 226 sieveModel.setStatus(4);
225 227 sieveModel.setCqStatus(1);
  228 + sieveModel.setDiagnosisTime(chanQianDiaAddRequest.getDiagnosisTime() == null ? null : DateUtil.parseYMD(chanQianDiaAddRequest.getDiagnosisTime()));
226 229 sieveService.updateOneChanQianDiaSieve(sieveModel);
227 230 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospital), sieveModel, OptActionEnums.ADD.getId(), "产前诊断");
228 231  
... ... @@ -262,6 +265,34 @@
262 265 if (null != cqSieveQueryRequest.getcDueWeekEnd()) {
263 266 sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6));
264 267 }
  268 +
  269 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getApplyTime())) {
  270 + String[] dates = cqSieveQueryRequest.getApplyTime().split(" - ");
  271 +
  272 + sieveQuery.setApplyTimeStart(DateUtil.parseYMD(dates[0]));
  273 + if (dates.length == 2) {
  274 + sieveQuery.setApplyTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  275 + }
  276 + }
  277 +
  278 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getDiagnosisTime())) {
  279 + String[] dates = cqSieveQueryRequest.getDiagnosisTime().split(" - ");
  280 +
  281 + sieveQuery.setDiagnosisTimeStart(DateUtil.parseYMD(dates[0]));
  282 + if (dates.length == 2) {
  283 + sieveQuery.setDiagnosisTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  284 + }
  285 + }
  286 +
  287 + if (StringUtils.isNotEmpty(cqSieveQueryRequest.getResultTime())) {
  288 + String[] dates = cqSieveQueryRequest.getResultTime().split(" - ");
  289 +
  290 + sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
  291 + if (dates.length == 2) {
  292 + sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  293 + }
  294 + }
  295 +
265 296  
266 297 sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx());
267 298 sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChanQianDiaAddRequest.java View file @ 7989c4d
... ... @@ -23,6 +23,17 @@
23 23 @FormParam
24 24 private String publishName;// 录入人员;
25 25  
  26 + //诊断结果时间
  27 + private String diagnosisTime;
  28 +
  29 + public String getDiagnosisTime() {
  30 + return diagnosisTime;
  31 + }
  32 +
  33 + public void setDiagnosisTime(String diagnosisTime) {
  34 + this.diagnosisTime = diagnosisTime;
  35 + }
  36 +
26 37 public String getParentId() {
27 38 return parentId;
28 39 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java View file @ 7989c4d
... ... @@ -50,6 +50,38 @@
50 50 //查询号
51 51 private String queryNo;
52 52  
  53 + //结果录入时间
  54 + private String resultTime;
  55 + //诊断结果时间
  56 + private String diagnosisTime;
  57 +
  58 + //申请时间
  59 + private String applyTime;
  60 +
  61 + public String getApplyTime() {
  62 + return applyTime;
  63 + }
  64 +
  65 + public void setApplyTime(String applyTime) {
  66 + this.applyTime = applyTime;
  67 + }
  68 +
  69 + public String getResultTime() {
  70 + return resultTime;
  71 + }
  72 +
  73 + public void setResultTime(String resultTime) {
  74 + this.resultTime = resultTime;
  75 + }
  76 +
  77 + public String getDiagnosisTime() {
  78 + return diagnosisTime;
  79 + }
  80 +
  81 + public void setDiagnosisTime(String diagnosisTime) {
  82 + this.diagnosisTime = diagnosisTime;
  83 + }
  84 +
53 85 public String getQueryNo() {
54 86 return queryNo;
55 87 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java View file @ 7989c4d
1 1 package com.lyms.platform.operate.web.request;
2 2  
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
  4 +import com.lyms.platform.common.utils.DateUtil;
4 5 import com.lyms.platform.pojo.SieveModel;
5 6 import com.lyms.platform.pojo.SieveResultModel;
6 7 import org.apache.commons.lang.StringUtils;
... ... @@ -28,6 +29,18 @@
28 29 //录入人员
29 30 private String publishName;
30 31  
  32 + //结果录入时间
  33 + private String resultTime;
  34 +
  35 +
  36 + public String getResultTime() {
  37 + return resultTime;
  38 + }
  39 +
  40 + public void setResultTime(String resultTime) {
  41 + this.resultTime = resultTime;
  42 + }
  43 +
31 44 public String getCspj() {
32 45 return cspj;
33 46 }
... ... @@ -119,6 +132,7 @@
119 132 sieveModel.setCspj(cspj);
120 133 sieveModel.setStzhz13(stzhz13);
121 134 sieveModel.setPublishName(publishName);
  135 + sieveModel.setResultTime(DateUtil.parseYMD(resultTime));
122 136 return sieveModel;
123 137 }
124 138 public Integer getMax(){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java View file @ 7989c4d
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.base.IBasicRequestConvert;
4 4 import com.lyms.platform.common.core.annotation.form.FormParam;
5 5 import com.lyms.platform.common.core.annotation.form.Form;
  6 +import com.lyms.platform.common.utils.DateUtil;
6 7 import com.lyms.platform.common.utils.JsonUtil;
7 8 import com.lyms.platform.pojo.SieveApplyOrderModel;
8 9  
... ... @@ -26,6 +27,9 @@
26 27 private String applyDoctor;
27 28 private String pid;
28 29  
  30 + //申请时间
  31 + private String applyTime;
  32 +
29 33 public String getPid() {
30 34 return pid;
31 35 }
32 36  
... ... @@ -42,7 +46,16 @@
42 46 sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check));
43 47 sieveApplyOrderModel.setCheckDate(checkDate);
44 48 sieveApplyOrderModel.setGuide(guide);
  49 + sieveApplyOrderModel.setApplyTime(DateUtil.parseYMD(applyTime));
45 50 return sieveApplyOrderModel;
  51 + }
  52 +
  53 + public String getApplyTime() {
  54 + return applyTime;
  55 + }
  56 +
  57 + public void setApplyTime(String applyTime) {
  58 + this.applyTime = applyTime;
46 59 }
47 60  
48 61 public String getApplyDoctor() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveResult.java View file @ 7989c4d
... ... @@ -48,6 +48,27 @@
48 48 //录入人员
49 49 private String publishName;
50 50  
  51 + //结果录入时间
  52 + private String resultTime;
  53 + //诊断结果时间
  54 + private String diagnosisTime;
  55 +
  56 + public String getResultTime() {
  57 + return resultTime;
  58 + }
  59 +
  60 + public void setResultTime(String resultTime) {
  61 + this.resultTime = resultTime;
  62 + }
  63 +
  64 + public String getDiagnosisTime() {
  65 + return diagnosisTime;
  66 + }
  67 +
  68 + public void setDiagnosisTime(String diagnosisTime) {
  69 + this.diagnosisTime = diagnosisTime;
  70 + }
  71 +
51 72 public String getCspj() {
52 73 return cspj;
53 74 }
... ... @@ -149,6 +170,8 @@
149 170 setSjgjx(sieveResultModel.getSjgjx());
150 171 setTszhz(sieveResultModel.getTszhz());
151 172 setStzhz13(sieveResultModel.getStzhz13());
  173 + setDiagnosisTime(sieveResultModel.getDiagnosisTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveResultModel.getDiagnosisTime()));
  174 + setResultTime(sieveResultModel.getResultTime() == null ? "" : DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime()));
152 175 return this;
153 176 }
154 177 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java View file @ 7989c4d
... ... @@ -93,15 +93,17 @@
93 93 if (CollectionUtils.isNotEmpty(orderModels))
94 94 {
95 95 ReferralApplyOrderModel model = orderModels.get(0);
96   - //申请单状态 0 已接收 1 已转出 2 建议转诊
  96 + // CREATED("待接收","1"),
  97 + //O("已接收","2"),
  98 + /// O1("建议转诊","3");
97 99 Integer status = model.getStatus();
98 100 if (status == 1)
99 101 {
100   - referralStatus = 2;
  102 + referralStatus = 1;
101 103 }
102   - else if (status == 0)
  104 + else if (status == 2)
103 105 {
104   - referralStatus = 1;
  106 + referralStatus = 2;
105 107 }
106 108 }
107 109