jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 77aca2a6f4fceda06d38325455152d3b6d0f4497

Authored by gengxiaokai
1 parent 73c192d6d8
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产前诊断

Showing 2 changed files with 69 additions and 45 deletions

platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java View file @ 77aca2a
... ... @@ -35,8 +35,8 @@
35 35 private String rsResult;//妊娠结局
36 36 private Date applyDateStart;//申请开始时间
37 37 private Date applyDateEnd;//申请结束时间
38   - private String resultDateStart;//诊断出具开始时间
39   - private String resultDateEnd;//诊断出具结束时间
  38 + private Date resultDateStart;//诊断出具开始时间
  39 + private Date resultDateEnd;//诊断出具结束时间
40 40 private String specimenNo;//标本号
41 41 private String collectHospitalId;//申请医院
42 42  
43 43  
44 44  
45 45  
... ... @@ -185,19 +185,19 @@
185 185 this.applyDateEnd = applyDateEnd;
186 186 }
187 187  
188   - public String getResultDateStart() {
  188 + public Date getResultDateStart() {
189 189 return resultDateStart;
190 190 }
191 191  
192   - public void setResultDateStart(String resultDateStart) {
  192 + public void setResultDateStart(Date resultDateStart) {
193 193 this.resultDateStart = resultDateStart;
194 194 }
195 195  
196   - public String getResultDateEnd() {
  196 + public Date getResultDateEnd() {
197 197 return resultDateEnd;
198 198 }
199 199  
200   - public void setResultDateEnd(String resultDateEnd) {
  200 + public void setResultDateEnd(Date resultDateEnd) {
201 201 this.resultDateEnd = resultDateEnd;
202 202 }
203 203  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java View file @ 77aca2a
... ... @@ -190,7 +190,6 @@
190 190 */
191 191 public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){
192 192 DiagnosisModel diagnosisModel = dataresult.convertToDataModel();
193   - diagnosisModel.setDiaStatus("1");
194 193 diagnosisModel.setCreated(new Date());
195 194 diagnosisModel.setModified(new Date());
196 195 String hospital = autoMatchFacade.getHospitalId(userId);
... ... @@ -208,6 +207,7 @@
208 207 objectResponse.setErrormsg("成功");
209 208 return objectResponse;
210 209 }else{//新增数据
  210 + diagnosisModel.setDiaStatus("1");//已申请状态
211 211 diagnosisModel.setStatus("1");
212 212 diagnosisModel.setRefStatus("0");
213 213 //查询孕妇基本信息
214 214  
... ... @@ -288,12 +288,13 @@
288 288 diagnosisQuery.setApplyDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
289 289 }
290 290 }
291   - if(null != dataresult.getResultDateStart()){
292   - diagnosisQuery.setResultDateStart(dataresult.getResultDateStart());
  291 + if(null != dataresult.getResultDate()){
  292 + String[] dates = dataresult.getResultDate().split(" - ");
  293 + diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
  294 + if (dates.length == 2) {
  295 + diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  296 + }
293 297 }
294   - if(null != dataresult.getResultDateEnd()){
295   - diagnosisQuery.setResultDateEnd(dataresult.getResultDateEnd());
296   - }
297 298  
298 299 diagnosisQuery.setPage(dataresult.getPage());
299 300 diagnosisQuery.setLimit(dataresult.getLimit());
... ... @@ -363,6 +364,28 @@
363 364  
364 365  
365 366 /**
  367 + * 产前诊断管理修改状态（实验室接收按钮）
  368 + * @param id
  369 + * @param userId
  370 + * @return
  371 + */
  372 + public BaseObjectResponse updateDiaStarts(String id,Integer userId){
  373 + BaseObjectResponse br = new BaseObjectResponse();
  374 + String hospital = autoMatchFacade.getHospitalId(userId);
  375 + DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
  376 + DiagnosisModel dia = new DiagnosisModel();
  377 + dia = diagnosisService.findOneDiagnosisById(id);
  378 +
  379 + diagnosisQuery.setDiaStatus("2");
  380 +
  381 +
  382 + return null;
  383 + }
  384 +
  385 +
  386 +
  387 +
  388 + /**
366 389 * 产筛实验室（产前诊断管理）
367 390 * @param dataresult
368 391 * @return
369 392  
... ... @@ -388,12 +411,13 @@
388 411 if(null != dataresult.getDiaStatus()){
389 412 diagnosisQuery.setDiaStatus(dataresult.getDiaStatus());
390 413 }
391   - if(null != dataresult.getResultDateStart()){
392   - diagnosisQuery.setResultDateStart(dataresult.getResultDateStart());
  414 + if(null != dataresult.getResultDate()){
  415 + String[] dates = dataresult.getResultDate().split(" - ");
  416 + diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
  417 + if (dates.length == 2) {
  418 + diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
  419 + }
393 420 }
394   - if(null != dataresult.getResultDateEnd()){
395   - diagnosisQuery.setResultDateEnd(dataresult.getResultDateEnd());
396   - }
397 421 if(null != dataresult.getQueryNo()){
398 422 diagnosisQuery.setQueryNo(dataresult.getQueryNo());
399 423 }
400 424  
401 425  
402 426  
403 427  
... ... @@ -417,38 +441,38 @@
417 441 diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
418 442 return diagnosisManagerResult;
419 443 }
420   - for(DiagnosisModel diagnosisModel : diaList){
  444 + for (DiagnosisModel diagnosisModel : diaList) {
421 445  
422   - if(StringUtils.isEmpty(diagnosisModel.getParentId())){
423   - continue;
424   - }
425   - //查询孕妇基本信息
426   - Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
  446 + if (StringUtils.isEmpty(diagnosisModel.getParentId())) {
  447 + continue;
  448 + }
  449 + //查询孕妇基本信息
  450 + Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId());
427 451  
428   - SieveQuery sieveQuery = new SieveQuery();
429   - sieveQuery.setParentId(diagnosisModel.getParentId());
430   - //查询产筛list
431   - List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
432   - if(list != null && list.size() > 0){
433   - SieveModel sieveModel = list.get(0);
434   - diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
435   - diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
436   - diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
437   - if("0".equals(sieveModel.getZtfx())){
438   - diagnosisModel.setZtfx("0");
439   - diagnosisModel.setZtfeText("低风险");
  452 + SieveQuery sieveQuery = new SieveQuery();
  453 + sieveQuery.setParentId(diagnosisModel.getParentId());
  454 + //查询产筛list
  455 + List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
  456 + if (list != null && list.size() > 0) {
  457 + SieveModel sieveModel = list.get(0);
  458 + diagnosisModel.setRsResult(sieveModel.getRenShenResult().toString());
  459 + diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString());
  460 + diagnosisModel.setCsStatus(sieveModel.getStatus().toString());
  461 + if ("0".equals(sieveModel.getZtfx())) {
  462 + diagnosisModel.setZtfx("0");
  463 + diagnosisModel.setZtfeText("低风险");
  464 + }
  465 + if ("1".equals(sieveModel.getZtfx())) {
  466 + diagnosisModel.setZtfx("1");
  467 + diagnosisModel.setZtfeText("临界值");
  468 + }
  469 + if ("2".equals(sieveModel.getZtfx())) {
  470 + diagnosisModel.setZtfx("2");
  471 + diagnosisModel.setZtfeText("高风险");
  472 + }
440 473 }
441   - if("1".equals(sieveModel.getZtfx())){
442   - diagnosisModel.setZtfx("1");
443   - diagnosisModel.setZtfeText("临界值");
444   - }
445   - if("2".equals(sieveModel.getZtfx())){
446   - diagnosisModel.setZtfx("2");
447   - diagnosisModel.setZtfeText("高风险");
448   - }
  474 + mList.add(diagnosisModel.contomap(patients));
449 475 }
450   - mList.add(diagnosisModel.contomap(patients));
451   - }
452 476 diagnosisManagerResult.setData(diaList);
453 477 diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo());
454 478 diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);