diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyEyeCheckService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyEyeCheckService.java deleted file mode 100644 index 759c30f..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyEyeCheckService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.pojo.BabyEyePatient; - -import java.util.Date; - -/** - * Created by lt on 2017/8/5 0005 - */ -public interface BabyEyeCheckService { - BaseObjectResponse init(); - - BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient); - - BaseResponse info(String id); - - BaseResponse edit(String id); - - BaseResponse delete(String id); - - BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyEyePatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyEyePatientService.java deleted file mode 100644 index 7d9fa00..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyEyePatientService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.lyms.platform.permission.service; - -import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.pojo.BabyEyePatient; - -/** - * Created by lt on 2017/8/5 0005 - */ -public interface BabyEyePatientService { - BaseObjectResponse init(); - - BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient); - - BaseResponse info(String id); - - BaseResponse edit(String id); - - BaseResponse delete(String id); -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyEyeCheckServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyEyeCheckServiceImpl.java deleted file mode 100644 index c7470cc..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyEyeCheckServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.lyms.platform.permission.service.impl; - -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.ServiceTypeEnums; -import com.lyms.platform.common.enums.SexEnum; -import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.EnumUtil; -import com.lyms.platform.common.utils.SystemConfig; -import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; -import com.lyms.platform.permission.dao.master.BabyEyePatientMapper; -import com.lyms.platform.permission.service.BabyEyeCheckService; -import com.lyms.platform.permission.service.BabyEyePatientService; -import com.lyms.platform.pojo.BabyEyeCheck; -import com.lyms.platform.pojo.BabyEyePatient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created by lt on 2017/8/5 0005 - */ -@Service -public class BabyEyeCheckServiceImpl implements BabyEyeCheckService { - @Autowired - private BabyEyeCheckMapper babyEyeCheckMapper; - - @Autowired - private BasicConfigService basicConfigService; - - @Override - public BaseObjectResponse init() { - return null; - } - - @Override - public BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient) { - return null; - } - - @Override - public BaseResponse info(String id) { - return null; - } - - @Override - public BaseResponse edit(String id) { - return null; - } - - @Override - public BaseResponse delete(String id) { - return null; - } - - @Override - public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth) { - return null; - } -} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyEyePatientServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyEyePatientServiceImpl.java deleted file mode 100644 index 8413916..0000000 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyEyePatientServiceImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.lyms.platform.permission.service.impl; - -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.common.enums.ServiceStatusEnums; -import com.lyms.platform.common.enums.ServiceTypeEnums; -import com.lyms.platform.common.enums.SexEnum; -import com.lyms.platform.common.result.BaseObjectResponse; -import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.EnumUtil; -import com.lyms.platform.common.utils.SystemConfig; -import com.lyms.platform.permission.dao.master.BabyEyePatientMapper; -import com.lyms.platform.permission.service.BabyEyePatientService; -import com.lyms.platform.pojo.BabyEyePatient; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; - -/** - * Created by lt on 2017/8/5 0005 - */ -@Service -public class BabyEyePatientServiceImpl implements BabyEyePatientService { - @Autowired - private BabyEyePatientMapper babyEyePatientMapper; - - @Autowired - private BasicConfigService basicConfigService; - - @Override - public BaseObjectResponse init() { - List> sex = EnumUtil.toJson(SexEnum.class); - List> cardType = basicConfigService.getEnumByParentId(SystemConfig.CERTE_TYPE_ID); /** 证件类型 */ - List> plevelType = basicConfigService.getEnumByParentId(SystemConfig.LEVEL_TYPE_ID); /** 文化程度 */ - List> profession = basicConfigService.getEnumByParentId(SystemConfig.PROFESSION_TYPE_ID); /** 职业类别 */ - List> serviceType = EnumUtil.toJson(ServiceTypeEnums.class); /** 服务类型 */ - List> serviceStatus = EnumUtil.toJson(ServiceStatusEnums.class); /** 服务状态 */ - List> nation = basicConfigService.getEnumByParentId(SystemConfig.NATION_TYPE_ID); /** 民族 */ - return RespBuilder.buildSuccess("sex", sex, "cardType", cardType, "plevelType", plevelType, "profession", profession, "serviceType", serviceType, - "serviceStatus", serviceStatus, "nation", nation); - } - - @Override - public BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient) { -// babyEyePatientMapper. - return null; - } - - @Override - public BaseResponse info(String id) { - return null; - } - - @Override - public BaseResponse edit(String id) { - return RespBuilder.buildSuccess(babyEyePatientMapper.get(id)); - } - - @Override - public BaseResponse delete(String id) { - return null; - } -} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index c651076..9b290e9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -2,8 +2,6 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.permission.service.BabyEyeCheckService; -import com.lyms.platform.permission.service.BabyEyePatientService; import com.lyms.platform.pojo.BabyEyePatient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java index fd2821d..1f2e255 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java @@ -2,7 +2,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.permission.service.BabyEyePatientService; +import com.lyms.platform.operate.web.service.BabyEyePatientService; import com.lyms.platform.pojo.BabyEyePatient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java new file mode 100644 index 0000000..6b93e31 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -0,0 +1,24 @@ +package com.lyms.platform.operate.web.service; + +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.pojo.BabyEyePatient; + +import java.util.Date; + +/** + * Created by lt on 2017/8/5 0005 + */ +public interface BabyEyeCheckService { + BaseObjectResponse init(); + + BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient); + + BaseResponse info(String id); + + BaseResponse edit(String id); + + BaseResponse delete(String id); + + BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth); +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java new file mode 100644 index 0000000..ca9fec4 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java @@ -0,0 +1,20 @@ +package com.lyms.platform.operate.web.service; + +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.pojo.BabyEyePatient; + +/** + * Created by lt on 2017/8/5 0005 + */ +public interface BabyEyePatientService { + BaseObjectResponse init(); + + BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient); + + BaseResponse info(String id); + + BaseResponse edit(String id); + + BaseResponse delete(String id); +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java new file mode 100644 index 0000000..1e4ba38 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -0,0 +1,54 @@ +package com.lyms.platform.operate.web.service.impl; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.service.BabyEyeCheckService; +import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; +import com.lyms.platform.pojo.BabyEyePatient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * Created by lt on 2017/8/5 0005 + */ +@Service +public class BabyEyeCheckServiceImpl implements BabyEyeCheckService { + @Autowired + private BabyEyeCheckMapper babyEyeCheckMapper; + + @Autowired + private BasicConfigService basicConfigService; + + @Override + public BaseObjectResponse init() { + return null; + } + + @Override + public BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient) { + return null; + } + + @Override + public BaseResponse info(String id) { + return null; + } + + @Override + public BaseResponse edit(String id) { + return null; + } + + @Override + public BaseResponse delete(String id) { + return null; + } + + @Override + public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String currentMonth, String chechMonth) { + return null; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java new file mode 100644 index 0000000..375bf79 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java @@ -0,0 +1,110 @@ +package com.lyms.platform.operate.web.service.impl; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.enums.ServiceStatusEnums; +import com.lyms.platform.common.enums.ServiceTypeEnums; +import com.lyms.platform.common.enums.SexEnum; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.result.BasicConfigResult; +import com.lyms.platform.operate.web.service.BabyEyePatientService; +import com.lyms.platform.permission.dao.master.BabyEyePatientMapper; +import com.lyms.platform.pojo.BabyEyePatient; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.NewbornVisit; +import org.apache.commons.collections.map.HashedMap; +import org.apache.struts.config.BaseConfig; +import org.springframework.beans.factory.annotation.Autowired; +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.Service; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Created by lt on 2017/8/5 0005 + */ +@Service +public class BabyEyePatientServiceImpl implements BabyEyePatientService { + @Autowired + private BabyEyePatientMapper babyEyePatientMapper; + + @Autowired + private BasicConfigService basicConfigService; + + @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired + private MongoTemplate mongoTemplate; + + @Autowired + private BasicConfigFacade basicConfigFacade; + + @Override + public BaseObjectResponse init() { + List> sex = EnumUtil.toJson(SexEnum.class); + List pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID); /** 证件类型 */ + List plevelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);; /** 文化程度 */ + List professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID); /** 职业类别 */ + List serviceType = ServiceTypeEnums.getServiceTypeList(); /** 服务类型 */ + List serviceStatus = ServiceStatusEnums.getServiceStatusList(); /** 服务状态 */ + List> nation = basicConfigService.getEnumByParentId(SystemConfig.NATION_TYPE_ID); /** 民族 */ + return RespBuilder.buildSuccess("sex", sex, "cardType", pcerteTypeResult, "plevelType", plevelType, "profession", professionTypeResults, "serviceType", serviceType, + "serviceStatus", serviceStatus, "nation", nation); + } + + @Override + public BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient) { + if(StringUtils.isEmpty(babyEyePatient.getId())) { + babyEyePatient.setCreated(new Date()); + babyEyePatient.setYn("1"); + babyEyePatient.setOperaterId(userId + ""); + babyEyePatient.setHospitalId(autoMatchFacade.getHospitalId(userId)); + BabyModel babyModel = mongoTemplate.findById(babyEyePatient.getBabyId(), BabyModel.class); + if(babyModel != null) { + babyEyePatient.setPid(babyModel.getPid()); + } + mongoTemplate.save(babyEyePatient); + } else { + babyEyePatient.setOperaterId(userId.toString()); + Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyePatient)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyEyePatient.getId())), update, NewbornVisit.class); + } + return RespBuilder.buildSuccess(babyEyePatient.getId()); + } + + @Override + public BaseResponse info(String id) { + BabyEyePatient babyEyePatient = mongoTemplate.findById(id, BabyEyePatient.class); + Map restMap = new HashedMap(); + if(babyEyePatient != null) { + restMap.put("name", babyEyePatient.getName()); +// restMap.put("", babyEyePatient.); +// restMap.put("", babyEyePatient.); +// restMap.put("", babyEyePatient.); +// restMap.put("", babyEyePatient.); +// restMap.put("", babyEyePatient.); +// restMap.put("", babyEyePatient.); + } + return RespBuilder.buildSuccess(restMap); + } + + @Override + public BaseResponse edit(String id) { + return RespBuilder.buildSuccess(babyEyePatientMapper.get(id)); + } + + @Override + public BaseResponse delete(String id) { + return null; + } +}