diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java index 5651d41..d36e845 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java @@ -16,7 +16,7 @@ public interface IVisitDao { public VisitModel getVisit(String id); - public int queryPuerperaCount(MongoQuery query); + public int queryVisitCount(MongoQuery query); public List queryVisit(MongoQuery query); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java index 78c39e9..18d7970 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java @@ -35,7 +35,7 @@ public class VisitDaoImpl extends BaseMongoDAOImpl implements IVisit } @Override - public int queryPuerperaCount(MongoQuery query) { + public int queryVisitCount(MongoQuery query) { return (int) count(query.convertToMongoQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java index 6a2632d..a3c0fe6 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java @@ -30,7 +30,7 @@ public class VisitService { public List queryVisit(VisitQuery visitQuery) { MongoQuery query = visitQuery.convertToQuery(); if (StringUtils.isNotEmpty(visitQuery.getNeed())) { - visitQuery.mysqlBuild(iVisitDao.queryPuerperaCount(visitQuery.convertToQuery())); + visitQuery.mysqlBuild(iVisitDao.queryVisitCount(visitQuery.convertToQuery())); query.start(visitQuery.getOffset()).end(visitQuery.getLimit()); } @@ -41,4 +41,7 @@ public class VisitService { public Page queryVisitsAndPage(int start, int end) { return iVisitDao.findPage(MongoCondition.newInstance().toMongoQuery().start(start).end(end).addOrder(Direction.ASC, "id")); } + public int queryVisitCount(VisitQuery visitQuery){ + return iVisitDao.queryVisitCount(visitQuery.convertToQuery()); + } } diff --git a/platform-common/src/main/java/com/lyms/platform/common/constants/ConstantInterface.java b/platform-common/src/main/java/com/lyms/platform/common/constants/ConstantInterface.java index a04673f..7c73f07 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/constants/ConstantInterface.java +++ b/platform-common/src/main/java/com/lyms/platform/common/constants/ConstantInterface.java @@ -6,6 +6,8 @@ package com.lyms.platform.common.constants; public interface ConstantInterface { String SHORT_MESSAGE_PRE="【龙源美生】"; + + String UN_VISIT="未访视"; //成功 int SUCCESS = 0; //发送验证码失败 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index fe42121..e057eb9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -5,8 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.lyms.platform.biz.service.CommunityConfigService; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.CommunityConfig; @@ -17,8 +16,6 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.PuerperaService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; @@ -43,6 +40,8 @@ public class BabyManagerFacade { @Autowired private BabyService babyService; + @Autowired + private VisitFacade visitFacade; /** * 根据条件查询符合条件的新生儿 @@ -224,8 +223,9 @@ public class BabyManagerFacade { babyResult.setMotherName("母亲名字"); babyResult.setMotherPhone(patients.getPhone()); babyResult.setId(patients.getId()); - babyResult.setVisit(patients.getIsVisit() == 0 ? "未访视" : "已访视"); + String tips= visitFacade.getFindTips(patients.getId()); + babyResult.setVisit(tips); babyResult.setVisitStatus(patients.getIsVisit()); return babyResult; } -} +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index bc612d2..9b1f417 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -34,6 +34,8 @@ public class PatientFacade { private PatientsService patientsService; @Autowired private CommunityConfigService communityConfigService; + @Autowired + private VisitFacade visitFacade; /** @@ -98,8 +100,8 @@ public class PatientFacade { comm= communityConfig.getName(); } } - - data.add(result.convertToResult(model,comm)); + String tips= visitFacade.getFindTips(model.getId()); + data.add(result.convertToResult(model,comm,tips)); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 1ea96df..c974854 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -1,16 +1,6 @@ package com.lyms.platform.operate.web.facade; -import java.util.ArrayList; -import java.util.List; - import com.lyms.platform.biz.service.*; -import com.lyms.platform.pojo.*; -import com.lyms.platform.query.PatientsQuery; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseObjectResponse; @@ -22,13 +12,24 @@ import com.lyms.platform.operate.web.result.BabyVisitResult; import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit; import com.lyms.platform.operate.web.result.SimpleVisit; import com.lyms.platform.operate.web.result.VisitResult; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.BabyVisitModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.VisitModel; import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.PuerperaModelQuery; +import com.lyms.platform.query.PatientsQuery; import com.lyms.platform.query.VisitQuery; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; /** * 产后访视门面 - * + * * @author Administrator */ @Component @@ -50,7 +51,7 @@ public class VisitFacade { /** * 根据产妇id获取产妇的访视信息 - * + * * @param id * @return */ @@ -60,13 +61,12 @@ public class VisitFacade { /** * 根据产妇身份证号获取产妇访视记录 - * - * @param cardNo - * 身份证号 + * + * @param cardNo 身份证号 * @return */ public BaseObjectResponse findOneByCardNo(String cardNo) { - Patients puerperaModel= findOnePuerperaByCardNo(cardNo); + Patients puerperaModel = findOnePuerperaByCardNo(cardNo); if (null == puerperaModel) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在"); } @@ -75,7 +75,7 @@ public class VisitFacade { /** * 构建产妇的访视记录信息 - * + * * @param puerperaModel * @return */ @@ -101,9 +101,8 @@ public class VisitFacade { /** * 根据身份证号码获取产妇信息 - * - * @param cardNo - * 身份证号码 + * + * @param cardNo 身份证号码 * @return 产妇信息 */ private Patients findOnePuerperaByCardNo(String cardNo) { @@ -118,9 +117,8 @@ public class VisitFacade { /** * 增加产妇访视记录 - * - * @param visitRequest - * 产妇访视记录请求 + * + * @param visitRequest 产妇访视记录请求 * @return 返回结果 */ public BaseResponse addOneVisit(VisitAddRequest visitRequest) { @@ -148,7 +146,7 @@ public class VisitFacade { } else { // 表示是新的产妇直接新增 // parentId = puerperaService.addPuerpera(visitRequest.getPuerpera().build()).getId(); - parentId =patientsService.addPatient(visitRequest.getPatients()).getId(); + parentId = patientsService.addPatient(visitRequest.getPatients()).getId(); } // 如果为空表示新增 @@ -165,7 +163,7 @@ public class VisitFacade { /** * 增加一条小孩的访视记录 - * + * * @param babyVisitAddRequest * @return */ @@ -187,11 +185,19 @@ public class VisitFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public String getFindTips(String parentId) { + VisitQuery visitQuery = new VisitQuery(); + visitQuery.setParentId(parentId); + + int count = visitService.queryVisitCount(visitQuery); + + return count > 0 ? "未访视" : "访视" + count + "次"; + } + /** * 根据产妇的身份证号码获取小孩的访视记录 - * - * @param cardNo - * 产妇身份证号码 + * + * @param cardNo 产妇身份证号码 */ public BaseObjectResponse findBabyVisitByMotherCardNo(String cardNo) { // 根据身份证号获取到产妇信息 @@ -203,18 +209,18 @@ public class VisitFacade { } private BaseObjectResponse findBabyVisit(Patients puerperaModel) { - BabyModelQuery babyQuery = new BabyModelQuery(); + BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setParentId(puerperaModel.getId()); babyQuery.setYn(YnEnums.YES.getId()); - List babies= babyService.queryBabyWithQuery(babyQuery); + List babies = babyService.queryBabyWithQuery(babyQuery); BabyVisitResult babyVisitResult = new BabyVisitResult(); List data = new ArrayList(); - for(BabyModel bModel:babies){ - // 根据产妇id查询该产妇下的小孩访视 + for (BabyModel bModel : babies) { + // 根据产妇id查询该产妇下的小孩访视 List babyVisits = babyVisitService.findAllVisitByParentId(bModel.getId()); // 数据转换 - + for (BabyVisitModel visit : babyVisits) { BabyVisit babyVisit = babyVisitResult.new BabyVisit(); // 转换小孩的访视数据 @@ -231,7 +237,7 @@ public class VisitFacade { /** * 根据小孩id查询 - * + * * @param babyId * @return */ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java index b79679b..b75cd59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java @@ -127,7 +127,7 @@ public class PuerperaResult { return this; } - public PuerperaResult convertToResult(Patients model,String comm) { + public PuerperaResult convertToResult(Patients model,String comm,String tips) { String addr = ""; if (StringUtils.isNotEmpty(model.getAddress())) { try { @@ -140,7 +140,7 @@ public class PuerperaResult { setAddress(addr); setId(model.getId()); setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); - setVisit(model.getIsVisit() == 0 ? "未访视" : "已访视"); + setVisit(tips); setCommunityId(StringUtils.isEmpty(model.getCommunityId()) ? "" : model.getCommunityId()); setCommunity(comm); setPhone(model.getPhone());