From 8e4bae296da612b52e1a7e3e8f07bd6643da25cb Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 25 Sep 2018 08:47:17 +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 --- .../platform/biz/service/DiagnosisService.java | 4 +- .../com/lyms/platform/pojo/DiagnosisModel.java | 91 +++++++++++++++++++++- .../com/lyms/platform/query/DiagnosisQuery.java | 46 +++++++++++ .../operate/web/facade/DiagnosisFacaed.java | 63 ++++++++++++++- .../operate/web/request/DiagnosisAddRequest.java | 12 ++- .../operate/web/result/DiagnosisResult.java | 1 + 6 files changed, 208 insertions(+), 9 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DiagnosisService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DiagnosisService.java index 2ada967..bc1d834 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DiagnosisService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DiagnosisService.java @@ -35,8 +35,8 @@ public class DiagnosisService { } public DiagnosisModel addDiagnosis(DiagnosisModel data){ - data.setCreated(new Date()); - data.setModified(new Date()); + /*data.setCreated(new Date()); + data.setModified(new Date());*/ return diagnosisDao.addDiagnosis(data); } 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 eb2e50c..8b3b548 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 @@ -1,9 +1,12 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * 产前诊断申请（新增） @@ -19,9 +22,13 @@ public class DiagnosisModel extends BaseModel { private String cardNo;//身份证号 private String age;//年龄 private String dueWeek;//孕周 + private String applyWeek;//申请孕周 + private String nowWeek;//当前孕周 + private String rsResult;//妊娠结局 private Date yChanQi;//预产期 private String phone;//联系方式 private String diaProject;//诊断项目(1,羊水穿刺；2，绒毛穿刺；3，脐带血检测) + private String diaResult;//诊断结果(0，阴性；1，阳性) private Date birth;//出生日期 private String weight;//体重 private Date lastMenses;//末次月经 @@ -35,7 +42,8 @@ public class DiagnosisModel extends BaseModel { private String sendDocterId;//送检医生 private Date sendDate;//送检日期 private String collectHospitalId;//申请医院 - private Date created;//创建时间 + private Date created;//创建时间(申请时间) + private Date resultDate;//诊断出具时间 private Date modified;//修改时间 private String status;//数据来源(1,申请过来的；2，自动流转过来) private String diaStatus;//数据状态（0，未申请；1，已申请；2，已接收；3，已诊断） @@ -72,11 +80,11 @@ public class DiagnosisModel extends BaseModel { this.name = name; } - public String getIdCard() { + public String getCardNo() { return cardNo; } - public void setIdCard(String cardNo) { + public void setCardNo(String cardNo) { this.cardNo = cardNo; } @@ -255,4 +263,81 @@ public class DiagnosisModel extends BaseModel { public void setDiaStatus(String diaStatus) { this.diaStatus = diaStatus; } + + public String getNowWeek() { + return nowWeek; + } + + public void setNowWeek(String nowWeek) { + this.nowWeek = nowWeek; + } + + public String getRsResult() { + return rsResult; + } + + public void setRsResult(String rsResult) { + this.rsResult = rsResult; + } + + public String getDiaResult() { + return diaResult; + } + + public void setDiaResult(String diaResult) { + this.diaResult = diaResult; + } + + public Date getResultDate() { + return resultDate; + } + + public void setResultDate(Date resultDate) { + this.resultDate = resultDate; + } + + public String getApplyWeek() { + return applyWeek; + } + + public void setApplyWeek(String applyWeek) { + this.applyWeek = applyWeek; + } + + public Map contomap(){ + Map map = new HashMap(); + map.put("id",id); + map.put("hospitalId",hospitalId); + map.put("parentId",parentId); + map.put("name",name); + map.put("cardNo",cardNo); + map.put("age",age); + map.put("dueWeek",dueWeek); + map.put("yChanQi", DateUtil.getyyyy_MM_dd(yChanQi)); + map.put("phone",phone); + map.put("diaProject",diaProject); + map.put("birth",DateUtil.getyyyy_MM_dd(birth)); + map.put("weight",weight); + map.put("lastMenses",DateUtil.getyyyy_MM_dd(lastMenses)); + map.put("mensStartDay",mensStartDay); + map.put("mensEndDay",mensEndDay); + map.put("mensStopStartDay",mensStopStartDay); + map.put("mensStopEndDay",mensStopEndDay); + map.put("specimenNo",specimenNo); + map.put("collectDocterId",collectDocterId); + map.put("collectDate",DateUtil.getyyyy_MM_dd(collectDate)); + map.put("sendDocterId",sendDocterId); + map.put("sendDate",DateUtil.getyyyy_MM_dd(sendDate)); + map.put("collectHospitalId",collectHospitalId); + map.put("created",DateUtil.getyyyy_MM_dd(created)); + map.put("modified",DateUtil.getyyyy_MM_dd(modified)); + map.put("status",status); + map.put("diaStatus",diaStatus); + map.put("nowWeek",nowWeek); + map.put("rsResult",rsResult); + map.put("diaResult",diaResult); + map.put("applyWeek",applyWeek); + map.put("resultDate",DateUtil.getyyyy_MM_dd(resultDate)); + return map; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java index 14b1c4a..fe1c309 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java @@ -16,6 +16,12 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { private String parentId;//孕妇建档ID private String queryNos;//查询号 private String diaStatus;//数据状态 + private String queryNo;//查询号 + private String order;//排序字段 + private String hospitalId;//医院ID + private String cardNo;//身份证 + private String vcCardNo;//就诊卡号 + public String getId() { @@ -50,6 +56,46 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { this.diaStatus = diaStatus; } + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + + public String getOrder() { + return order; + } + + public void setOrder(String order) { + this.order = order; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getVcCardNo() { + return vcCardNo; + } + + public void setVcCardNo(String vccardNo) { + this.vcCardNo = vccardNo; + } + public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); if(null != id){ 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 064190e..0189a85 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 @@ -67,6 +67,8 @@ public class DiagnosisFacaed { patientsQuery.setPhoneOrCert(cardNo); } else if (StringUtils.isNotEmpty(vcCardNo)) { patientsQuery.setVcCardNo(vcCardNo); + } else{ + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); } List localPatients = patientsService.queryPatient(patientsQuery); Patients pat = null; @@ -147,6 +149,17 @@ public class DiagnosisFacaed { AntExChuModel chuModel = aList.get(0); diagnosisResult.setWeight(chuModel.getYqWeight()); } + + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + diagnosisQuery.setCardNo(cardNo); + diagnosisQuery.setVcCardNo(vcCardNo); + diagnosisQuery.setDiaStatus("0"); + diagnosisQuery.setHospitalId(hospitalId); + List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); + if(diaList != null && diaList.size() > 0){ + diagnosisResult.setId(diaList.get(0).getId()); + } + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(diagnosisResult); } @@ -161,6 +174,8 @@ public class DiagnosisFacaed { public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){ DiagnosisModel DiagnosisModel = dataresult.convertToDataModel(); DiagnosisModel.setDiaStatus("1"); + DiagnosisModel.setCreated(new Date()); + DiagnosisModel.setModified(new Date()); String hospital = autoMatchFacade.getHospitalId(userId); if(StringUtils.isNotEmpty(DiagnosisModel.getId())){//更新数据 DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); @@ -176,7 +191,7 @@ public class DiagnosisFacaed { objectResponse.setErrormsg("成功"); return objectResponse; }else{//新增数据 - DiagnosisModel.setDiaStatus("1");//已申请 + DiagnosisModel.setStatus("1"); diagnosisService.addDiagnosis(DiagnosisModel);//插入数据 BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -188,11 +203,55 @@ public class DiagnosisFacaed { } + /** + * 根据ID查询产前诊断信息 + * @param id + * @param userId + * @return + */ + public BaseResponse queryOneDiaById(String id,Integer userId){ + BaseObjectResponse br = new BaseObjectResponse(); + String hospital = autoMatchFacade.getHospitalId(userId); + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + diagnosisQuery.setId(id); + DiagnosisModel dia = new DiagnosisModel(); + dia = diagnosisService.findOneDiagnosisById(id); + br.setData(dia.contomap()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + } + + /** + * 产前诊断申请管理 + * @param dataresult + * @return + */ public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){ + DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); - return null; + diagnosisQuery.setPage(dataresult.getPage()); + diagnosisQuery.setLimit(dataresult.getLimit()); + diagnosisQuery.setNeed("need"); + diagnosisQuery.setOrder("created"); + //babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(babySieveAddRequest.getOperatorId())); + diagnosisQuery.setHospitalId("216"); + List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); + if(CollectionUtils.isEmpty(diaList)){ + diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); + diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); + diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return diagnosisManagerResult; + } + + diagnosisManagerResult.setData(diaList); + diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); + diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); + diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + return diagnosisManagerResult; } } 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 6d3f751..ff96ed7 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 @@ -32,7 +32,7 @@ public class DiagnosisAddRequest implements IBasicRequestConvert private String phone; //年龄 private String age; - //孕周 + //申请孕周 private String dueWeek; //预产期 private String yChanQi; @@ -66,6 +66,14 @@ public class DiagnosisAddRequest implements IBasicRequestConvert private String collectHospitalId; //医院ID private String hospitalId; + //查询号 + private String queryNo; + //诊断结果 + private String diaResult; + //申请孕周 + private String applyWeek; + + public String getNeed() { return need; @@ -290,7 +298,7 @@ public class DiagnosisAddRequest implements IBasicRequestConvert diagnosisModel.setHospitalId(hospitalId); diagnosisModel.setParentId(parentId); diagnosisModel.setName(name); - diagnosisModel.setIdCard(cardNo); + diagnosisModel.setCardNo(cardNo); diagnosisModel.setAge(age); diagnosisModel.setDueWeek(dueWeek); diagnosisModel.setyChanQi(DateUtil.parseYMD(yChanQi)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnosisResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnosisResult.java index f998eb2..bc8dd89 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnosisResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DiagnosisResult.java @@ -230,6 +230,7 @@ public class DiagnosisResult { } public DiagnosisResult convertToResult(Patients patient){ + setParentId(patient.getId()); setName(patient.getUsername()); try{ if (null != patient.getBirth()) { -- 1.8.3.1