Commit f19169fa68c6b9a4fa712c8f1412b9e58348280b
1 parent
46ea4d8521
Exists in
master
and in
6 other branches
产筛查询
Showing 3 changed files with 7 additions and 14 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java
View file @
f19169f
... | ... | @@ -35,8 +35,6 @@ |
35 | 35 | |
36 | 36 | //结果录入时间 |
37 | 37 | private Date resultTime; |
38 | - //诊断结果时间 | |
39 | - private Date diagnosisTime; | |
40 | 38 | |
41 | 39 | public Date getResultTime() { |
42 | 40 | return resultTime; |
43 | 41 | |
... | ... | @@ -46,13 +44,7 @@ |
46 | 44 | this.resultTime = resultTime; |
47 | 45 | } |
48 | 46 | |
49 | - public Date getDiagnosisTime() { | |
50 | - return diagnosisTime; | |
51 | - } | |
52 | 47 | |
53 | - public void setDiagnosisTime(Date diagnosisTime) { | |
54 | - this.diagnosisTime = diagnosisTime; | |
55 | - } | |
56 | 48 | |
57 | 49 | public String getStzhz13() { |
58 | 50 | return stzhz13; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
f19169f
... | ... | @@ -1726,7 +1726,7 @@ |
1726 | 1726 | if (CollectionUtils.isNotEmpty(list1)) |
1727 | 1727 | { |
1728 | 1728 | SieveApplyOrderModel applyOrderModel = list1.get(0); |
1729 | - if (applyOrderModel.getApplyTime() == null) | |
1729 | + if (applyOrderModel.getApplyTime() == null) | |
1730 | 1730 | { |
1731 | 1731 | applyOrderModel.setApplyTime(applyOrderModel.getCreated()); |
1732 | 1732 | applyOrderService.updateSieve(applyOrderModel); |
1733 | 1733 | |
1734 | 1734 | |
1735 | 1735 | |
1736 | 1736 | |
... | ... | @@ -1741,18 +1741,18 @@ |
1741 | 1741 | if (CollectionUtils.isNotEmpty(sieveResultModels)) |
1742 | 1742 | { |
1743 | 1743 | SieveResultModel sieveResultModel = sieveResultModels.get(0); |
1744 | - if (sieveResultModel.getDiagnosisTime() == null) | |
1744 | + if (sieveResultModel.getResultTime() == null) | |
1745 | 1745 | { |
1746 | - sieveResultModel.setDiagnosisTime(sieveResultModel.getCreated()); | |
1746 | + sieveResultModel.setResultTime(sieveResultModel.getCreated()); | |
1747 | 1747 | sieveService.updateSieveRsult(sieveResultModel); |
1748 | - model.setDiagnosisTime(sieveResultModel.getCreated()); | |
1748 | + model.setResultTime(sieveResultModel.getCreated()); | |
1749 | 1749 | sieveService.updateOneChanQianDiaSieve(model); |
1750 | 1750 | } |
1751 | 1751 | } |
1752 | 1752 | |
1753 | - if (model.getResultTime() == null) | |
1753 | + if (model.getStatus() == 3 && model.getDiagnosisTime() == null) | |
1754 | 1754 | { |
1755 | - model.setResultTime(model.getModified()); | |
1755 | + model.setDiagnosisTime(model.getModified()); | |
1756 | 1756 | sieveService.updateOneChanQianDiaSieve(model); |
1757 | 1757 | } |
1758 | 1758 | } |