diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 6b78681..683a6af 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -2,13 +2,9 @@ package com.lyms.platform.biz; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.List; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.mongodb.core.MongoTemplate; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.PuerperaService; diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java index 104b41d..62257ea 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java @@ -1,12 +1,11 @@ package com.lyms.platform.biz.dal; +import java.util.List; + import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.params.AssayConfigParam; import com.lyms.platform.pojo.AssayConfig; -import java.util.List; - public interface AssayConfigDao { List query(MongoQuery query) ; diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java index 444d555..8b88e65 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/CommunityConfigDao.java @@ -1,10 +1,9 @@ package com.lyms.platform.biz.dal; +import java.util.List; + import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.CommunityConfig; -import com.lyms.platform.pojo.ReferValue; - -import java.util.List; /** * Created by Zhang.Rui on 2016/3/17. 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 bef7312..3f46103 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 @@ -1,11 +1,10 @@ package com.lyms.platform.biz.dal; +import java.util.List; + import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.pojo.ReferValue; -import java.util.List; - /** * Created by Zhang.Rui on 2016/3/17. */ diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java index 5f8047a..4a221af 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java @@ -1,18 +1,13 @@ package com.lyms.platform.biz.dal.impl; +import java.util.List; + +import org.springframework.stereotype.Repository; + import com.lyms.platform.biz.dal.AssayConfigDao; -import com.lyms.platform.biz.dal.IBasicConfigDao; 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.common.dao.operator.Page; -import com.lyms.platform.params.AssayConfigParam; import com.lyms.platform.pojo.AssayConfig; -import com.lyms.platform.pojo.BasicConfig; -import org.springframework.stereotype.Repository; - -import java.util.List; @Repository("assayConfigDao") public class AssayConfigDaoImpl extends BaseMongoDAOImpl implements AssayConfigDao { diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java index 04b0676..9ce0ddf 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/CommunityConfigDaoImpl.java @@ -1,14 +1,13 @@ package com.lyms.platform.biz.dal.impl; +import java.util.List; + +import org.springframework.stereotype.Repository; + import com.lyms.platform.biz.dal.CommunityConfigDao; -import com.lyms.platform.biz.dal.ReferConfigDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.pojo.CommunityConfig; -import com.lyms.platform.pojo.ReferValue; -import org.springframework.stereotype.Repository; - -import java.util.List; /** * Created by Zhang.Rui on 2016/3/17. 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 04974b0..517a904 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 @@ -1,16 +1,13 @@ package com.lyms.platform.biz.dal.impl; -import com.lyms.platform.biz.dal.IBasicConfigDao; +import java.util.List; + +import org.springframework.stereotype.Repository; + import com.lyms.platform.biz.dal.ReferConfigDao; import com.lyms.platform.common.dao.BaseMongoDAOImpl; import com.lyms.platform.common.dao.operator.MongoQuery; -import com.lyms.platform.common.dao.operator.Page; -import com.lyms.platform.common.result.BaseListResponse; -import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.ReferValue; -import org.springframework.stereotype.Repository; - -import java.util.List; /** * Created by Zhang.Rui on 2016/3/17. @@ -26,7 +23,6 @@ public class ReferConfigDaoImpl extends BaseMongoDAOImpl implements @Override public void updateRefer(MongoQuery query, ReferValue referValue) { - List list = find(query.convertToMongoQuery()); update(query.convertToMongoQuery(), referValue); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java index 6bc46a4..047db6d 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java @@ -1,18 +1,17 @@ package com.lyms.platform.biz.service; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import com.lyms.platform.biz.dal.AssayConfigDao; 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.params.AssayConfigParam; import com.lyms.platform.pojo.AssayConfig; -import com.mongodb.Mongo; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -; - -import java.util.List; //化验项配置 @Service("AssayConfigService") diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java index 27d060d..718cf1a 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/CommunityConfigService.java @@ -1,22 +1,15 @@ package com.lyms.platform.biz.service; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import com.lyms.platform.biz.dal.CommunityConfigDao; -import com.lyms.platform.common.constants.ErrorCodeConstants; 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.common.enums.YnEnums; -import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.pojo.CommunityConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.validation.Valid; -import java.util.List; /** * Created by Zhang.Rui on 2016/3/18. 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 833e8b2..fa83071 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 @@ -1,17 +1,16 @@ package com.lyms.platform.biz.service; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import com.lyms.platform.biz.dal.ReferConfigDao; 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.common.enums.YnEnums; -import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.pojo.ReferValue; import com.lyms.platform.query.ReferConfigQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; /** * Created by Zhang.Rui on 2016/3/17. diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java index a4e3b86..e540be1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CommunityConfigController.java @@ -1,18 +1,24 @@ package com.lyms.platform.operate.web.controller; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + import com.lyms.platform.biz.service.CommunityConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.request.CommunityConfigRequest; import com.lyms.platform.pojo.CommunityConfig; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; /** * Created by Zhang.Rui on 2016/3/18. diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java index f8bc7cd..254c4ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java @@ -1,20 +1,24 @@ package com.lyms.platform.operate.web.controller; +import java.util.List; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + import com.lyms.platform.biz.service.AssayConfigService; import com.lyms.platform.biz.service.ReferConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.params.AssayConfigParam; -import com.lyms.platform.pojo.AssayConfig; import com.lyms.platform.pojo.ReferValue; import com.lyms.platform.query.ReferConfigQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; - -import javax.validation.Valid; -import java.util.List; /** * Created by Zhang.Rui on 2016/3/17.