From 46c3e8b0320700a95efcbcd1cf95a830dfbb7a09 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 10 Feb 2020 11:39:15 +0800 Subject: [PATCH] update code --- .../java/com/lyms/platform/beans/SerialIdEnum.java | 2 + .../com/lyms/platform/pojo/TrackCountRecord.java | 143 +++++++++++++++++++++ .../com/lyms/platform/pojo/TrackDayConfig.java | 64 +++++++++ .../web/controller/BasicConfigController.java | 41 ++++++ .../operate/web/facade/BasicConfigFacade.java | 34 ++++- 5 files changed, 281 insertions(+), 3 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/TrackDayConfig.java diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index 14b5d74..6e62d78 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -26,7 +26,9 @@ public enum SerialIdEnum { CheckItemOrder("CheckItemOrder", 97531500100L), CheckItemActual("CheckItemActual", 97521500100L), CheckItemConfig("CheckItemConfig", 97531320100L), + TrackDayConfig("TrackDayConfig", 97531320170L), BCInventoryModel("BCInventoryModel", 97531000110L), + TrackCountRecord("TrackCountRecord", 92231000110L), BCTransferInHistoryModel("BCTransferInHistoryModel", 97531000120L), CommunityConfig("CommunityConfig", 97531000130L), CommunityModel("CommunityModel", 97531000140L), diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java new file mode 100644 index 0000000..9d18079 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackCountRecord.java @@ -0,0 +1,143 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + + +/** + * 处方报表基础项配置 + */ +@Document(collection="lyms_track_count_record") +public class TrackCountRecord extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.TrackCountRecord.getCid(); + + private String id; + private String hospitalId; + private String patientId; + //预约产检状态 + private Integer orderStatus; + //一级追访状态 + private Integer oneTrackStatus; + //二级追访状态 + private Integer twoTrackStatus; + //准时产检人数状态 + private Integer zsCheckStatus; + //及时产检人数状态 + private Integer jsCheckStatus; + //纳入失访人次 + private Integer loseStatus; + //实施追访人次 + private Integer trackStatus; + //召回状态 0 未参与召回 1参与召回 + private Integer backStatus; + private Date created; + private Date modified; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public Integer getOrderStatus() { + return orderStatus; + } + + public void setOrderStatus(Integer orderStatus) { + this.orderStatus = orderStatus; + } + + public Integer getOneTrackStatus() { + return oneTrackStatus; + } + + public void setOneTrackStatus(Integer oneTrackStatus) { + this.oneTrackStatus = oneTrackStatus; + } + + public Integer getTwoTrackStatus() { + return twoTrackStatus; + } + + public void setTwoTrackStatus(Integer twoTrackStatus) { + this.twoTrackStatus = twoTrackStatus; + } + + public Integer getZsCheckStatus() { + return zsCheckStatus; + } + + public void setZsCheckStatus(Integer zsCheckStatus) { + this.zsCheckStatus = zsCheckStatus; + } + + public Integer getJsCheckStatus() { + return jsCheckStatus; + } + + public void setJsCheckStatus(Integer jsCheckStatus) { + this.jsCheckStatus = jsCheckStatus; + } + + public Integer getLoseStatus() { + return loseStatus; + } + + public void setLoseStatus(Integer loseStatus) { + this.loseStatus = loseStatus; + } + + public Integer getTrackStatus() { + return trackStatus; + } + + public void setTrackStatus(Integer trackStatus) { + this.trackStatus = trackStatus; + } + + public Integer getBackStatus() { + return backStatus; + } + + public void setBackStatus(Integer backStatus) { + this.backStatus = backStatus; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDayConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDayConfig.java new file mode 100644 index 0000000..eaf0ca6 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDayConfig.java @@ -0,0 +1,64 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; +import java.util.Map; + + +/** + * 追访天数配置 + */ +@Document(collection="lyms_track_day_config") +public class TrackDayConfig extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.TrackDayConfig.getCid(); + + private String id; + private String hospitalId; + private Map confis; + private Date created; + private Date modified; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Map getConfis() { + return confis; + } + + public void setConfis(Map confis) { + this.confis = confis; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java index 41ffbb8..ac84b7e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java @@ -12,6 +12,7 @@ import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.pojo.CheckItemConfig; +import com.lyms.platform.pojo.TrackDayConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -227,4 +228,44 @@ public class BasicConfigController extends BaseController { public BaseResponse addCheckItemConfig(@PathVariable String id,HttpServletRequest request) { return basicConfigFacade.deleteCheckItemConfig(id); } + + + /** + * 添加或者修改追访天数配置 + * @param trackDayConfig + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addOrUpTrackDayConfig", consumes = {MediaType.APPLICATION_JSON_VALUE}) + @ResponseBody + @TokenRequired + public BaseResponse addTrackDayConfig(@RequestBody TrackDayConfig trackDayConfig,HttpServletRequest request) { + return basicConfigFacade.addOrUpTrackDayConfig(trackDayConfig, getUserId(request)); + } + + /** + * 查询追访天数配置 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryTrackDayConfig") + @ResponseBody + @TokenRequired + public BaseResponse queryTrackDayConfig( HttpServletRequest request) { + return basicConfigFacade.queryTrackDayConfig(getUserId(request)); + } + + + /** + * 删除追访天数配置 + * @param id + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.DELETE, value = "/deleteTrackDayConfig/{id}") + @ResponseBody + @TokenRequired + public BaseResponse deleteTrackDayConfig(@PathVariable String id,HttpServletRequest request) { + return basicConfigFacade.deleteTrackDayConfig(id); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index ccfdf0e..5c1411a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -8,6 +8,8 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.MongoConvertHelper; +import com.lyms.platform.common.utils.ReflectionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.BasicConfigAddRequest; @@ -16,9 +18,7 @@ import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.result.TreeNode; import com.lyms.platform.operate.web.utils.TreeHelper; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.CheckItemConfig; -import com.lyms.platform.pojo.ModularFunctionConfigModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BasicConfigQuery; import com.mongodb.Mongo; import org.apache.commons.collections.CollectionUtils; @@ -27,6 +27,7 @@ import org.springframework.data.authentication.UserCredentials; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; import java.util.*; @@ -605,4 +606,31 @@ public class BasicConfigFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseResponse addOrUpTrackDayConfig(TrackDayConfig trackDayConfig, Integer userId) { + trackDayConfig.setModified(new Date()); + if (StringUtils.isNotEmpty(trackDayConfig.getId())) + { + Query query = Query.query(Criteria.where("_id").is(trackDayConfig.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(trackDayConfig)); + mongoTemplate.updateFirst(query, update, TrackDayConfig.class); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + String hospitalId = autoMatchFacade.getHospitalId(userId); + trackDayConfig.setHospitalId(hospitalId); + trackDayConfig.setCreated(new Date()); + mongoTemplate.save(trackDayConfig); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse queryTrackDayConfig(Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + TrackDayConfig trackDayConfig = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").is(hospitalId)), TrackDayConfig.class); + return new BaseObjectResponse().setData(trackDayConfig).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse deleteTrackDayConfig(String id) { + mongoTemplate.remove(Query.query(Criteria.where("_id").is(id)), TrackDayConfig.class); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file -- 1.8.3.1