diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index e30ecc5..5e72960 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -37,7 +37,7 @@ import java.util.*;
/**
* 产筛门面
- *
+ *
* Created by Administrator on 2016/6/30 0030.
*/
@Component
@@ -62,23 +62,23 @@ public class SieveFacade {
* @param sieveAddRequest
* @return
*/
- public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest,Integer userId) {
- SieveResultModel sieveResultModel =sieveAddRequest.convertToDataModel();
- if(StringUtils.isNotEmpty(sieveAddRequest.getId())){
- SieveResultQuery sieveResultQuery=new SieveResultQuery();
+ public BaseResponse addOneSieve(SieveAddRequest sieveAddRequest, Integer userId) {
+ SieveResultModel sieveResultModel = sieveAddRequest.convertToDataModel();
+ if (StringUtils.isNotEmpty(sieveAddRequest.getId())) {
+ SieveResultQuery sieveResultQuery = new SieveResultQuery();
sieveResultQuery.setId(sieveAddRequest.getId());
- sieveService.update(sieveResultQuery.convertToQuery(),sieveResultModel);
- }else{
+ sieveService.update(sieveResultQuery.convertToQuery(), sieveResultModel);
+ } else {
sieveService.addSieve(sieveResultModel);
}
- SieveQuery sieveQuery=new SieveQuery();
+ SieveQuery sieveQuery = new SieveQuery();
sieveQuery.setParentId(sieveAddRequest.getParentId());
sieveQuery.setYn(YnEnums.YES.getId());
String hospitalId = autoMatchFacade.getHospitalId(userId);
sieveQuery.setHospitalId(hospitalId);
List list = sieveService.queryList(sieveQuery);
- SieveModel sieveModel=new SieveModel();
+ SieveModel sieveModel = new SieveModel();
sieveModel.setStatus(3);
sieveModel.setId(list.get(0).getId());
sieveModel.setHospitalId(hospitalId);
@@ -86,40 +86,42 @@ public class SieveFacade {
sieveService.updateOneChanQianDiaSieve(sieveModel);
return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
+
//产筛结果
- public BaseResponse getOneSieve(String parentId){
- SieveResultQuery sieveResultQuery=new SieveResultQuery();
+ public BaseResponse getOneSieve(String parentId) {
+ SieveResultQuery sieveResultQuery = new SieveResultQuery();
sieveResultQuery.setParentId(parentId);
- List sb= sieveService.queryListSieveResult(sieveResultQuery);
- SieveResult sieveResult=new SieveResult();
- if(CollectionUtils.isNotEmpty(sb)){
- SieveResultModel sieveResultModel=sb.get(0);
+ List sb = sieveService.queryListSieveResult(sieveResultQuery);
+ SieveResult sieveResult = new SieveResult();
+ if (CollectionUtils.isNotEmpty(sb)) {
+ SieveResultModel sieveResultModel = sb.get(0);
// Patients patients= patientsService.findOnePatientById(sieveResultModel.getParentId());
sieveResult.convert(sieveResultModel, null);
}
return new BaseObjectResponse().setData(sieveResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
+
//产前诊断结果
- public BaseResponse getOneChanQianDiaSieve(String id){
- SieveQuery sieveQuery=new SieveQuery();
+ public BaseResponse getOneChanQianDiaSieve(String id) {
+ SieveQuery sieveQuery = new SieveQuery();
sieveQuery.setYn(YnEnums.YES.getId());
sieveQuery.setId(id);
- List sieveModels = sieveService.queryList(sieveQuery);
- SieveDetailResult sieveDetailResult=new SieveDetailResult();
+ List sieveModels = sieveService.queryList(sieveQuery);
+ SieveDetailResult sieveDetailResult = new SieveDetailResult();
- if(CollectionUtils.isNotEmpty(sieveModels)){
- SieveModel sieveModel= sieveModels.get(0);
+ if (CollectionUtils.isNotEmpty(sieveModels)) {
+ SieveModel sieveModel = sieveModels.get(0);
// Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
sieveDetailResult.convert(sieveModel);
- java.util.Map map = new HashMap<>();
- String diaUnit= sieveModel.getDiaUnit();
- map.put("id","-1");
- map.put("name",diaUnit);
- if(StringUtils.isNotEmpty(diaUnit)&&NumberUtils.isNumber(diaUnit)){
+ java.util.Map map = new HashMap<>();
+ String diaUnit = sieveModel.getDiaUnit();
+ map.put("id", "-1");
+ map.put("name", diaUnit);
+ if (StringUtils.isNotEmpty(diaUnit) && NumberUtils.isNumber(diaUnit)) {
Organization organization = organizationService.getOrganization(Integer.valueOf(diaUnit));
- if(null!=organization){
- map.put("id",organization.getId()+"");
- map.put("name",organization.getName());
+ if (null != organization) {
+ map.put("id", organization.getId() + "");
+ map.put("name", organization.getName());
}
}
@@ -127,22 +129,24 @@ public class SieveFacade {
}
return new BaseObjectResponse().setData(sieveDetailResult).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
}
- public BaseResponse getCheckItem(String id,Integer userId) {
+
+ public BaseResponse getCheckItem(String id, Integer userId) {
SieveApplyOrderQuery sieveQuery = new SieveApplyOrderQuery();
sieveQuery.setYn(YnEnums.YES.getId());
sieveQuery.setParentId(id);
- String hospital = autoMatchFacade.getHospitalId(userId);
+ String hospital = autoMatchFacade.getHospitalId(userId);
sieveQuery.setHospitalId(hospital);
- List applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveQuery);
- List list = new ArrayList();
- if(CollectionUtils.isNotEmpty(applyOrderModels)) {
+ List applyOrderModels = applyOrderService.querySieveApplyOrderWithQuery(sieveQuery);
+ List list = new ArrayList();
+ if (CollectionUtils.isNotEmpty(applyOrderModels)) {
SieveApplyOrderModel sieveModel = applyOrderModels.get(0);
- if(StringUtils.isNotEmpty(sieveModel.getCheckItem())){
- list=JsonUtil.jkstr2Obj(sieveModel.getCheckItem(), List.class) ;
+ if (StringUtils.isNotEmpty(sieveModel.getCheckItem())) {
+ list = JsonUtil.jkstr2Obj(sieveModel.getCheckItem(), List.class);
}
}
- return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+ return new BaseObjectResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
}
+
/**
* 产前诊断
*
@@ -169,7 +173,7 @@ public class SieveFacade {
* @param cqSieveQueryRequest
* @return
*/
- public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest,Integer userId,String needPage) {
+ public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage) {
SieveQuery sieveQuery = new SieveQuery();
sieveQuery.setYn(YnEnums.YES.getId());
sieveQuery.setPhone(cqSieveQueryRequest.getPhone());
@@ -178,18 +182,18 @@ public class SieveFacade {
sieveQuery.setRenShenResult(cqSieveQueryRequest.getRenShenResult());
sieveQuery.setName(cqSieveQueryRequest.getName());
sieveQuery.setCardNo(cqSieveQueryRequest.getCardNo());
- if(null!=cqSieveQueryRequest.getDueWeekStart()){
- sieveQuery.setDueWeekStart(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekStart()));
+ if (null != cqSieveQueryRequest.getDueWeekStart()) {
+ sieveQuery.setDueWeekStart(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekStart()));
}
- if(null!=cqSieveQueryRequest.getDueWeekEnd()){
- sieveQuery.setDueWeekEnd(7*Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd())+6);
+ if (null != cqSieveQueryRequest.getDueWeekEnd()) {
+ sieveQuery.setDueWeekEnd(7 * Integer.valueOf(cqSieveQueryRequest.getDueWeekEnd()) + 6);
}
sieveQuery.setZtfx(cqSieveQueryRequest.getZtfx());
sieveQuery.setStatus(cqSieveQueryRequest.getIsNotify());
sieveQuery.setPage(cqSieveQueryRequest.getPage());
sieveQuery.setLimit(cqSieveQueryRequest.getLimit());
sieveQuery.setNeed(needPage);
- String hospitalId=autoMatchFacade.getHospitalId(userId);
+ String hospitalId = autoMatchFacade.getHospitalId(userId);
sieveQuery.setHospitalId(hospitalId);
//查询产筛list
List list = sieveService.queryList(sieveQuery);
@@ -197,35 +201,35 @@ public class SieveFacade {
if (CollectionUtils.isNotEmpty(list)) {
for (SieveModel sieveModel : list) {
SieveListResult sieveListResult = new SieveListResult();
- AntExQuery antExQuery=new AntExQuery();
+ AntExQuery antExQuery = new AntExQuery();
antExQuery.setYn(YnEnums.YES.getId());
antExQuery.setHospitalId(hospitalId);
antExQuery.setParentId(sieveModel.getParentId());
List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
- if(CollectionUtils.isNotEmpty(list1)){
- if(StringUtils.isNotEmpty(list1.get(0).getTireNumber())){
+ if (CollectionUtils.isNotEmpty(list1)) {
+ if (StringUtils.isNotEmpty(list1.get(0).getTireNumber())) {
sieveModel.setTireNumber(NumberUtils.toInt(list1.get(0).getTireNumber()));
}
- }else{
- AntExChuQuery antExChuQuery=new AntExChuQuery();
+ } else {
+ AntExChuQuery antExChuQuery = new AntExChuQuery();
antExChuQuery.setYn(YnEnums.YES.getId());
antExChuQuery.setParentId(sieveModel.getParentId());
antExChuQuery.setHospitalId(hospitalId);
- List antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery);
- if(CollectionUtils.isNotEmpty(antExChuModels)){
- if(StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())){
+ List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
+ if (CollectionUtils.isNotEmpty(antExChuModels)) {
+ if (StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())) {
sieveModel.setTireNumber(NumberUtils.toInt(antExChuModels.get(0).getTireNumber()));
}
}
}
sieveListResult.convertToResult(sieveModel);
- Patients patients= patientsService.findOnePatientById(sieveModel.getParentId());
- if(null!=patients){
+ Patients patients = patientsService.findOnePatientById(sieveModel.getParentId());
+ if (null != patients) {
sieveListResult.setIsGravida(patients.getFmDate() != null ? "0" : "1");
- if(1==patients.getDueStatus())
+ if (null != patients.getDueStatus() && 1 == patients.getDueStatus())
sieveListResult.setcDueWeek("终止妊娠");
- else if(patients.getType()==3){
+ else if (patients.getType() == 3) {
sieveListResult.setcDueWeek("已分娩");
}
}
@@ -238,16 +242,14 @@ public class SieveFacade {
public void exportCqsieves(CqSieveQueryRequest cqSieveQueryRequest, Integer id, HttpServletResponse response) {
try {
- BaseListResponse listResponse = (BaseListResponse)queryList(cqSieveQueryRequest, id,null);
+ BaseListResponse listResponse = (BaseListResponse) queryList(cqSieveQueryRequest, id, null);
List list = listResponse.getData();
- List