From c58508002aa2b33b8a4cb9c8dded8b14b7e54c4c Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Thu, 31 Oct 2019 13:14:29 +0800 Subject: [PATCH] bug update --- .../permission/dao/master/FolviteMapper.java | 3 +- .../resources/mainOrm/master/FolviteMapper.xml | 39 +------ .../web/service/impl/FolviteServiceImpl.java | 120 +++++++++++++++------ 3 files changed, 88 insertions(+), 74 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java index 40af0a0..fb19fcd 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/FolviteMapper.java @@ -12,7 +12,7 @@ public interface FolviteMapper { * * @return */ - FolviteRecordModel queryOne(FolviteQuery query); + List queryOne(FolviteQuery query); /** * 保存叶酸建档记录 @@ -39,6 +39,7 @@ public interface FolviteMapper { /** * 查询总条数 + * * @param query * @return */ diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml index f941d8c..598cebd 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteMapper.xml @@ -93,44 +93,7 @@ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java index e747886..6d5b472 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java @@ -24,6 +24,7 @@ import com.lyms.platform.pojo.ResidentsArchiveModel; import com.lyms.platform.query.ResidentsArchiveQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.ObjectUtils; import java.util.*; @@ -56,6 +57,7 @@ public class FolviteServiceImpl implements FolviteService { @Override public BaseResponse queryFolvite(String vcCardNo, String cardNo, String certificateTypeId, Integer userId) { Map response = new HashMap<>(); + boolean flag = true; String hospitalId = autoMatchFacade.getHospitalId(userId); FolviteQuery folviteQuery = new FolviteQuery(); ResidentsArchiveQuery query = new ResidentsArchiveQuery(); @@ -64,7 +66,7 @@ public class FolviteServiceImpl implements FolviteService { query.setVcCardNo(vcCardNo); } if (StringUtils.isNotEmpty(cardNo)) { - folviteQuery.setVcCard(cardNo); + folviteQuery.setCardNo(cardNo); folviteQuery.setCertificateType(certificateTypeId); query.setCertificateTypeId(certificateTypeId); query.setCertificateNum(cardNo); @@ -72,29 +74,69 @@ public class FolviteServiceImpl implements FolviteService { //未结束孕辰 folviteQuery.setIspregnancy(0); folviteQuery.setHospitalId(hospitalId); - FolviteRecordModel queryOne = folviteMapper.queryOne(folviteQuery); + List recordModels = folviteMapper.queryOne(folviteQuery); Map data = new HashMap<>(); - if (null != queryOne) { - data.put("id", queryOne.getId()); - data.put("name", queryOne.getName()); - data.put("age", DateUtil.getAge(queryOne.getBirthday())); - data.put("sex", queryOne.getSex()); - data.put("birth", DateUtil.getyyyy_MM_dd(queryOne.getBirthday())); - data.put("phone", queryOne.getPhone()); - data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(), - queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService)); + String womanId = null; + if (CollectionUtils.isNotEmpty(recordModels)) { + FolviteRecordModel queryOne = recordModels.get(0); + if (null != queryOne) { + data.put("id", queryOne.getId()); + data.put("name", queryOne.getName()); + data.put("age", DateUtil.getAge(queryOne.getBirthday())); + data.put("sex", queryOne.getSex()); + data.put("birth", DateUtil.getyyyy_MM_dd(queryOne.getBirthday())); + data.put("phone", queryOne.getPhone()); + data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(), + queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService)); + flag = false; + womanId = queryOne.getWomanId(); + } } - //如果为空查询孕妇档案 进行叶酸档案建档 回显孕妇档案数据回去 - query.setSex(SystemConfig.WOMAN_ID); - query.setYn(YnEnums.YES.getId()); - query.setHospitalId(hospitalId); - List archiveModels = residentsArchiveService.queryResident(query); - if (CollectionUtils.isEmpty(archiveModels)) { - return new BaseResponse().setErrormsg("为妇女建档,请先建档案!").setErrorcode(1); + /* FolviteQuery queryFolvite = new FolviteQuery(); + queryFolvite.setWomanId(womanId); + queryFolvite.setCardNo(cardNo); + List recordModel = queryFolviteList(queryFolvite); + List>> list = new ArrayList(); + if (CollectionUtils.isNotEmpty(recordModel)) { + FolviteRecordQuery recordQuery = new FolviteRecordQuery(); + for (FolviteRecordModel folviteModel : recordModel) { + List> listMap = new ArrayList<>(); + recordQuery.setFolviteId(folviteModel.getId()); + List folviteRecordModels = queryFolviteReceiveList(recordQuery); + if (CollectionUtils.isNotEmpty(folviteRecordModels)) { + for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) { + Map recordMap = new HashMap<>(); + recordMap.put("drawCount", folviteRecordModel.getReceiveNumber()); + recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate())); + recordMap.put("id", folviteRecordModel.getId()); + recordMap.put("other", folviteRecordModel.getIsconceive()); + if (folviteRecordModel.getIsconceive() == 0) { + recordMap.put("pregnancyType", "孕前"); + } else { + recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周"); + } + listMap.add(recordMap); + } + } + list.add(listMap); + } + }*/ + + FolviteResult result = null; + if (flag) { + //如果为空查询孕妇档案 进行叶酸档案建档 回显孕妇档案数据回去 + query.setSex(SystemConfig.WOMAN_ID); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(hospitalId); + List archiveModels = residentsArchiveService.queryResident(query); + if (CollectionUtils.isEmpty(archiveModels)) { + return new BaseResponse().setErrormsg("为妇女建档,请先建档案!").setErrorcode(1); + } + //获取最新的档案 + ResidentsArchiveModel archiveModel = archiveModels.get(0); + result = result(archiveModel); } - //获取最新的档案 - ResidentsArchiveModel archiveModel = archiveModels.get(0); - FolviteResult result = result(archiveModel); + BaseResponse responses = new BaseResponse(); response.put("baseInfo", data); response.put("history", "历史记录"); @@ -167,25 +209,31 @@ public class FolviteServiceImpl implements FolviteService { FolviteQuery folviteQuery = new FolviteQuery(); folviteQuery.setHospitalId(hospitalId); folviteQuery.setId(folviteId); - FolviteRecordModel recordModel = folviteMapper.queryOne(folviteQuery); + List folviteRecordModels1 = folviteMapper.queryOne(folviteQuery); String womanId = null; + String cardNo = null; Map folvite = new HashMap<>(); - if (recordModel != null) { - folvite.put("username", recordModel.getName()); - folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday())); - folvite.put("certificateNum", recordModel.getCardNo()); - folvite.put("certificateTypeId", recordModel.getCertificateType()); - folvite.put("id", recordModel.getId()); - folvite.put("phone", recordModel.getPhone()); - folvite.put("residenceRegister", CommonsHelper.getResidence(recordModel.getDomicileProvince(), recordModel.getDomicileCity(), - recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService)); - folvite.put("alreadySum", "已领总数"); - folvite.put("canSum", "可领总数"); - womanId = recordModel.getWomanId(); + if (CollectionUtils.isNotEmpty(folviteRecordModels1)) { + FolviteRecordModel recordModel = folviteRecordModels1.get(0); + + if (recordModel != null) { + folvite.put("username", recordModel.getName()); + folvite.put("birthday", DateUtil.getyyyy_MM_dd(recordModel.getBirthday())); + folvite.put("certificateNum", recordModel.getCardNo()); + folvite.put("certificateTypeId", recordModel.getCertificateType()); + folvite.put("id", recordModel.getId()); + folvite.put("phone", recordModel.getPhone()); + folvite.put("residenceRegister", CommonsHelper.getResidence(recordModel.getDomicileProvince(), recordModel.getDomicileCity(), + recordModel.getDomicileArea(), recordModel.getDomicileCountry(), recordModel.getDomicileAddress(), basicConfigService)); + folvite.put("alreadySum", "已领总数"); + folvite.put("canSum", "可领总数"); + womanId = recordModel.getWomanId(); + cardNo = recordModel.getCardNo(); + } } FolviteQuery query = new FolviteQuery(); query.setWomanId(womanId); - query.setCardNo(recordModel.getCardNo()); + query.setCardNo(cardNo); List recordModels = queryFolviteList(query); List>> list = new ArrayList(); if (CollectionUtils.isNotEmpty(recordModels)) { @@ -238,6 +286,8 @@ public class FolviteServiceImpl implements FolviteService { @Override public List list(FolviteQuery folviteQuery) { + + return null; } -- 1.8.3.1