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 c8541a3..aaaf7f4 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 @@ -222,6 +222,9 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { if(null != id){ condition = condition.and("id", id, MongoOper.IS); } + if(null != parentId){ + condition = condition.and("parentId", parentId, MongoOper.IS); + } if(null != diaStatus){ condition = condition.and("diaStatus", diaStatus, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java index 2667e2b..b22172e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java @@ -45,25 +45,26 @@ public class DiagnosisController { * @return */ @ResponseBody - @RequestMapping(value = "/addDiagnosis",method = RequestMethod.POST) + @RequestMapping(value = "/addDiagnosis",method = RequestMethod.GET) public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest diagnosisAddRequest,HttpServletRequest request){ //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - /*diagnosisAddRequest.setName("李欣"); - diagnosisAddRequest.setId("5bad9c8193131f38be325f04"); - diagnosisAddRequest.setCardNo("210224199007216341"); - diagnosisAddRequest.setPhone("15533641942"); - diagnosisAddRequest.setAge("28"); - diagnosisAddRequest.setDueWeek("孕14周+2天"); - diagnosisAddRequest.setyChanQi("2019-03-08"); + /*diagnosisAddRequest.setName("aaaa"); + diagnosisAddRequest.setId("5bade15d0cf2d495ecedb46f"); + diagnosisAddRequest.setParentId("5b0d033f0cf2424cd354b770"); + diagnosisAddRequest.setCardNo("152723198803201302"); + diagnosisAddRequest.setPhone("13548143526"); + diagnosisAddRequest.setAge("30"); + diagnosisAddRequest.setDueWeek("孕19周+1天"); + diagnosisAddRequest.setyChanQi("2019-02-21"); diagnosisAddRequest.setDiaProject("1");//羊水穿刺 - diagnosisAddRequest.setBirth("1990-07-21"); - diagnosisAddRequest.setWeight("60"); - diagnosisAddRequest.setLastMenses("2018-06-01"); + diagnosisAddRequest.setBirth("1988-03-20"); + diagnosisAddRequest.setWeight("62"); + diagnosisAddRequest.setLastMenses("2018-05-17"); diagnosisAddRequest.setMensStartDay("28"); diagnosisAddRequest.setMensEndDay("30"); diagnosisAddRequest.setMensStopStartDay("5"); diagnosisAddRequest.setMensStopEndDay("7"); - diagnosisAddRequest.setSpecimenNo("00001"); + diagnosisAddRequest.setSpecimenNo("00006"); diagnosisAddRequest.setCollectDocterId("1000000185"); diagnosisAddRequest.setCollectDate("2018-09-28"); diagnosisAddRequest.setSendDocterId("1000000185"); @@ -101,4 +102,19 @@ public class DiagnosisController { return diagnosisFacaed.queryDiagnosisList(dataresult); } + + /** + * 产前诊断管理 + * @param dataresult + * @param request + * @return + */ + @ResponseBody + @RequestMapping(value = "/getDiagnosisLab",method = RequestMethod.GET) + public DiagnosisManagerResult getDiagnosisLab(DiagnosisAddRequest dataresult,HttpServletRequest request){ + //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + dataresult.setHospitalId("1000000185"); + return diagnosisFacaed.queryDiagnosisLab(dataresult); + } + } 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 eea5c3c..5a92b77 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 @@ -23,6 +23,7 @@ import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * Created by Administrator on 2018/9/11. @@ -74,6 +75,12 @@ public class DiagnosisFacaed { Patients pat = null; if (CollectionUtils.isNotEmpty(localPatients)) { pat = localPatients.get(0); + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + diagnosisQuery.setParentId(pat.getId()); + List dia = diagnosisService.queryDiagnosis(diagnosisQuery); + if(dia != null && dia.size() > 0){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("已经申请产前诊断，不能重复申请！"); + } } else { patientsQuery.setHospitalId(null); List areaPatients = patientsService.queryPatient(patientsQuery); @@ -172,30 +179,30 @@ public class DiagnosisFacaed { * @return */ public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest dataresult,Integer userId){ - DiagnosisModel DiagnosisModel = dataresult.convertToDataModel(); - DiagnosisModel.setDiaStatus("1"); - DiagnosisModel.setCreated(new Date()); - DiagnosisModel.setModified(new Date()); + 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())){//更新数据 + if(StringUtils.isNotEmpty(diagnosisModel.getId())){//更新数据 DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); - diagnosisQuery.setParentId(DiagnosisModel.getId()); + diagnosisQuery.setId(diagnosisModel.getId()); List list = diagnosisService.queryDiagnosis(diagnosisQuery); //更新数据 - diagnosisService.updateDiagnosisById(DiagnosisModel,DiagnosisModel.getId()); + diagnosisService.updateDiagnosisById(diagnosisModel,diagnosisModel.getId()); //添加记录 - operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), DiagnosisModel, OptActionEnums.UPDATE.getId(), "产前诊断申请修改完成"); + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospital), list.get(0), diagnosisModel, OptActionEnums.UPDATE.getId(), "产前诊断申请修改完成"); BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setData(DiagnosisModel.getId()); + objectResponse.setData(diagnosisModel.getId()); objectResponse.setErrormsg("成功"); return objectResponse; }else{//新增数据 - DiagnosisModel.setStatus("1"); - diagnosisService.addDiagnosis(DiagnosisModel);//插入数据 + diagnosisModel.setStatus("1"); + diagnosisService.addDiagnosis(diagnosisModel);//插入数据 BaseObjectResponse objectResponse = new BaseObjectResponse(); objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); - objectResponse.setData(DiagnosisModel.getId()); + objectResponse.setData(diagnosisModel.getId()); objectResponse.setErrormsg("成功"); return objectResponse; } @@ -230,6 +237,7 @@ public class DiagnosisFacaed { public DiagnosisManagerResult queryDiagnosisList(DiagnosisAddRequest dataresult){ DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + List> mList = new ArrayList>(); if(null != dataresult.getDiaResult()){ diagnosisQuery.setDiaResult(dataresult.getDiaResult()); } @@ -283,10 +291,11 @@ public class DiagnosisFacaed { return diagnosisManagerResult; } for(DiagnosisModel diagnosisModel : diaList){ - SieveQuery sieveQuery = new SieveQuery(); + mList.add(diagnosisModel.contomap()); if(StringUtils.isEmpty(diagnosisModel.getParentId())){ continue; } + SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(diagnosisModel.getParentId()); //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); @@ -309,7 +318,7 @@ public class DiagnosisFacaed { } } } - diagnosisManagerResult.setData(diaList); + diagnosisManagerResult.setData(mList); diagnosisManagerResult.setPageInfo(diagnosisQuery.getPageInfo()); diagnosisManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); diagnosisManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); @@ -323,6 +332,7 @@ public class DiagnosisFacaed { * @return */ public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){ + List> mList = new ArrayList>(); DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); if(StringUtils.isNotEmpty(dataresult.getApplyDate())){ @@ -372,6 +382,10 @@ public class DiagnosisFacaed { return diagnosisManagerResult; } for(DiagnosisModel diagnosisModel : diaList){ + mList.add(diagnosisModel.contomap()); + if(StringUtils.isEmpty(diagnosisModel.getParentId())){ + continue; + } SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(diagnosisModel.getParentId()); //查询产筛list