jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 79afce21d417b1ad792f6d3ea7eed99e30560ffe

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

1

Showing 1 changed file with 18 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 79afce2
... ... @@ -77,6 +77,7 @@
77 77 trackDownTypeHandlerMap.put(TrackDownDateEnums.B.getId(), new FQTrackDownTypeHandler());
78 78 trackDownTypeHandlerMap.put(TrackDownDateEnums.C.getId(), new CJTrackDownTypeHandler());
79 79 trackDownTypeHandlerMap.put(TrackDownDateEnums.D.getId(), new CJTrackDownTypeHandler());
  80 + trackDownTypeHandlerMap.put(TrackDownDateEnums.E.getId(), new CJTrackDownTypeHandler());
80 81 }
81 82  
82 83 /**
83 84  
... ... @@ -93,10 +94,12 @@
93 94 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
94 95 downRecordQuery.setTrackType(downQueryRequest.getTrackType());
95 96 //如果是产筛请求
96   - if(null!=downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId()==downQueryRequest.getTrackType()){
  97 + if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
97 98 downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
98 99 downRecordQuery.setTrackType(3);
99   - }
  100 + }/*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){
  101 + downRecordQuery.setLastMensesStart();
  102 + }*/
100 103 downRecordQuery.setPage(downQueryRequest.getPage());
101 104 downRecordQuery.setLimit(downQueryRequest.getLimit());
102 105 downRecordQuery.setNeed("1");
103 106  
104 107  
... ... @@ -112,17 +115,17 @@
112 115 * @param trackType 业务类型
113 116 * @return
114 117 */
115   - public BaseObjectResponse mother(String parentId,Integer trackType,Integer userId){
116   - String hospitalId= autoMatchFacade.getHospitalId(userId);
  118 + public BaseObjectResponse mother(String parentId, Integer trackType, Integer userId) {
  119 + String hospitalId = autoMatchFacade.getHospitalId(userId);
117 120 Map<String, Object> map = new HashMap<>();
118   - if(TrackDownDateEnums.C.getId()>trackType){
  121 + if (TrackDownDateEnums.C.getId() > trackType) {
119 122 ResidentsArchiveModel resid = residentsArchiveService.getResident(parentId);
120 123 map.put("username", resid.getUsername());
121 124 map.put("phone", resid.getPhone());
122 125 map.put("cardNo", resid.getCertificateNum());
123 126 map.put("age", DateUtil.getAge(resid.getBirthday()));
124   - }else{
125   - Patients patients =patientsService.findOnePatientById(parentId);
  127 + } else {
  128 + Patients patients = patientsService.findOnePatientById(parentId);
126 129 map.put("username", patients.getUsername());
127 130 map.put("phone", patients.getPhone());
128 131 map.put("cardNo", patients.getCardNo());
... ... @@ -157,6 +160,13 @@
157 160 return RespBuilder.buildSuccess(map);
158 161 }
159 162  
  163 + /**
  164 + * 获取追访列表
  165 + *
  166 + * @param downQueryRequest 请求对象
  167 + * @param userId 用户id
  168 + * @return 返回的数据
  169 + */
160 170 public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) {
161 171 //转换为本地的查询条件
162 172 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
... ... @@ -264,7 +274,7 @@
264 274 temp.put("id", downRecord.getId());
265 275 temp.put("parentId", downRecord.getParentId());
266 276 // temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate()));
267   - if(null!=downRecord.getLastMenses()){
  277 + if (null != downRecord.getLastMenses()) {
268 278 temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */
269 279 }
270 280 temp.put("cjDate", ""); /** 产检日期 */