diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java index 7b9b342..08ed229 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ReferConfigDao.java @@ -9,6 +9,9 @@ import com.lyms.platform.pojo.ReferValue; * Created by Zhang.Rui on 2016/3/17. */ public interface ReferConfigDao { + + public ReferValue getReferValueById(String id); + void addRefer(ReferValue referValue); void updateRefer(MongoQuery query, ReferValue referValue); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java index 532c2e8..df39061 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferConfigDaoImpl.java @@ -15,6 +15,10 @@ import com.lyms.platform.pojo.ReferValue; @Repository("referConfigDao") public class ReferConfigDaoImpl extends BaseMongoDAOImpl implements ReferConfigDao { + @Override + public ReferValue getReferValueById(String id) { + return this.findById(id); + } @Override public void addRefer(ReferValue referValue) { diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java index 99cd8a6..05fd941 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ReferConfigService.java @@ -24,6 +24,10 @@ public class ReferConfigService { @Autowired private ReferConfigDao referConfigDao; + public ReferValue getReferValueById(String id) { + return referConfigDao.getReferValueById(id); + } + public List queryRefer(ReferConfigQuery referConfigQuery) { MongoQuery mongoQuery = referConfigQuery.convertToQuery(); referConfigQuery.setNeed("true"); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java index e9775f9..56bcc83 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/DataImportTaskServiceImpl.java @@ -1,10 +1,7 @@ package com.lyms.platform.data.service.impl; import com.lyms.platform.biz.param.CommunityQuery; -import com.lyms.platform.biz.service.BabyService; -import com.lyms.platform.biz.service.BasicConfigService; -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.enums.PermissionTypeEnums; import com.lyms.platform.common.enums.UserTypeEnum; import com.lyms.platform.common.enums.VisitStatusEnums; @@ -14,10 +11,7 @@ import com.lyms.platform.common.utils.LoginUtil; import com.lyms.platform.data.service.DataImportTaskService; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.CommunityConfig; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import com.lymsh.mommybaby.earlydata.dao.PlatMapper; @@ -25,6 +19,7 @@ import com.lymsh.mommybaby.earlydata.model.PlatDataContent; import com.lymsh.mommybaby.earlydata.model.PlatDataType; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.joda.time.DateTime; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -68,6 +63,12 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { @Autowired private CommunityConfigService communityConfigService; + @Autowired + private AssayConfigService assayConfigService; + + @Autowired + private ReferConfigService referConfigService; + @Value("#{configProperties['login.token']}") private String token; @@ -98,7 +99,11 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { continue; } BasicConfig config = new BasicConfig(); - config.setId(type.getDtId()); + if (NumberUtils.isNumber(type.getDtId())) { + config.setId("ora-type-"+type.getDtId()); + } else { + config.setId(type.getDtId()); + } config.setCode(type.getDtName()); config.setName(type.getDtName()); config.setParentId("0"); @@ -124,7 +129,11 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { continue; } BasicConfig config = new BasicConfig(); - config.setId(data.getDcId()); + if (NumberUtils.isNumber(data.getDcId())) { + config.setId("ora-data-"+data.getDcId()); + } else { + config.setId(data.getDcId()); + } config.setCode(data.getDcNo()); config.setName(data.getDcName()); if ("0".equals(data.getDcParentid())) { @@ -159,12 +168,46 @@ public class DataImportTaskServiceImpl implements DataImportTaskService { @Override public void fullUpdateAssay() { - + OrganizationQuery query = new OrganizationQuery(); + query.setYn(YnEnums.YES.getId()); + List list = organizationService.queryOrganization(query); + for (Organization organization : list) { + if (StringUtils.isNotBlank(organization.getForeignId())) { + updateAssayByHospital(organization.getForeignId(), organization.getId(), null); + } + } } @Override public void updateAssayByHospital(String hospitalForeignId, Integer hospitalId, Date startTime) { + try { + List list = platMapper.selectMommyRefer(hospitalForeignId); + for (Map map:list) { + String id = map.get("ID").toString(); + if (StringUtils.isBlank(id)) { + continue; + } + ReferValue referValue = new ReferValue(); + referValue.setId(id); + referValue.setName(map.get("MR_CTRLNAME").toString()); + referValue.setYn(YnEnums.YES.getId()); + referValue.setPublishId("worker"); +// referValue.setAgeDepartment(); + referValue.setAssayConfigId(map.get("MR_CTRLID").toString()); +// referValue.setBeginAge(); +// referValue.setCharRefer(); + referValue.setCode(map.get("MR_CODE").toString()); +// referValue.setDepartment(); + referValue.setHospitalId(hospitalId); + referValue.setStandardCode(referValue.getCode()); + referValue.setUnit(map.get("MR_UNIT").toString()); + ReferValue dbReferValue = referConfigService.getReferValueById(id); + } + } catch (Exception e) { + e.printStackTrace(); + LogUtil.taskError(e.getMessage(), e); + } } /** diff --git a/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java b/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java index 87cbff3..3846073 100644 --- a/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java +++ b/platform-mommyData/src/main/java/com/lymsh/mommybaby/earlydata/dao/PlatMapper.java @@ -36,4 +36,6 @@ public interface PlatMapper { public List selectAllPuerperaByHospitalId(@Param("hospitalId") String hospitalId, @Param("startTime") Date startTime); + public List selectMommyRefer(@Param("hospitalId") String hospitalId); + } diff --git a/platform-mommyData/src/main/resources/earlyOrm/Plat.xml b/platform-mommyData/src/main/resources/earlyOrm/Plat.xml index 2d87b10..b15d91e 100644 --- a/platform-mommyData/src/main/resources/earlyOrm/Plat.xml +++ b/platform-mommyData/src/main/resources/earlyOrm/Plat.xml @@ -229,5 +229,12 @@ order by mp.p_hospitalid,ppt.p_id,mp.p_no + + \ No newline at end of file