From 85da9d87ddb32cf7e4bd32ad0b85d4c7d25fe898 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 5 Dec 2016 11:05:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=A9=9A=E6=A3=80=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E8=BF=94=E5=9B=9E=E5=8E=86=E5=8F=B2=E5=A9=9A?= =?UTF-8?q?=E6=A3=80=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/IFolicAcidDao.java | 25 ++++++++ .../platform/biz/dal/impl/FolicAcidDaoImpl.java | 51 +++++++++++++++ .../platform/biz/service/FolicAcidService.java | 53 ++++++++++++++++ .../web/facade/PremaritalCheckupFacade.java | 74 +++++++++++++--------- .../web/result/PremaritalCheckupHistoryResult.java | 48 ++++++++++++++ 5 files changed, 222 insertions(+), 29 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IFolicAcidDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/FolicAcidDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FolicAcidService.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupHistoryResult.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IFolicAcidDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IFolicAcidDao.java new file mode 100644 index 0000000..c7697bf --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IFolicAcidDao.java @@ -0,0 +1,25 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.FolicAcid; + +import java.util.List; + +/** + * Created by Administrator on 2016/12/1 0001. + */ +public interface IFolicAcidDao { + + public FolicAcid addFolicAcid(FolicAcid obj); + + public void updateFolicAcid(FolicAcid obj, String id); + + public void deleteFolicAcid(String id); + + public FolicAcid getFolicAcid(String id); + + public int queryFolicAcidCount(MongoQuery query); + + public List queryFolicAcid(MongoQuery query); + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/FolicAcidDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/FolicAcidDaoImpl.java new file mode 100644 index 0000000..e02a844 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/FolicAcidDaoImpl.java @@ -0,0 +1,51 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IFolicAcidDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.FolicAcid; +import org.bson.types.ObjectId; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * Created by Administrator on 2016/12/1 0001. + */ +@Repository("folicAcidDao") +public class FolicAcidDaoImpl extends BaseMongoDAOImpl implements IFolicAcidDao{ + @Override + public FolicAcid addFolicAcid(FolicAcid obj) { + return save(obj); + } + + @Override + public void updateFolicAcid(FolicAcid obj, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } + + @Override + public void deleteFolicAcid(String id) { + boolean check = ObjectId.isValid(id); + if (check) { + delete(new MongoQuery(new MongoCondition("id", new ObjectId(id), MongoOper.IS)).convertToMongoQuery()); + } + } + + @Override + public FolicAcid getFolicAcid(String id) { + return findById(id); + } + + @Override + public int queryFolicAcidCount(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } + + @Override + public List queryFolicAcid(MongoQuery query) { + return find(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FolicAcidService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FolicAcidService.java new file mode 100644 index 0000000..f8c5f40 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/FolicAcidService.java @@ -0,0 +1,53 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IFolicAcidDao; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.pojo.FolicAcid; +import com.lyms.platform.query.FolicAcidQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Created by Administrator on 2016/12/1 0001. + */ +@Service("folicAcidService") +public class FolicAcidService { + + @Autowired + private IFolicAcidDao folicAcidDao; + + public FolicAcid addFolicAcid(FolicAcid obj){ + return folicAcidDao.addFolicAcid(obj); + } + + public void updateFolicAcid(FolicAcid obj, String id){ + folicAcidDao.updateFolicAcid(obj, id); + } + + public FolicAcid getFolicAcid(String id){ + return folicAcidDao.getFolicAcid(id); + } + + public int queryFolicAcidCount(MongoQuery query){ + return folicAcidDao.queryFolicAcidCount(query); + } + + public List queryFolicAcid(FolicAcidQuery query){ + MongoQuery mongoQuery = query.convertToQuery(); + if (StringUtils.isNotEmpty(query.getNeed())) { + query.mysqlBuild(folicAcidDao.queryFolicAcidCount(mongoQuery)); + mongoQuery.start(query.getOffset()).end(query.getLimit()); + } + return folicAcidDao.queryFolicAcid(mongoQuery.addOrder(Sort.Direction.DESC, "created")); + } + + public List queryFolicAcidWithSort(FolicAcidQuery query,String sortkey,Sort.Direction sort){ + MongoQuery mongoQuery = query.convertToQuery(); + return folicAcidDao.queryFolicAcid(mongoQuery.addOrder(sort, sortkey)); + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index cdd0038..cc8155e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -13,7 +13,10 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest; +import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.PremaritalCheckup; import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.PremaritalCheckupQuery; @@ -40,7 +43,8 @@ public class PremaritalCheckupFacade { private ResidentsArchiveService residentsArchiveService; @Autowired private BasicConfigService basicConfigService; - + @Autowired + private OrganizationService organizationService; /** * 查询单个(男/女)婚前检查 @@ -48,70 +52,82 @@ public class PremaritalCheckupFacade { * @param id * @return */ - public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer id){ - - PremaritalCheckup result = new PremaritalCheckup(); + public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer id) { - Map resultMap = new HashMap<>(); - Map archiveMap = new HashMap<>(); + PremaritalCheckup result = null; + Map resultMap = new HashMap<>(); + Map archiveMap = new HashMap<>(); - ResidentsArchiveModel archiveModel = new ResidentsArchiveModel(); + ResidentsArchiveModel archiveModel = null; //婚检ID不为空 - if (StringUtils.isNotEmpty(requestParam.getId())){ + if (StringUtils.isNotEmpty(requestParam.getId())) { //婚检数据 result = premaritalCheckupService.getPremaritalCheckup(requestParam.getId()); - if (StringUtils.isNotEmpty(result.getParentId())){ + if (StringUtils.isNotEmpty(result.getParentId())) { //居民数据 archiveModel = residentsArchiveService.getResident(result.getParentId()); } - }else { + } else { ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息 - if (StringUtils.isNotEmpty(requestParam.getCertificateNum())){ + if (StringUtils.isNotEmpty(requestParam.getCertificateNum())) { archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(requestParam.getHospitalId()); archiveQuery.setCertificateNum(requestParam.getCertificateNum()); List modelList = residentsArchiveService.queryResident(archiveQuery); - if (CollectionUtils.isNotEmpty(modelList)){ + if (CollectionUtils.isNotEmpty(modelList)) { archiveModel = modelList.get(0); } - }else if (StringUtils.isNotEmpty(requestParam.getVcCardNo())){ + } else if (StringUtils.isNotEmpty(requestParam.getVcCardNo())) { archiveQuery.setYn(YnEnums.YES.getId()); archiveQuery.setHospitalId(requestParam.getHospitalId()); archiveQuery.setVcCardNo(requestParam.getVcCardNo()); - List modelList = residentsArchiveService.queryResident(archiveQuery); - if (CollectionUtils.isNotEmpty(modelList)){ + List modelList = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(modelList)) { archiveModel = modelList.get(0); } } - if (archiveModel!=null){ + if (archiveModel != null) { PremaritalCheckupQuery query = new PremaritalCheckupQuery(); query.setYn(YnEnums.YES.getId()); query.setHospitalId(requestParam.getHospitalId()); query.setParentId(archiveModel.getId()); List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); - if (CollectionUtils.isNotEmpty(checkupList)){ + if (CollectionUtils.isNotEmpty(checkupList)) { result = checkupList.get(0); + //历史婚检记录 + for (PremaritalCheckup data : checkupList){ + PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult(); + historyResult.setId(data.getId()); + historyResult.setPremaritalUpTime(data.getPremaritalUpTime()); + Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId())); + if (org!=null){ + historyResult.setPremaritalUpHospital(org.getName()); + historyResult.setHospitalId(data.getHospitalId()); + } + resultMap.put("premaritalCheckupHistory",historyResult); + } } } } - archiveMap.put("certificateNum",archiveModel.getCertificateNum()); - archiveMap.put("certificateTypeId",archiveModel.getCertificateTypeId()); - archiveMap.put("username",archiveModel.getUsername()); + + archiveMap.put("certificateNum", archiveModel.getCertificateNum()); + archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); + archiveMap.put("username", archiveModel.getUsername()); archiveMap.put("age", archiveModel.getAge()); - archiveMap.put("sex",archiveModel.getSex()); - archiveMap.put("birthday",getBirthday(archiveModel.getBirthday())); - archiveMap.put("phone",archiveModel.getPhone()); - archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(), - archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService)); - archiveMap.put("workUnit",archiveModel.getWorkUnit()); - - resultMap.put("archiveResult",archiveMap); - resultMap.put("checkupResult",result); + archiveMap.put("sex", archiveModel.getSex()); + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday())); + archiveMap.put("phone", archiveModel.getPhone()); + archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(), + archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService)); + archiveMap.put("workUnit", archiveModel.getWorkUnit()); + + resultMap.put("archiveResult", archiveMap); + resultMap.put("checkupResult", result); BaseObjectResponse response = new BaseObjectResponse(); response.setData(resultMap); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupHistoryResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupHistoryResult.java new file mode 100644 index 0000000..93132da --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupHistoryResult.java @@ -0,0 +1,48 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2016/12/5 0005. + */ +public class PremaritalCheckupHistoryResult { + + //建档ID + private String id; + //建档时间 + private String premaritalUpTime; + //建档医院 + private String premaritalUpHospital; + //医院ID + private String hospitalId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPremaritalUpHospital() { + return premaritalUpHospital; + } + + public void setPremaritalUpHospital(String premaritalUpHospital) { + this.premaritalUpHospital = premaritalUpHospital; + } + + public String getPremaritalUpTime() { + return premaritalUpTime; + } + + public void setPremaritalUpTime(String premaritalUpTime) { + this.premaritalUpTime = premaritalUpTime; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } +} -- 1.8.3.1