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 new file mode 100644 index 0000000..104b41d --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/AssayConfigDao.java @@ -0,0 +1,19 @@ +package com.lyms.platform.biz.dal; + + +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) ; + + + void saveAssayConfig(AssayConfig assayConfig); + + void updateAssayConfig(MongoQuery mongoQuery, AssayConfig assayConfig); + + +} \ No newline at end of file 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 new file mode 100644 index 0000000..5f8047a --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/AssayConfigDaoImpl.java @@ -0,0 +1,36 @@ +package com.lyms.platform.biz.dal.impl; + +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 { + + @Override + public List query(MongoQuery query) { + return find(query.convertToMongoQuery()); + } + + @Override + public void saveAssayConfig(AssayConfig assayConfig) { + save(assayConfig); + } + + @Override + public void updateAssayConfig(MongoQuery mongoQuery, AssayConfig assayConfig) { + update(mongoQuery.convertToMongoQuery(), assayConfig); + } + + +} \ No newline at end of file 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 new file mode 100644 index 0000000..6bc46a4 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AssayConfigService.java @@ -0,0 +1,50 @@ +package com.lyms.platform.biz.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") +public class AssayConfigService { + @Autowired + AssayConfigDao assayConfigDao; + + public List query(AssayConfigParam assayConfigRequest) { + MongoCondition mongoCondition = MongoCondition.newInstance(); + if(0 != assayConfigRequest.getType()) { + mongoCondition.andCondition(new MongoCondition("type", assayConfigRequest.getType(), MongoOper.IS)); + } + if(null != assayConfigRequest.getKeywords()) { + mongoCondition.andCondition(new MongoCondition("keywords", assayConfigRequest.getKeywords(), MongoOper.LIKE)); + } + if(null != assayConfigRequest.getHospitalId()) { + mongoCondition.andCondition(new MongoCondition("hospitalId", assayConfigRequest.getHospitalId(), MongoOper.IS)); + } + + return assayConfigDao.query(mongoCondition.toMongoQuery().start(0).end(100)); + } + + + + public void save(AssayConfig assayConfig) { + assayConfigDao.saveAssayConfig(assayConfig); + } + + public void updateForList(List assayConfigs) { + for(AssayConfig tmp : assayConfigs) { + assayConfigDao.updateAssayConfig(new MongoQuery(new MongoCondition("id", tmp.getId(), MongoOper.IS)),tmp); + } + } + +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java b/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java new file mode 100644 index 0000000..255e64a --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/params/AssayConfigParam.java @@ -0,0 +1,56 @@ +package com.lyms.platform.params; + +import com.lyms.platform.common.core.annotation.form.Form; +import org.hibernate.validator.constraints.NotEmpty; + +@Form +public class AssayConfigParam { + @NotEmpty(message="页码不能为空") + private int page; + @NotEmpty(message="分页大小不能为空") + private int limit; + private String hospitalId; + //1.按项目名称查询 2.项目代码 3.标准代码 + private int type; + private String keywords; + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getKeywords() { + return keywords; + } + + public void setKeywords(String keywords) { + this.keywords = keywords; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java new file mode 100644 index 0000000..4ed6bf2 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java @@ -0,0 +1,34 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; + +public class AssayConfig extends BaseModel{ + private String id; + + private String yn; + private String print; + + public String getPrint() { + return print; + } + + public void setPrint(String print) { + this.print = print; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getYn() { + return yn; + } + + public void setYn(String yn) { + this.yn = yn; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java new file mode 100644 index 0000000..aa90898 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AssayConfigController.java @@ -0,0 +1,45 @@ +package com.lyms.platform.operate.web.controller; + + +import com.lyms.platform.biz.service.AssayConfigService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.params.AssayConfigParam; +import com.lyms.platform.pojo.AssayConfig; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +//化验项配置 +@Controller +public class AssayConfigController { + @Autowired + private AssayConfigService assayConfigService; + + + @RequestMapping(method = RequestMethod.GET, value = "/assayconfig") + @ResponseBody + public BaseListResponse assayConfig(AssayConfigParam assayConfigParam) { + List data = assayConfigService.query(assayConfigParam); + BaseListResponse baseListResponse = new BaseListResponse(); + baseListResponse.setData(data); + baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseListResponse.setErrormsg("成功"); + return baseListResponse; + } + + @RequestMapping(method = RequestMethod.PUT, value = "/assayconfig") + @ResponseBody + public BaseListResponse assayConfig(@RequestBody List assayConfigs) { + assayConfigService.updateForList(assayConfigs); + BaseListResponse baseListResponse = new BaseListResponse(); + baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + baseListResponse.setErrormsg("成功"); + return baseListResponse; + } + + + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index 9c887b7..311ca11 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -1,3 +1,7 @@ -mongo.db.host=192.168.5.8 +#mongo.db.host=192.168.5.8 +#mongo.db.port=27017 +#mongo.db.dbname=platform + +mongo.db.host=localhost mongo.db.port=27017 mongo.db.dbname=platform \ No newline at end of file