diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java index 00221ff..0511d91 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterCheckItemMapper.java @@ -3,12 +3,18 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.CheckItem; import java.util.List; +import java.util.Map; public interface MasterCheckItemMapper { - public List getCheckItemList(); + public List getCheckItemList(Map param); + public void addCheckItem(CheckItem checkItem); public String getOne(Integer id); public List xcxGetCheckItemList(Integer id); + + void updateCheckItem(CheckItem checkItem); + + void deleteCheckItem(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java index d858e03..bcf146c 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CheckItem.java @@ -5,6 +5,24 @@ public class CheckItem { private String project; private String projectInfo; private String checkAttention; + private String hospitalId; + private Integer type;//类型 1孕妇 2 儿童 + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public String getCheckAttention() { return checkAttention; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java index 2ef8516..90af2c8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CheckItemService.java @@ -4,14 +4,20 @@ package com.lyms.platform.permission.service; import com.lyms.platform.permission.model.CheckItem; import java.util.List; +import java.util.Map; public interface CheckItemService { - public List getCheckItemList(); + public List getCheckItemList( Map param); public String getOne(Integer id); public List xcxGetCheckItemList(Integer id); + public void addCheckItem(CheckItem checkItem); + + void updateCheckItem(CheckItem checkItem); + + void deleteCheckItem(Integer id); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java index 05998c9..f25c0d1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CheckItemServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; @Service public class CheckItemServiceImpl implements CheckItemService { @@ -16,8 +17,24 @@ public class CheckItemServiceImpl implements CheckItemService { private MasterCheckItemMapper checkItemMapper; @Override - public List getCheckItemList() { - return checkItemMapper.getCheckItemList(); + public List getCheckItemList(Map param) { + return checkItemMapper.getCheckItemList(param); + } + + + @Override + public void addCheckItem(CheckItem checkItem) { + checkItemMapper.addCheckItem(checkItem); + } + + @Override + public void updateCheckItem(CheckItem checkItem) { + checkItemMapper.updateCheckItem(checkItem); + } + + @Override + public void deleteCheckItem(Integer id) { + checkItemMapper.deleteCheckItem(id); } @Override diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml index 7601115..5b24a5f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterCheckItem.xml @@ -7,9 +7,23 @@ + + - + SELECT id,project,type,project_info,check_attention,hospital_id FROM lyms_week_project + where 1=1 + + and type = #{type,jdbcType=INTEGER} + + + and hospital_id = #{hospitalId,jdbcType=VARCHAR} + + + + + + update lyms_week_project + + + project = #{project,jdbcType=VARCHAR}, + + + project_info = #{projectInfo,jdbcType=VARCHAR}, + + + check_attention = #{checkAttention,jdbcType=VARCHAR}, + + + hospital_id = #{hospitalId,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=VARCHAR} + + + + delete from lyms_week_project where id = #{id,jdbcType=INTEGER} + + diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CheckItemConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CheckItemConfig.java index 7e241db..17eccaf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CheckItemConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CheckItemConfig.java @@ -18,12 +18,31 @@ public class CheckItemConfig extends BaseModel { private String id; private String hospitalId; private String name; - private Integer startWeek; - private Integer endWeek; private Integer enable; + //编码 + private String code; + + //1 孕妇 2 儿童 + private Integer type; private Date created; private Date modified; + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + public String getId() { return id; } @@ -48,21 +67,6 @@ public class CheckItemConfig extends BaseModel { this.name = name; } - public Integer getStartWeek() { - return startWeek; - } - - public void setStartWeek(Integer startWeek) { - this.startWeek = startWeek; - } - - public Integer getEndWeek() { - return endWeek; - } - - public void setEndWeek(Integer endWeek) { - this.endWeek = endWeek; - } public Integer getEnable() { return enable; 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 0153f70..b0f0e97 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 @@ -201,8 +201,8 @@ public class BasicConfigController extends BaseController { @RequestMapping(method = RequestMethod.GET, value = "/queryCheckItemConfig/{hospitalId}") @ResponseBody @TokenRequired - public BaseResponse queryCheckItemConfig(@PathVariable String hospitalId, HttpServletRequest request) { - return basicConfigFacade.queryCheckItemConfig(hospitalId); + public BaseResponse queryCheckItemConfig(@PathVariable String hospitalId,@RequestParam(required = false) Integer type, HttpServletRequest request) { + return basicConfigFacade.queryCheckItemConfig(hospitalId,type); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java index 5915cbc..6bb93e3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CheckItemController.java @@ -1,16 +1,18 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.CheckItem; import com.lyms.platform.permission.service.CheckItemService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -25,12 +27,57 @@ public class CheckItemController extends BaseController { @RequestMapping(value = "/getCheckItemList", method = RequestMethod.GET) @ResponseBody - public FrontEndResult getCheckItemList() { - List checkItem = checkItemService.getCheckItemList(); + public FrontEndResult getCheckItemList(@RequestParam(required = false) Integer type,@RequestParam(required = false) String hospitalId) { + Map param = new HashMap(); + param.put("type",type); + param.put("hospitalId",hospitalId); + List checkItem = checkItemService.getCheckItemList(param); return new FrontEndResult().setData(checkItem); } + /** + * 添加项目 + * @param checkItem + * @return + */ + @RequestMapping(value = "/addCheckItem", method = RequestMethod.POST) + @ResponseBody + public BaseResponse addCheckItem(@RequestBody CheckItem checkItem) { + checkItemService.addCheckItem(checkItem); + return new BaseResponse(). + setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + + /** + * 更新检查项 + * @param checkItem + * @return + */ + @RequestMapping(value = "/updateCheckItem", method = RequestMethod.POST) + @ResponseBody + public BaseResponse updateCheckItem(@RequestBody CheckItem checkItem) { + checkItemService.updateCheckItem(checkItem); + return new BaseResponse(). + setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + + /** + * 删除 + * @param id + * @return + */ + @RequestMapping(value = "/deleteCheckItem/{id}", method = RequestMethod.GET) + @ResponseBody + public BaseResponse deleteCheckItem(@PathVariable Integer id) { + checkItemService.deleteCheckItem(id); + return new BaseResponse(). + setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /*@RequestMapping(value = "/getOne", method = RequestMethod.GET) public void getOne() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 9da0880..910cb31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -312,13 +312,13 @@ public class AntenatalExaminationFacade { public BaseResponse addOneAntEx(AntExAddRequest antExAddRequest, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); -// //秦皇岛市山海关人民医院 零时处理 -// if (StringUtils.isNotEmpty(antExAddRequest.getCheckDate()) && "1000000004".equals(hospitalId)) { -// if (!antExAddRequest.getCheckDate().equals(DateUtil.getyyyy_MM_dd(new Date()))) -// { -// return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); -// } -// } + //秦皇岛市山海关人民医院 零时处理 + if (StringUtils.isNotEmpty(antExAddRequest.getCheckDate()) && "1000000004".equals(hospitalId)) { + if (!antExAddRequest.getCheckDate().equals(DateUtil.getyyyy_MM_dd(new Date()))) + { + return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); + } + } AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); //表示区域的 @@ -527,22 +527,22 @@ public class AntenatalExaminationFacade { // zcPrenatalService.saveAntexFu(antExamModel); // } - try { - //处方计划 - if (antExamModel.getNextCheckTime() != null) { - saveCheckItem(antExamModel.getNextCheckTime(), patients); - } - } catch (Exception e) { - e.printStackTrace(); - } - try { - //处方计划 - if (antExamModel.getCheckDate() != null) { - saveCheckActual(antExamModel.getCheckDate(), patients); - } - } catch (Exception e) { - e.printStackTrace(); - } +// try { +// //处方计划 +// if (antExamModel.getNextCheckTime() != null) { +// saveCheckItem(antExamModel.getNextCheckTime(), patients); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } +// try { +// //处方计划 +// if (antExamModel.getCheckDate() != null) { +// saveCheckActual(antExamModel.getCheckDate(), patients); +// } +// } catch (Exception e) { +// e.printStackTrace(); +// } try { //处方计划 @@ -634,13 +634,13 @@ public class AntenatalExaminationFacade { //秦皇岛市山海关人民医院 零时处理 -// if (StringUtils.isNotEmpty(excAddRequest.getCheckTime()) && "1000000004".equals(hospitalId)) { -// if (!excAddRequest.getCheckTime().equals(DateUtil.getyyyy_MM_dd(new Date()))) -// { -// return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); -// } -// -// } + if (StringUtils.isNotEmpty(excAddRequest.getCheckTime()) && "1000000004".equals(hospitalId)) { + if (!excAddRequest.getCheckTime().equals(DateUtil.getyyyy_MM_dd(new Date()))) + { + return new BaseResponse().setErrormsg("检查日期不是当天不能保存").setErrorcode(ErrorCodeConstants.DATA_EXIST); + } + + } /** 验证产检券是否可用 可用就改为已使用状态 */ @@ -1198,20 +1198,20 @@ public class AntenatalExaminationFacade { // } - try { - //处方计划 - if (excAddRequest.getNextCheckTime() != null) { - saveCheckItem(DateUtil.parseYMD(excAddRequest.getNextCheckTime()), patients); - } - } catch (Exception e) { - } - try { - //处方计划 - if (excAddRequest.getCheckTime() != null) { - saveCheckActual(DateUtil.parseYMD(excAddRequest.getCheckTime()), patients); - } - } catch (Exception e) { - } +// try { +// //处方计划 +// if (excAddRequest.getNextCheckTime() != null) { +// saveCheckItem(DateUtil.parseYMD(excAddRequest.getNextCheckTime()), patients); +// } +// } catch (Exception e) { +// } +// try { +// //处方计划 +// if (excAddRequest.getCheckTime() != null) { +// saveCheckActual(DateUtil.parseYMD(excAddRequest.getCheckTime()), patients); +// } +// } catch (Exception e) { +// } try { if (excAddRequest.getNextCheckTime() != null) { @@ -1421,45 +1421,45 @@ public class AntenatalExaminationFacade { return null; } - public void saveCheckItem(Date nextCheckTime, Patients patients) { - List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); - if (CollectionUtils.isNotEmpty(itemConfigs)) { - for (CheckItemConfig checkItemConfig : itemConfigs) { - //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 - int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1), nextCheckTime); - if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { - CheckItemOrder order = new CheckItemOrder(); - order.setCreated(new Date()); - order.setHospitalId(patients.getHospitalId()); - order.setNextCheckTime(nextCheckTime); - order.setItemId(checkItemConfig.getId()); - order.setPatientId(patients.getId()); - mongoTemplate.save(order); - } - } - } - } - - - public void saveCheckActual(Date checkTime, Patients patients) { - List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); - if (CollectionUtils.isNotEmpty(itemConfigs)) { - for (CheckItemConfig checkItemConfig : itemConfigs) { - //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 - int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1), checkTime); - if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { - CheckItemActual actual = new CheckItemActual(); - actual.setCreated(new Date()); - actual.setHospitalId(patients.getHospitalId()); - actual.setCheckTime(checkTime); - actual.setItemId(checkItemConfig.getId()); - actual.setPatientId(patients.getId()); - actual.setStatus(0); - mongoTemplate.save(actual); - } - } - } - } +// public void saveCheckItem(Date nextCheckTime, Patients patients) { +// List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); +// if (CollectionUtils.isNotEmpty(itemConfigs)) { +// for (CheckItemConfig checkItemConfig : itemConfigs) { +// //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 +// int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1), nextCheckTime); +// if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { +// CheckItemOrder order = new CheckItemOrder(); +// order.setCreated(new Date()); +// order.setHospitalId(patients.getHospitalId()); +// order.setNextCheckTime(nextCheckTime); +// order.setItemId(checkItemConfig.getId()); +// order.setPatientId(patients.getId()); +// mongoTemplate.save(order); +// } +// } +// } +// } +// +// +// public void saveCheckActual(Date checkTime, Patients patients) { +// List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(patients.getHospitalId())), CheckItemConfig.class); +// if (CollectionUtils.isNotEmpty(itemConfigs)) { +// for (CheckItemConfig checkItemConfig : itemConfigs) { +// //末次月经加一天的原因是 列表中展示的孕周是不包含末次月经那天，计算周数所以也要不包含末次月经当天 +// int currentWeek = DateUtil.getWeek(DateUtil.addDay(patients.getLastMenses(), 1), checkTime); +// if (checkItemConfig.getStartWeek() <= currentWeek && checkItemConfig.getEndWeek() >= currentWeek) { +// CheckItemActual actual = new CheckItemActual(); +// actual.setCreated(new Date()); +// actual.setHospitalId(patients.getHospitalId()); +// actual.setCheckTime(checkTime); +// actual.setItemId(checkItemConfig.getId()); +// actual.setPatientId(patients.getId()); +// actual.setStatus(0); +// mongoTemplate.save(actual); +// } +// } +// } +// } /** * 初诊、复诊添加或更新追访信息 @@ -3517,8 +3517,8 @@ public class AntenatalExaminationFacade { antExChuQuery.setParentId(patients.getId()); } -// } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { -// antExChuQuery.setParentId(patients.getId()); + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { + antExChuQuery.setParentId(patients.getId()); } else { antExChuQuery.setPid(patients.getPid()); } @@ -3548,8 +3548,8 @@ public class AntenatalExaminationFacade { } else { antExQuery.setParentId(patients.getId()); } -// } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { -// antExQuery.setParentId(patients.getId()); + } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { + antExQuery.setParentId(patients.getId()); } else { antExQuery.setPid(patients.getPid()); } 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 1c45fb2..6e21f63 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 @@ -584,8 +584,14 @@ public class BasicConfigFacade { return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse queryCheckItemConfig(String hospitalId) { - List itemConfigs = mongoTemplate.find(Query.query(Criteria.where("hospitalId").is(hospitalId)), CheckItemConfig.class); + public BaseResponse queryCheckItemConfig(String hospitalId,Integer type) { + Criteria criteria = Criteria.where("hospitalId").is(hospitalId); + if (type != null) + { + criteria.and("type").is(type); + } + + List itemConfigs = mongoTemplate.find(Query.query(criteria), CheckItemConfig.class); return new BaseObjectResponse().setData(itemConfigs).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); }