shiyang / regional-platform

Download as
Browse Code »

Commit 0f97e45773f955d50e1dd1deccac1d53c455090f

Authored by zhangrui
2 parents f5eaa886b2 1ca16de581
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 0f97e45
... ... @@ -26,7 +26,7 @@
26 26 /**
27 27 * Created by Administrator on 2016/6/30 0030.
28 28 */
29   -@Service
  29 +@Service("sieveService")
30 30 public class SieveService {
31 31  
32 32 @Autowired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 0f97e45
... ... @@ -85,7 +85,7 @@
85 85 sieveModel.setHospitalId(hospitalId);
86 86 sieveModel.setZtfx(sieveAddRequest.getMax());
87 87 sieveService.updateOneChanQianDiaSieve(sieveModel);
88   - SieveModel sieveModel1 =sieveService.findOneById(list.get(0).getId());
  88 + SieveModel sieveModel1 = sieveService.findOneById(list.get(0).getId());
89 89 SieveService.handOrder(sieveModel1);
90 90 sieveService.updateOneChanQianDiaSieve(sieveModel1);
91 91 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
... ... @@ -169,7 +169,7 @@
169 169 sieveModel.setCqStatus(1);
170 170 sieveService.updateOneChanQianDiaSieve(sieveModel);
171 171  
172   - SieveModel sieveModel1 =sieveService.findOneById(chanQianDiaAddRequest.getId());
  172 + SieveModel sieveModel1 = sieveService.findOneById(chanQianDiaAddRequest.getId());
173 173 SieveService.handOrder(sieveModel1);
174 174 sieveService.updateOneChanQianDiaSieve(sieveModel1);
175 175  
176 176  
... ... @@ -197,10 +197,10 @@
197 197 if (null != cqSieveQueryRequest.getDueWeekEnd()) {
198 198 sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6);
199 199 }
200   - if(null!=cqSieveQueryRequest.getcDueWeekStart()){
  200 + if (null != cqSieveQueryRequest.getcDueWeekStart()) {
201 201 sieveQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekStart() * 7)));
202 202 }
203   - if(null!=cqSieveQueryRequest.getcDueWeekEnd()){
  203 + if (null != cqSieveQueryRequest.getcDueWeekEnd()) {
204 204 sieveQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(cqSieveQueryRequest.getcDueWeekEnd() * 7) - 6));
205 205 }
206 206  
207 207  
... ... @@ -242,12 +242,13 @@
242 242 sieveListResult.convertToResult(sieveModel);
243 243 Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
244 244 if (null != patients) {
245   - sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1");
  245 + sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1");
246 246 if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
247 247 sieveListResult.setcDueWeek("终止妊娠");
248 248 else if (patients.getType() == 3) {
249 249 sieveListResult.setcDueWeek("已分娩");
250 250 }
  251 + sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
251 252 }
252 253 data.add(sieveListResult);
253 254 }
... ... @@ -267,6 +268,7 @@
267 268 for (SieveListResult sive : list) {
268 269 Map<String, Object> data = new HashMap<>();
269 270 data.put("name", sive.getName());
  271 + data.put("age", sive.getAge());
270 272 data.put("cDueWeek", sive.getcDueWeek());
271 273 data.put("statusText", sive.getStatusText());
272 274 data.put("ztfxText", sive.getZtfxText());
... ... @@ -284,6 +286,7 @@
284 286 OutputStream out = response.getOutputStream();
285 287 Map<String, String> cnames = new LinkedHashMap<>();
286 288 cnames.put("name", "姓名");
  289 + cnames.put("age", "年龄");
287 290 cnames.put("cDueWeek", "当前孕周");
288 291 cnames.put("statusText", "当前状态");
289 292 cnames.put("ztfxText", "整体风险");
290 293  
... ... @@ -300,12 +303,13 @@
300 303 response.setHeader("Content-Disposition", "attachment;fileName=" + "csdata.xls");
301 304 ExcelUtil.toExcel(out, datas, cnames);
302 305 } catch (Exception e) {
303   - ExceptionUtils.catchException(e,"产筛导出异常");
  306 + ExceptionUtils.catchException(e, "产筛导出异常");
304 307 }
305 308 }
306 309  
307 310 /**
308 311 * 修改产筛 备注
  312 + *
309 313 * @param csId
310 314 * @param qsTypeId
311 315 * @param detail
... ... @@ -319,7 +323,7 @@
319 323 sieve.setDetail(detail);
320 324 sieveService.updateOneChanQianDiaSieve(sieve);
321 325  
322   - SieveModel sieveModel1 =sieveService.findOneById(csId);
  326 + SieveModel sieveModel1 = sieveService.findOneById(csId);
323 327 SieveService.handOrder(sieveModel1);
324 328 sieveService.updateOneChanQianDiaSieve(sieveModel1);
325 329 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java View file @ 0f97e45
... ... @@ -19,6 +19,8 @@
19 19 private String parentId;
20 20 //姓名
21 21 private String name;
  22 +
  23 + private String age;
22 24 //当前孕周
23 25 private String cDueWeek;
24 26 //胎数
... ... @@ -50,6 +52,17 @@
50 52  
51 53 public void setCsRemarkTypeId(String csRemarkTypeId) {
52 54 this.csRemarkTypeId = csRemarkTypeId;
  55 + }
  56 +
  57 + public String getAge() {
  58 + if(null==age){
  59 + return SPIT;
  60 + }
  61 + return age;
  62 + }
  63 +
  64 + public void setAge(String age) {
  65 + this.age = age;
53 66 }
54 67  
55 68 public String getCsRemarkTypeText() {