Commit 3bbd6d18df0570c33350095c37dcfd3f7bbe240e
1 parent
afbf03f80c
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 2 changed files with 5 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java
View file @
3bbd6d1
... | ... | @@ -100,7 +100,7 @@ |
100 | 100 | setPid(e.getPid()); |
101 | 101 | setParentId(e.getParentId()); |
102 | 102 | setId(e.getId()); |
103 | - setCheckTime(DateUtil.getyyyy_MM_dd(e.getCheckTime())); | |
103 | +// setCheckTime(DateUtil.getyyyy_MM_dd(e.getCheckTime())); | |
104 | 104 | setName(e.getName()); |
105 | 105 | setAge(DateUtil.getAge(e.getBrith()) + ""); |
106 | 106 | setPhone(StringUtils.encryPhone(e.getPhone())); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java
View file @
3bbd6d1
... | ... | @@ -16,6 +16,7 @@ |
16 | 16 | import com.lyms.platform.query.AntExRecordQuery; |
17 | 17 | import org.apache.commons.lang.math.NumberUtils; |
18 | 18 | |
19 | +import java.text.SimpleDateFormat; | |
19 | 20 | import java.util.ArrayList; |
20 | 21 | import java.util.List; |
21 | 22 | import java.util.concurrent.Callable; |
... | ... | @@ -37,6 +38,8 @@ |
37 | 38 | |
38 | 39 | private BasicConfigService basicConfigService; |
39 | 40 | |
41 | + public static SimpleDateFormat y_m_d = new SimpleDateFormat("yyyy-MM-dd"); | |
42 | + | |
40 | 43 | public AntExRecordWorker(List<AntExRecordModel> record, |
41 | 44 | boolean isRegion, |
42 | 45 | OrganizationService organizationService, |
... | ... | @@ -62,6 +65,7 @@ |
62 | 65 | try { |
63 | 66 | AntExManagerResult antExManagerResult = new AntExManagerResult(); |
64 | 67 | antExManagerResult.convertToResult(e); |
68 | + antExManagerResult.setCheckTime(y_m_d.format(e.getCheckTime())); | |
65 | 69 | if (isRegion) { |
66 | 70 | //产检医院 |
67 | 71 | if (StringUtils.isNotEmpty(e.getHospitalId())) { |