From 73c192d6d8e87f8b8487249fb126a04f44be07db Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Sat, 29 Sep 2018 16:34:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/DiagnosisModel.java | 55 ++++++++++++++--- .../operate/web/facade/DiagnosisFacaed.java | 39 +++++++++++-- .../operate/web/request/DiagnosisAddRequest.java | 68 +++++++++++++++++----- 3 files changed, 132 insertions(+), 30 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java index 9c4b09d..dbc4f06 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java @@ -52,6 +52,35 @@ public class DiagnosisModel extends BaseModel { private String CsStatus;//产筛状态 private String ztfx;//整体风险 private String ztfeText;//整体风险中文 + private String refStatus;//转诊标志(0,未转诊；1，待接收；2，已接收) + private Date diaDate;//诊断时间 + private String diaHospital;//诊断单位 + private String inPerson;//录入人员 + + + public Date getDiaDate() { + return diaDate; + } + + public void setDiaDate(Date diaDate) { + this.diaDate = diaDate; + } + + public String getDiaHospital() { + return diaHospital; + } + + public void setDiaHospital(String diaHospital) { + this.diaHospital = diaHospital; + } + + public String getInPerson() { + return inPerson; + } + + public void setInPerson(String inPerson) { + this.inPerson = inPerson; + } public String getId() { return id; @@ -349,21 +378,29 @@ public class DiagnosisModel extends BaseModel { this.dueDays = dueDays; } - public Map contomap(){ + public String getRefStatus() { + return refStatus; + } + + public void setRefStatus(String refStatus) { + this.refStatus = refStatus; + } + + public Map contomap(Patients patients){ Map map = new HashMap(); map.put("id",id); - map.put("hospitalId",hospitalId); + map.put("hospitalId",patients.getHospitalId()); map.put("parentId",parentId); - map.put("name",name); - map.put("cardNo",cardNo); - map.put("age",age); + map.put("name",patients.getUsername()); + map.put("cardNo",patients.getCardNo()); + map.put("age",DateUtil.getAge(patients.getBirth()).toString()+"岁"); map.put("dueWeek",dueWeek); - map.put("yChanQi", DateUtil.getyyyy_MM_dd(yChanQi)); - map.put("phone",phone); + map.put("yChanQi", DateUtil.getyyyy_MM_dd(patients.getDueDate())); + map.put("phone",patients.getPhone()); map.put("diaProject",diaProject); - map.put("birth",DateUtil.getyyyy_MM_dd(birth)); + map.put("birth",DateUtil.getyyyy_MM_dd(patients.getBirth())); map.put("weight",weight); - map.put("lastMenses",DateUtil.getyyyy_MM_dd(lastMenses)); + map.put("lastMenses",DateUtil.getyyyy_MM_dd(patients.getLastMenses())); map.put("mensStartDay",mensStartDay); map.put("mensEndDay",mensEndDay); map.put("mensStopStartDay",mensStopStartDay); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index b58efe1..c65ab11 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -72,7 +72,7 @@ public class DiagnosisFacaed { return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); } List localPatients = patientsService.queryPatient(patientsQuery); - Patients pat = null; + Patients pat = new Patients(); if (CollectionUtils.isNotEmpty(localPatients)) { pat = localPatients.get(0); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); @@ -142,6 +142,14 @@ public class DiagnosisFacaed { diagnosisResult.setZtfeText("高风险"); } } + }else{ + if(1 == sieveModel.getStatus()){//未筛查 + diagnosisResult.setIsCqSieve("0"); + }else if(2 == sieveModel.getStatus()){//已筛查 + diagnosisResult.setIsCqSieve("2"); + }else if(3 == sieveModel.getStatus()){//筛查中 + diagnosisResult.setIsCqSieve("1"); + } } }else{ diagnosisResult.setIsCqSieve("0");//未筛查 @@ -201,6 +209,12 @@ public class DiagnosisFacaed { return objectResponse; }else{//新增数据 diagnosisModel.setStatus("1"); + diagnosisModel.setRefStatus("0"); + //查询孕妇基本信息 + Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId()); + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + String applyWeek = com.lyms.platform.common.utils.StringUtils.dueWeek(days); + diagnosisModel.setApplyWeek(applyWeek); diagnosisService.addDiagnosis(diagnosisModel);//插入数据 BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -224,7 +238,9 @@ public class DiagnosisFacaed { diagnosisQuery.setId(id); DiagnosisModel dia = new DiagnosisModel(); dia = diagnosisService.findOneDiagnosisById(id); - br.setData(dia.contomap()); + //查询孕妇基本信息 + Patients patients = patientsService.findOnePatientById(dia.getParentId()); + br.setData(dia.contomap(patients)); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); return br; @@ -293,11 +309,13 @@ public class DiagnosisFacaed { return diagnosisManagerResult; } for(DiagnosisModel diagnosisModel : diaList){ - mList.add(diagnosisModel.contomap()); diagnosisModel.setCsStatus("0");//赋值为未产筛，如果已经做了产筛后边的代码判断会重新赋值 if(StringUtils.isEmpty(diagnosisModel.getParentId())){ continue; } + //查询孕妇基本信息 + Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId()); + SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(diagnosisModel.getParentId()); //查询产筛list @@ -311,7 +329,13 @@ public class DiagnosisFacaed { diagnosisModel.setTireNumber(sieveModel.getTireNumber().toString()); } if(sieveModel.getStatus() != null){ - diagnosisModel.setCsStatus(sieveModel.getStatus().toString()); + if(1 == sieveModel.getStatus()){ + diagnosisModel.setCsStatus("0"); + }else if(2 == sieveModel.getStatus()){ + diagnosisModel.setCsStatus("2"); + }else if(3 == sieveModel.getStatus()){ + diagnosisModel.setCsStatus("1"); + } } if(null != sieveModel.getZtfx()){ if(0 == sieveModel.getZtfx()){ @@ -328,6 +352,7 @@ public class DiagnosisFacaed { } } } + mList.add(diagnosisModel.contomap(patients)); } diagnosisManagerResult.setData(mList); diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); @@ -393,10 +418,13 @@ public class DiagnosisFacaed { return diagnosisManagerResult; } for(DiagnosisModel diagnosisModel : diaList){ - mList.add(diagnosisModel.contomap()); + if(StringUtils.isEmpty(diagnosisModel.getParentId())){ continue; } + //查询孕妇基本信息 + Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId()); + SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(diagnosisModel.getParentId()); //查询产筛list @@ -419,6 +447,7 @@ public class DiagnosisFacaed { diagnosisModel.setZtfeText("高风险"); } } + mList.add(diagnosisModel.contomap(patients)); } diagnosisManagerResult.setData(diaList); diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java index f9bf483..4e4923b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java @@ -69,8 +69,6 @@ public class DiagnosisAddRequest implements IBasicRequestConvert private String hospitalId; //查询号 private String queryNo; - //诊断结果（0，阴性；1，阳性） - private String diaResult; //申请孕周开始 private String applyWeekStart; //申请孕周结束 @@ -81,14 +79,22 @@ public class DiagnosisAddRequest implements IBasicRequestConvert private Integer nowWeeksEnd; //产前诊断申请时间 private String applyDate; - //诊断出具开始时间 - private String resultDateStart; - //诊断出具结束时间 - private String resultDateEnd; - //数据状态 - private String diaStatus; + //诊断时间 + private String diaDate; + //诊断单位 + private String diaHospital; + //诊断结果（0，阴性；1，阳性） + private String diaResult; //妊娠结局 private String rsResult; + //诊断出具时间 + private String resultDate; + //录入人员 + private String inPerson; + //数据状态 + private String diaStatus; + //转诊状态 + private String refStatus; public String getNeed() { return need; @@ -362,20 +368,36 @@ public class DiagnosisAddRequest implements IBasicRequestConvert this.applyDate = applyDate; } - public String getResultDateStart() { - return resultDateStart; + public String getDiaDate() { + return diaDate; + } + + public void setDiaDate(String diaDate) { + this.diaDate = diaDate; } - public void setResultDateStart(String resultDateStart) { - this.resultDateStart = resultDateStart; + public String getDiaHospital() { + return diaHospital; } - public String getResultDateEnd() { - return resultDateEnd; + public void setDiaHospital(String diaHospital) { + this.diaHospital = diaHospital; } - public void setResultDateEnd(String resultDateEnd) { - this.resultDateEnd = resultDateEnd; + public String getResultDate() { + return resultDate; + } + + public void setResultDate(String resultDate) { + this.resultDate = resultDate; + } + + public String getInPerson() { + return inPerson; + } + + public void setInPerson(String inPerson) { + this.inPerson = inPerson; } public String getDiaStatus() { @@ -394,6 +416,14 @@ public class DiagnosisAddRequest implements IBasicRequestConvert this.rsResult = rsResult; } + public String getRefStatus() { + return refStatus; + } + + public void setRefStatus(String refStatus) { + this.refStatus = refStatus; + } + @Override public DiagnosisModel convertToDataModel(){ DiagnosisModel diagnosisModel = new DiagnosisModel(); @@ -424,6 +454,12 @@ public class DiagnosisAddRequest implements IBasicRequestConvert diagnosisModel.setSendDate(DateUtil.parseYMD(sendDate)); diagnosisModel.setCollectHospitalId(collectHospitalId); diagnosisModel.setCreated(new Date()); + diagnosisModel.setRefStatus(refStatus); + diagnosisModel.setDiaDate(DateUtil.parseYMD(diaDate)); + diagnosisModel.setDiaHospital(diaHospital); + diagnosisModel.setDiaResult(diaResult); + diagnosisModel.setRsResult(rsResult); + diagnosisModel.setInPerson(inPerson); return diagnosisModel; } -- 1.8.3.1