From 4d23963a231da7f563b5a5e5524c9ad654547053 Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Fri, 18 Mar 2016 13:32:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E5=8C=96=E9=AA=8C=E9=A1=B9=20=E5=8F=82=E8=80=83=E9=A1=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/biz/dal/ReferConfigDao.java | 9 ++++ .../platform/biz/dal/impl/ReferConfigDaoImpl.java | 17 ++++++ .../platform/biz/service/ReferConfigService.java | 22 +++++--- .../java/com/lyms/platform/pojo/ReferValue.java | 49 +++++++++++++++++ .../com/lyms/platform/query/ReferConfigQuery.java | 62 +++++++++++++++++----- .../web/controller/ReferConfigController.java | 46 ++++++++++++---- 6 files changed, 177 insertions(+), 28 deletions(-) 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 e2db1a0..bef7312 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,13 +1,22 @@ package com.lyms.platform.biz.dal; +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. */ public interface ReferConfigDao { void addRefer(ReferValue referValue); + void updateRefer(MongoQuery query, ReferValue referValue); + + void deleteRefer(MongoQuery query, ReferValue referValue); + + List queryRefer(MongoQuery query); + } 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 860b4f4..04974b0 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 @@ -23,4 +23,21 @@ public class ReferConfigDaoImpl extends BaseMongoDAOImpl implements public void addRefer(ReferValue referValue) { this.save(referValue); } + + @Override + public void updateRefer(MongoQuery query, ReferValue referValue) { + List list = find(query.convertToMongoQuery()); + update(query.convertToMongoQuery(), referValue); + } + + @Override + public void deleteRefer(MongoQuery query, ReferValue referValue) { + delete(query.convertToMongoQuery()); + } + + + @Override + public List queryRefer(MongoQuery query) { + return find(query.convertToMongoQuery()); + } } 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 7a58571..fd27bd4 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,11 +1,17 @@ package com.lyms.platform.biz.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.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. * 参考值服务 @@ -15,19 +21,23 @@ public class ReferConfigService { @Autowired private ReferConfigDao referConfigDao; - public BaseListResponse queryRefer() { - return null; + public List queryRefer(ReferConfigQuery referConfigQuery) { + return referConfigDao.queryRefer(referConfigQuery.convertToQuery()); } public void addRefer(ReferValue referValue) { referConfigDao.addRefer(referValue); } - public BaseListResponse updateRefer() { - return null; + public void updateRefer(ReferValue referValue) { + MongoCondition mongoCondition = MongoCondition.newInstance("id",referValue.getId(), MongoOper.IS); + referConfigDao.updateRefer(mongoCondition.toMongoQuery(), referValue); } - public BaseListResponse delRefer() { - return null; + public void delRefer(ReferValue referValue) { + MongoCondition mongoCondition = MongoCondition.newInstance(); + mongoCondition.and("id", referValue.getId(), MongoOper.IS); + referValue.setYn(2); //软删除 + referConfigDao.updateRefer(mongoCondition.toMongoQuery(), referValue); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java index dc416a7..56e2860 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java @@ -3,6 +3,8 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.result.BaseModel; import org.hibernate.validator.constraints.NotEmpty; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; import javax.validation.constraints.NotNull; @@ -11,7 +13,12 @@ import javax.validation.constraints.NotNull; * 参考值模型 */ @Form +@Document public class ReferValue extends BaseModel{ + @Id + private String id; + @NotNull(message = "医院ID不能为空") + private Integer hospitalId; @NotNull(message = "项目名称不能为空") @NotEmpty(message = "项目名称不能为空") private String name; @@ -37,8 +44,50 @@ public class ReferValue extends BaseModel{ private String deal; //处理 private String serviceContent;//服务内容 private int department; //科室 + private int assayConfigId; //化验项ID + private String standardCode;//标准代码 + private Integer yn; + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getStandardCode() { + return standardCode; + } + + public void setStandardCode(String standardCode) { + this.standardCode = standardCode; + } + + public int getAssayConfigId() { + return assayConfigId; + } + + public void setAssayConfigId(int assayConfigId) { + this.assayConfigId = assayConfigId; + } + + public Integer getHospitalId() { + return hospitalId; + } + + public void setHospitalId(Integer hospitalId) { + this.hospitalId = hospitalId; + } public String getName() { return name; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java index 95a7034..5ea4081 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java @@ -1,31 +1,69 @@ package com.lyms.platform.query; import com.lyms.platform.common.dao.BaseQuery; +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 org.hibernate.validator.constraints.NotEmpty; + +import javax.validation.constraints.NotNull; /** * Created by Zhang.Rui on 2016/3/17. * 参考值查询对象 */ public class ReferConfigQuery extends BaseQuery { - private int hospitalId; - private int codeType; + @NotNull(message = "医院ID不能为空") + private Integer hospitalId; + private Integer codeType;//1:项目代码2:标准代码 3:项目名称 private String keyword; - private int referVal; - private int emergencyVal; + private Integer referVal;//1已设置2未设置3全部 + private Integer emergencyVal;//1已设置2未设置3全部 + + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + if (null != hospitalId) { + condition.and("hospitalId", hospitalId, MongoOper.IS); + } + if (null != codeType && null != keyword) { + if(1 == codeType) { + condition.and("code", keyword, MongoOper.LIKE); + } else if(2 == codeType) { + condition.and("standardCode", keyword, MongoOper.LIKE); + } else if(3 == codeType) { + condition.and("name", keyword, MongoOper.LIKE); + } + } + if (null != referVal) { + if(1 == referVal) { + condition.and("charRefer", null, MongoOper.NE); + } else if(2 == referVal) { + condition.and("charRefer", null, MongoOper.IS); + } + } + if (null != emergencyVal) { + if(1 == emergencyVal) { + condition.and("emergencyChar", null, MongoOper.NE); + } else if(2 == emergencyVal) { + condition.and("emergencyChar", null, MongoOper.IS); + } + } + return condition.toMongoQuery(); + } - public int getHospitalId() { + public Integer getHospitalId() { return hospitalId; } - public void setHospitalId(int hospitalId) { + public void setHospitalId(Integer hospitalId) { this.hospitalId = hospitalId; } - public int getCodeType() { + public Integer getCodeType() { return codeType; } - public void setCodeType(int codeType) { + public void setCodeType(Integer codeType) { this.codeType = codeType; } @@ -37,19 +75,19 @@ public class ReferConfigQuery extends BaseQuery { this.keyword = keyword; } - public int getReferVal() { + public Integer getReferVal() { return referVal; } - public void setReferVal(int referVal) { + public void setReferVal(Integer referVal) { this.referVal = referVal; } - public int getEmergencyVal() { + public Integer getEmergencyVal() { return emergencyVal; } - public void setEmergencyVal(int emergencyVal) { + public void setEmergencyVal(Integer emergencyVal) { this.emergencyVal = emergencyVal; } } 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 fa8c6b5..f8bc7cd 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,17 +1,20 @@ package com.lyms.platform.operate.web.controller; +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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.validation.Valid; +import java.util.List; /** * Created by Zhang.Rui on 2016/3/17. @@ -21,26 +24,49 @@ import javax.validation.Valid; public class ReferConfigController extends RestController{ @Autowired ReferConfigService referConfigService; + @Autowired + AssayConfigService assayConfigService; - public BaseListResponse queryRefer() { - return null; + @ResponseBody + @RequestMapping(value = "referConfig",method = RequestMethod.GET) + public BaseListResponse queryRefer(@RequestBody @Valid ReferConfigQuery referConfigQuery) { + List referValueList = referConfigService.queryRefer(referConfigQuery); + BaseListResponse baseListResponse = new BaseListResponse(); + baseListResponse.setData(referValueList).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + return baseListResponse; } - @RequestMapping("referConfig") + @RequestMapping(value = "referConfig",method = RequestMethod.POST) @ResponseBody public BaseResponse addRefer(@RequestBody @Valid ReferValue referValue) { + //添加前先设置项目代码， 标准代码 referConfigService.addRefer(referValue); return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg("添加成功!"); } - public BaseListResponse updateRefer() { - return null; + @RequestMapping(value = "referConfig/{id}",method = RequestMethod.DELETE) + @ResponseBody + public BaseResponse delRefer(@PathVariable String id) { + ReferValue referValue = new ReferValue(); + referValue.setId(id); + referConfigService.delRefer(referValue); + return new BaseResponse() + .setErrorcode(ErrorCodeConstants.SUCCESS) + .setErrormsg("删除成功!"); } - public BaseListResponse delRefer() { - return null; + @RequestMapping(value = "referConfig/{id}",method = RequestMethod.PUT) + @ResponseBody + public BaseResponse updateRefer(@RequestBody @Valid ReferValue referValue, @PathVariable String id) { + //更新前先设置项目代码， 标准代码 + referValue.setId(id); + referConfigService.updateRefer(referValue); + return new BaseResponse() + .setErrorcode(ErrorCodeConstants.SUCCESS) + .setErrormsg("更新成功!"); } + } -- 1.8.3.1