From 308758666dce10651ad5e35f360bc9736719e88b Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 18 Mar 2016 21:20:12 +0800 Subject: [PATCH] c --- .../lyms/platform/biz/BasicConfigServiceTest.java | 59 ++- .../java/com/lyms/platform/biz/dal/IBabyDao.java | 24 ++ .../java/com/lyms/platform/biz/dal/IVisitDao.java | 24 ++ .../lyms/platform/biz/dal/impl/BabyDaoImpl.java | 52 +++ .../lyms/platform/biz/dal/impl/VisitDaoImpl.java | 51 +++ .../com/lyms/platform/biz/service/BabyService.java | 62 +++ .../lyms/platform/biz/service/PuerperaService.java | 18 +- .../lyms/platform/biz/service/VisitService.java | 44 +++ .../com/lyms/platform/common/enums/GuideEnums.java | 34 ++ .../lyms/platform/common/enums/SexTypeEnums.java | 39 ++ .../platform/common/result/BaseObjectResponse.java | 31 ++ .../lyms/platform/common/result/BaseResponse.java | 10 +- .../main/java/com/lyms/platform/dao/BaseDao.java | 49 --- .../java/com/lyms/platform/pojo/BabyModel.java | 109 ++++++ .../java/com/lyms/platform/pojo/PuerperaModel.java | 59 +++ .../java/com/lyms/platform/pojo/VisitModel.java | 274 ++++++++++++++ .../com/lyms/platform/query/BabyModelQuery.java | 153 ++++++++ .../lyms/platform/query/PuerperaModelQuery.java | 51 ++- .../java/com/lyms/platform/query/VisitQuery.java | 45 +++ .../web/controller/BabyManageController.java | 80 ++++ .../web/controller/BasicConfigController.java | 127 ++++--- .../web/controller/PuerperaManageController.java | 70 ++-- .../operate/web/controller/VisitController.java | 53 +++ .../operate/web/facade/BabyManagerFacade.java | 127 +++++++ .../operate/web/facade/BasicConfigFacade.java | 110 ++++++ .../operate/web/facade/PuerperaManagerFacade.java | 94 +++++ .../platform/operate/web/facade/VisitFacade.java | 94 +++++ .../web/request/BabyManagerQueryRequest.java | 108 ++++++ .../web/request/BabyManagerUpdateRequest.java | 25 ++ .../operate/web/request/BasicConfigAddRequest.java | 60 +++ .../web/request/BasicConfigQueryRequest.java | 42 +++ .../operate/web/request/BasicConfigRequest.java | 53 --- .../web/request/BasicConfigUpdateRequest.java | 35 ++ .../web/request/PuerperaManagerQueryRequest.java | 119 ++++++ .../web/request/PuerperaManagerRequest.java | 119 ------ .../web/request/PuerperaManagerUpdateRequest.java | 366 ++++++++++++++++++ .../operate/web/request/VisitAddRequest.java | 415 +++++++++++++++++++++ .../platform/operate/web/result/BabyResult.java | 97 +++++ .../operate/web/result/PuerperaResult.java | 82 ++++ .../platform/operate/web/result/SimpleVisit.java | 351 +++++++++++++++++ .../platform/operate/web/result/VisitResult.java | 114 ++++++ .../platform/operate/web/utils/TreeHelper.java | 4 +- .../main/resources/spring/applicationContext.xml | 2 +- 43 files changed, 3595 insertions(+), 340 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/GuideEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java delete mode 100644 platform-dal/src/main/java/com/lyms/platform/dao/BaseDao.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/VisitQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerUpdateRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java delete mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java delete mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimpleVisit.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java index 2991e54..6b78681 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/BasicConfigServiceTest.java @@ -1,10 +1,8 @@ package com.lyms.platform.biz; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -import java.util.Map; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -12,12 +10,13 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; -import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.BabyService; import com.lyms.platform.biz.service.PuerperaService; -import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.biz.service.VisitService; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.PuerperaModel; +import com.lyms.platform.pojo.VisitModel; import com.lyms.platform.query.PuerperaModelQuery; -import com.mongodb.util.JSON; public class BasicConfigServiceTest { public static void main(String[] args) throws Exception { @@ -32,7 +31,8 @@ public class BasicConfigServiceTest { obj.setName("小王2"); obj.setPhone("13996289315"); obj.setYn(1); - // basicConfigService.addPuerpera(obj); + obj.setCardNo("50022319951267164465"); +// basicConfigService.addPuerpera(obj); PuerperaModel obj1 = new PuerperaModel(); obj1.setAddress("成都市高新区天府4街"); @@ -43,7 +43,8 @@ public class BasicConfigServiceTest { obj1.setPhone("15197164164"); obj1.setYn(1); obj1.setCommunityId("dqweqwdadadaddad"); - basicConfigService.addPuerpera(obj1); + obj1.setCardNo("50022319951267164466"); +// basicConfigService.addPuerpera(obj1); PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); @@ -51,7 +52,7 @@ public class BasicConfigServiceTest { puerperaQuery.setKeyword("小王"); puerperaQuery.setDueDateStart(sdf.parse("2016-1-12")); puerperaQuery.setDueDateEnd(sdf.parse("2016-3-16")); - System.out.println(basicConfigService.queryPuerpera(puerperaQuery)); +// System.out.println(basicConfigService.queryPuerpera(puerperaQuery)); /* * for(int i = 6;i<7;i++){ BasicConfig obj = new BasicConfig(); obj.setCode("xc123456"+i); obj.setName("哮喘123456"+i); obj.setYn(1); * obj.setParentId("56ea134c24fdaafbabbb0025"); basicConfigService.addBasicConfig(obj); } @@ -63,12 +64,50 @@ public class BasicConfigServiceTest { * System.out.println(JSON.parse("{\"名称\":111}")); MongoTemplate mongoTemplate =applicationContext.getBean(MongoTemplate.class); // * mongoTemplate.save(JSON.parse("{\"名称\":111}"),"aa"); System.out.println(mongoTemplate.find(null, Map.class)); */ - System.out.println("----------------------------------------------------"); + /* System.out.println("----------------------------------------------------"); Criteria cri = Criteria.where("dueDate").gte(sdf.parse("2016-1-12")).lte(sdf.parse("2016-3-16")); Query query = new Query(cri); List users = applicationContext.getBean(MongoTemplate.class).find(query, PuerperaModel.class); for (PuerperaModel users2 : users) { System.out.println(users2.toString()); - } + }*/ + addBaby(applicationContext); } + + public static void addVisit(ApplicationContext applicationContext){ + VisitModel visitModel = new VisitModel(); + + visitModel.setBp("{\"h\":120,\"l\":80}"); + visitModel.setBreast("未见异常"); + visitModel.setChecktime("2015-5-12"); + visitModel.setDoctorsign("医生签名"); + visitModel.setDue(5);//分娩后多少天 + visitModel.setHealth("健康情况"); + visitModel.setLochia("恶露未见异常"); + visitModel.setMatrix("子宫未见异常"); + visitModel.setMentality("心里情况"); + visitModel.setNextvisit("2016-7-16"); + visitModel.setNumOfLive("2"); + visitModel.setWound("伤口未见异常"); + //{"check": 1,"text": "fsf"} + visitModel.setType("{\"check\": 1,\"text\":\"fsf\"}"); + //转诊 +// {"check": 1,"dept": "","org": "","reason": ""} + visitModel.setReferral("{\"check\": 1,\"dept\": \"\",\"org\": \"\",\"reason\": \"\"}"); + //{"check": [1,3,4],"other": "其他"} + visitModel.setGuide("{\"check\": [1,3,4],\"other\": \"其他\"}"); + visitModel.setParentId("56ebbff424fdd5ddf5dd2070"); + VisitService service= applicationContext.getBean(VisitService.class); + service.addVisit(visitModel) +; } + public static void addBaby(ApplicationContext applicationContext){ + BabyModel babyModel = new BabyModel(); + babyModel.setBirth(new Date()); + babyModel.setName("小孩的名字"); + babyModel.setSex(1); + babyModel.setVisitstatus(1); + babyModel.setParentId("56ebbff424fdd5ddf5dd2070"); + BabyService babyService = applicationContext.getBean(BabyService.class); + babyService.addOneBaby(babyModel); +; } } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyDao.java new file mode 100644 index 0000000..1631e74 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IBabyDao.java @@ -0,0 +1,24 @@ +package com.lyms.platform.biz.dal; + +import java.util.List; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.pojo.BabyModel; + +public interface IBabyDao { + + public BabyModel addOneBaby(BabyModel obj); + + public void updateOneBaby(BabyModel obj, String id); + + public void deleteBabyById(String id); + + public BabyModel getOneBabyById(String id); + + public int queryBabyCount(MongoQuery query); + + public List queryBabyWithQuery(MongoQuery query); + + public Page findPageWithQuery(MongoQuery query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java new file mode 100644 index 0000000..5651d41 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IVisitDao.java @@ -0,0 +1,24 @@ +package com.lyms.platform.biz.dal; + +import java.util.List; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.pojo.VisitModel; + +public interface IVisitDao { + + public VisitModel addVisit(VisitModel obj); + + public void updateVisit(VisitModel obj, String id); + + public void deleteVisit(String id); + + public VisitModel getVisit(String id); + + public int queryPuerperaCount(MongoQuery query); + + public List queryVisit(MongoQuery query); + + public Page findPage(MongoQuery query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyDaoImpl.java new file mode 100644 index 0000000..c882100 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BabyDaoImpl.java @@ -0,0 +1,52 @@ +package com.lyms.platform.biz.dal.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.lyms.platform.biz.dal.IBabyDao; +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.pojo.BabyModel; + +@Repository("babyDao") +public class BabyDaoImpl extends BaseMongoDAOImpl implements IBabyDao { + + @Override + public BabyModel addOneBaby(BabyModel obj) { + return save(obj); + } + + @Override + public void updateOneBaby(BabyModel obj, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } + + @Override + public void deleteBabyById(String id) { + delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery()); + } + + @Override + public BabyModel getOneBabyById(String id) { + return findById(id); + } + + @Override + public int queryBabyCount(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } + + @Override + public List queryBabyWithQuery(MongoQuery query) { + return find(query.convertToMongoQuery()); + } + + @Override + public Page findPageWithQuery(MongoQuery query) { + return findPage(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java new file mode 100644 index 0000000..78c39e9 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/VisitDaoImpl.java @@ -0,0 +1,51 @@ +package com.lyms.platform.biz.dal.impl; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.lyms.platform.biz.dal.IVisitDao; +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.pojo.VisitModel; +@Repository("visitDao") +public class VisitDaoImpl extends BaseMongoDAOImpl implements IVisitDao { + + @Override + public VisitModel addVisit(VisitModel obj) { + return save(obj); + } + + @Override + public void updateVisit(VisitModel obj, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } + + @Override + public void deleteVisit(String id) { + delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery()); + } + + @Override + public VisitModel getVisit(String id) { + return findById(id); + } + + @Override + public int queryPuerperaCount(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } + + @Override + public List queryVisit(MongoQuery query) { + return find(query.convertToMongoQuery()); + } + + @Override + public Page findPage(MongoQuery query) { + return findPage(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java new file mode 100644 index 0000000..2c2a1b0 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyService.java @@ -0,0 +1,62 @@ +package com.lyms.platform.biz.service; + +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.stereotype.Service; + +import com.lyms.platform.biz.dal.IBabyDao; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.query.BabyModelQuery; + +@Service +public class BabyService { + + @Autowired + private IBabyDao iBabyDao; + + public BabyModel addOneBaby(BabyModel obj){ + return iBabyDao.addOneBaby(obj); + } + + public void updateOneBaby(BabyModel obj, String id){ + iBabyDao.updateOneBaby(obj, id); + } + + public void deleteBabyById(String id){ + iBabyDao.deleteBabyById(id); + } + + public BabyModel getOneBabyById(String id){ + return iBabyDao.getOneBabyById(id); + } + + public int queryBabyCount(BabyModelQuery babyQuery){ + + return iBabyDao.queryBabyCount(babyQuery.convertToQuery()); + } + + public List queryBabyWithQuery(BabyModelQuery babyQuery){ + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild(iBabyDao.queryBabyCount(babyQuery.convertToQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + + return iBabyDao.queryBabyWithQuery(query.addOrder(Direction.ASC, "id")); + } + + + public Page findPageWithQuery(MongoQuery query){ + return iBabyDao.findPageWithQuery(MongoCondition.newInstance().toMongoQuery().addOrder(Direction.ASC, "id")); + } + + public Page findPageWithQuery(int start,int end){ + return iBabyDao.findPageWithQuery(MongoCondition.newInstance().toMongoQuery().start(start).end(end).addOrder(Direction.ASC, "id")); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java index 2774439..9ef3807 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java @@ -20,6 +20,7 @@ import com.lyms.platform.query.PuerperaModelQuery; public class PuerperaService { @Autowired private IPuerperaDao iPuerperaDao; + public void addPuerpera(PuerperaModel obj) { iPuerperaDao.addPuerpera(obj); } @@ -37,8 +38,23 @@ public class PuerperaService { return iPuerperaDao.queryPuerpera(query.addOrder(Direction.ASC, "id")); } + + /** + * 根据身份证号码查询某一个患者 + * + * @return + */ + public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery){ + + + + return iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()).get(0); + } - + public PuerperaModel findOnePuerperaById(String id){ + return iPuerperaDao.getPuerpera(id); + } + public List queryByParentId(String parentId) { return iPuerperaDao.queryPuerpera(MongoCondition.newInstance("parentId", parentId, MongoOper.IS).toMongoQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java new file mode 100644 index 0000000..6a2632d --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/VisitService.java @@ -0,0 +1,44 @@ +package com.lyms.platform.biz.service; + +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort.Direction; +import org.springframework.stereotype.Service; + +import com.lyms.platform.biz.dal.IVisitDao; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.pojo.VisitModel; +import com.lyms.platform.query.VisitQuery; +@Service +public class VisitService { + + @Autowired + private IVisitDao iVisitDao; + + public void addVisit(VisitModel obj) { + iVisitDao.addVisit(obj); + } + + public void updateVisit(VisitModel obj) { + iVisitDao.updateVisit(obj, obj.getId()); + } + + public List queryVisit(VisitQuery visitQuery) { + MongoQuery query = visitQuery.convertToQuery(); + if (StringUtils.isNotEmpty(visitQuery.getNeed())) { + visitQuery.mysqlBuild(iVisitDao.queryPuerperaCount(visitQuery.convertToQuery())); + query.start(visitQuery.getOffset()).end(visitQuery.getLimit()); + } + + return iVisitDao.queryVisit(query.addOrder(Direction.ASC, "id")); + } + + + public Page queryVisitsAndPage(int start, int end) { + return iVisitDao.findPage(MongoCondition.newInstance().toMongoQuery().start(start).end(end).addOrder(Direction.ASC, "id")); + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/GuideEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/GuideEnums.java new file mode 100644 index 0000000..5edbb51 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/GuideEnums.java @@ -0,0 +1,34 @@ +package com.lyms.platform.common.enums; + +public enum GuideEnums { + GE_REN_WEI_SHENG(1, "个人卫生"), XIN_LI(2, "心理"), + YING_YANG(3, "营养"), MU_RU_WEI_YANG(4, "母乳喂养"), + XIN_SHENG_ER(5,"新生儿护理与喂养") + ; + + private GuideEnums(int id, String title) { + this.id = id; + this.title = title; + } + + private int id; + + private String title; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java new file mode 100644 index 0000000..9fbc3f8 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java @@ -0,0 +1,39 @@ +package com.lyms.platform.common.enums; + +/** + * + * 性别枚举 + * + * @author Administrator + * + */ +public enum SexTypeEnums { + + BOY(1,"男孩"),GIRL(0,"女孩"); + + private SexTypeEnums(int id, String name) { + this.id = id; + this.name = name; + } + + public static String getTitleById(int id){ + for(SexTypeEnums sex : values()){ + if(id==sex.id){ + return sex.getName(); + } + } + return ""; + } + + private int id; + + private String name; + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java b/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java new file mode 100644 index 0000000..07831a5 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java @@ -0,0 +1,31 @@ +package com.lyms.platform.common.result; + +public class BaseObjectResponse extends BaseResponse { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private Object data; + + public Object getData() { + return data; + } + + public BaseObjectResponse setData(Object data) { + this.data = data; + return this; + } + + public BaseObjectResponse setErrormsg(String errormsg) { + super.setErrormsg(errormsg); + return this; + } + + public BaseObjectResponse setErrorcode(int errorcode) { + super.setErrorcode(errorcode); + return this; + } + +} \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java b/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java index 6bad1f2..322c898 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java @@ -35,13 +35,11 @@ public class BaseResponse extends BaseModel { this.errormsg = errormsg; return this; } - + public BaseResponse setErrorcode(int errorcode) { + this.errorcode = errorcode; + return this; + } public int getErrorcode() { return errorcode; } - - public BaseResponse setErrorcode(int errorcode) { - this.errorcode = errorcode; - return this; - } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/dao/BaseDao.java b/platform-dal/src/main/java/com/lyms/platform/dao/BaseDao.java deleted file mode 100644 index c89750b..0000000 --- a/platform-dal/src/main/java/com/lyms/platform/dao/BaseDao.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.lyms.platform.dao; - -import java.util.List; - -public interface BaseDao { - - /** - * 插入单个实体 - * - * @param entity - */ - int insert(T entity); - - /** - * 删除单条数据 - * - * @param id - */ - int delete(String id); - - /** - * 修改实体 - * - * @param entity - */ - int update(T entity); - - /** - * 查询单条数据 - * - * @param id - * @return - */ - T getById(String id); - - /** - * 查询符合条件的数据 - * - * @return - */ - List getAll(); - - /** - * 查询条数 - * - * @return - */ - int findPageCount(T entity); -} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java new file mode 100644 index 0000000..8ef5afd --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -0,0 +1,109 @@ +package com.lyms.platform.pojo; + +import java.util.Date; + +import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.mapping.Field; + +import com.lyms.platform.common.result.BaseModel; + +/** + * 新生儿模型 + * + * @author Administrator + */ +@Document(collection = "lyms_baby") +public class BabyModel extends BaseModel { + + /** + * + */ + private static final long serialVersionUID = 1L; + + private String id; + + /** + * 母亲的id + */ + @Field("parentid") + private String parentId; + + /** + * 生日 + */ + private Date birth; + + /** + * 性别 + */ + private int sex; + + /** + * 访视状态 + */ + private int visitstatus=-1; + /** + * 小孩名称 + */ + private String name; + + private int yn; + + + public int getYn() { + return yn; + } + + public void setYn(int yn) { + this.yn = yn; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + + public Date getBirth() { + return birth; + } + + public void setBirth(Date birth) { + this.birth = birth; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public int getVisitstatus() { + return visitstatus; + } + + public void setVisitstatus(int visitstatus) { + this.visitstatus = visitstatus; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java index c35b959..47c41d8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PuerperaModel.java @@ -59,6 +59,7 @@ public class PuerperaModel extends BaseModel { /** * 地址 */ + private String address; /** * 社区id @@ -133,6 +134,8 @@ public class PuerperaModel extends BaseModel { public void setDueDate(Date dueDate) { this.dueDate = dueDate; } + + public String getAddress() { return address; } @@ -145,4 +148,60 @@ public class PuerperaModel extends BaseModel { public void setCommunityId(String communityId) { this.communityId = communityId; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((address == null) ? 0 : address.hashCode()); + result = prime * result + age; + result = prime * result + ((cardNo == null) ? 0 : cardNo.hashCode()); + result = prime * result + ((communityId == null) ? 0 : communityId.hashCode()); + result = prime * result + ((deliverOrg == null) ? 0 : deliverOrg.hashCode()); + result = prime * result + ((dueDate == null) ? 0 : dueDate.hashCode()); + result = prime * result + ((dueType == null) ? 0 : dueType.hashCode()); + result = prime * result + ((id == null) ? 0 : id.hashCode()); + result = prime * result + isVisit; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((phone == null) ? 0 : phone.hashCode()); + result = prime * result + yn; + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + PuerperaModel other = (PuerperaModel) obj; + if (address == null) { + if (other.address != null) return false; + } else if (!address.equals(other.address)) return false; + if (age != other.age) return false; + if (cardNo == null) { + if (other.cardNo != null) return false; + } else if (!cardNo.equals(other.cardNo)) return false; + if (communityId == null) { + if (other.communityId != null) return false; + } else if (!communityId.equals(other.communityId)) return false; + if (deliverOrg == null) { + if (other.deliverOrg != null) return false; + } else if (!deliverOrg.equals(other.deliverOrg)) return false; + if (dueDate == null) { + if (other.dueDate != null) return false; + } else if (!dueDate.equals(other.dueDate)) return false; + if (dueType == null) { + if (other.dueType != null) return false; + } else if (!dueType.equals(other.dueType)) return false; + if (id == null) { + if (other.id != null) return false; + } else if (!id.equals(other.id)) return false; + if (isVisit != other.isVisit) return false; + if (name == null) { + if (other.name != null) return false; + } else if (!name.equals(other.name)) return false; + if (phone == null) { + if (other.phone != null) return false; + } else if (!phone.equals(other.phone)) return false; + if (yn != other.yn) return false; + return true; + } } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java new file mode 100644 index 0000000..691c69e --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/VisitModel.java @@ -0,0 +1,274 @@ +package com.lyms.platform.pojo; + +import org.springframework.data.mongodb.core.mapping.Document; + +import com.lyms.platform.common.result.BaseModel; + +/** + * 访视记录模型 + * + * @author Administrator + */ +@Document(collection = "lyms_visit") +public class VisitModel extends BaseModel { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * 患者id + */ + private String parentId; + + private String id; + /** + * 活产数 + */ + private String numOfLive; + /** + * 住院分娩 + */ + private int due; + /** + * 心法接生 + */ + private int xinType; + + /** + * 乳房 + */ + private String breast; + + /** + * 检查时间 + */ + private String checktime; + + /** + * 分娩后的天数 + */ + private String days; + + /** + * 医生签名 + */ + + private String doctorsign; + + /** + * 健康情况 + */ + private String health; + + /** + * 恶露 + */ + private String lochia; + + /** + * 子宫 + */ + private String matrix; + + /** + * 心理状态 + */ + private String mentality; + + /** + * 下次访问时间 + */ + private String nextvisit; + + /** + * 其他 + */ + private String other; + + /** + * 指导 + */ + private String guide; + + /** + * 血压 + */ + private String bp; + + /** + * 转诊 + */ + private String referral; + + /** + * 类型 + */ + private String type; + + /** + * 伤口 + */ + private String wound; + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getBreast() { + return breast; + } + + public void setBreast(String breast) { + this.breast = breast; + } + + public String getChecktime() { + return checktime; + } + + public void setChecktime(String checktime) { + this.checktime = checktime; + } + + public String getDays() { + return days; + } + + public void setDays(String days) { + this.days = days; + } + + public String getDoctorsign() { + return doctorsign; + } + + public void setDoctorsign(String doctorsign) { + this.doctorsign = doctorsign; + } + + public String getHealth() { + return health; + } + + public void setHealth(String health) { + this.health = health; + } + + public String getLochia() { + return lochia; + } + + public void setLochia(String lochia) { + this.lochia = lochia; + } + + public String getMatrix() { + return matrix; + } + + public void setMatrix(String matrix) { + this.matrix = matrix; + } + + public String getMentality() { + return mentality; + } + + public void setMentality(String mentality) { + this.mentality = mentality; + } + + public String getNextvisit() { + return nextvisit; + } + + public void setNextvisit(String nextvisit) { + this.nextvisit = nextvisit; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getGuide() { + return guide; + } + + public void setGuide(String guide) { + this.guide = guide; + } + + public String getBp() { + return bp; + } + + public void setBp(String bp) { + this.bp = bp; + } + + public String getReferral() { + return referral; + } + + public void setReferral(String referral) { + this.referral = referral; + } + + public String getType() { + return type; + } + + public String getNumOfLive() { + return numOfLive; + } + + public void setNumOfLive(String numOfLive) { + this.numOfLive = numOfLive; + } + + public void setType(String type) { + this.type = type; + } + + public String getWound() { + return wound; + } + + public void setWound(String wound) { + this.wound = wound; + } + + public int getDue() { + return due; + } + + public void setDue(int due) { + this.due = due; + } + + public int getXinType() { + return xinType; + } + + public void setXinType(int xinType) { + this.xinType = xinType; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java new file mode 100644 index 0000000..84e3fb6 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -0,0 +1,153 @@ +package com.lyms.platform.query; + +import java.util.Date; + +import org.springframework.data.mongodb.core.query.Criteria; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +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; + +/** + * 新生儿查询模型 + * + * @author Administrator + */ +public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { + + + + private String id; + + /** + * 关键字 + */ + private String keyword; + + /** + * 母亲的id + */ + private String parentId; + + /** + * 生日 + */ + private Date birthStart; + + /** + * 生日 + */ + private Date birthEnd; + + /** + * 性别 + */ + private int sex; + + /** + * 访视状态 + */ + private int visitstatus = -1; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public Date getBirthStart() { + return birthStart; + } + + public void setBirthStart(Date birthStart) { + this.birthStart = birthStart; + } + + public Date getBirthEnd() { + return birthEnd; + } + + public void setBirthEnd(Date birthEnd) { + this.birthEnd = birthEnd; + } + + public int getSex() { + return sex; + } + + public void setSex(int sex) { + this.sex = sex; + } + + public int getVisitstatus() { + return visitstatus; + } + + public void setVisitstatus(int visitstatus) { + this.visitstatus = visitstatus; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + boolean isAddStart = Boolean.FALSE; + + if(-1!=visitstatus){ + condition=condition.and("visitstatus", visitstatus, MongoOper.IS); + } + if(null!=id){ + condition=condition.and("id", id, MongoOper.IS); + } + /* if(null!=keyword){ + if(null!=keyword){ + MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE); + MongoCondition con = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); + condition = condition.orCondition(new MongoCondition[]{con1,con}); + } + }*/ + + if(null!=parentId){ + condition=condition.and("parentId", parentId, MongoOper.IS); + } + + Criteria c = null; + if (null != birthStart) { + c = Criteria.where("birth").gte(birthStart); + isAddStart = Boolean.TRUE; + } + + if (null != birthEnd) { + if (isAddStart) { + c=c.lte(birthEnd); + } else { + c = Criteria.where("birth").lte(birthEnd); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } + return condition.toMongoQuery(); + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java index 7b95498..2696c97 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PuerperaModelQuery.java @@ -18,6 +18,8 @@ import com.lyms.platform.common.dao.operator.MongoQuery; * */ public class PuerperaModelQuery extends BaseQuery implements IConvertToNativeQuery{ + + private String id; /** * 关键字 @@ -57,11 +59,23 @@ public class PuerperaModelQuery extends BaseQuery implements IConvertToNativeQue private String communityId; /** + * 身份证号码 + */ + private String cardNo; + + + /** * 是否有效 */ private int yn; + public String getCardNo() { + return cardNo; + } + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } public int getVisitstatus() { return visitstatus; } @@ -139,14 +153,45 @@ public class PuerperaModelQuery extends BaseQuery implements IConvertToNativeQue if(null!=communityId){ condition= condition.and("communityId", communityId, MongoOper.IS); } - - if(null!=dueDateStart){ + if(null!=id){ + condition= condition.and("id", id, MongoOper.IS); + } + if(null!=cardNo){ + condition=condition.and("cardno", cardNo, MongoOper.IS); + } + /*if(null!=dueDateStart){ // condition= condition.elemMatch("dueDate",MongoCondition.newInstance("$lte", dueDateStart, MongoOper.IS).and("$gte", dueDateEnd, MongoOper.IS)); // condition=condition.and("dueDate", dueDateStart, MongoOper.GTE).and("dueDate", dueDateEnd, MongoOper.LTE); - Criteria c = Criteria.where("dueDate").gte(dueDateStart).lte(dueDateEnd).andOperator(condition.getCriteria()); + Criteria c = Criteria.where("dueDate").gte(dueDateStart).lte(dueDateEnd).andOperator(condition.getCriteria()); return new MongoCondition(c).toMongoQuery(); + }*/ + boolean isAddStart = Boolean.FALSE; + Criteria c = null; + if (null != dueDateStart) { + c = Criteria.where("dueDate").gte(dueDateStart); + isAddStart = Boolean.TRUE; + } + + if (null != dueDateEnd) { + if (isAddStart) { + c=c.lte(dueDateEnd); + } else { + c = Criteria.where("dueDate").lte(dueDateEnd); + } + isAddStart = Boolean.TRUE; + } + if (isAddStart) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); } return condition.toMongoQuery(); } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + + } \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/VisitQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/VisitQuery.java new file mode 100644 index 0000000..b00a8b1 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/VisitQuery.java @@ -0,0 +1,45 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +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; + +public class VisitQuery extends BaseQuery implements IConvertToNativeQuery{ + + /** + * 患者id + */ + private String parentId; + + private String id; + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + if(null!=parentId){ + condition= condition.and("parentId", parentId, MongoOper.IS); + } + if(null!=id){ + condition= condition.and("id", id, MongoOper.IS); + } + return condition.toMongoQuery(); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java new file mode 100644 index 0000000..1f289d6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java @@ -0,0 +1,80 @@ +package com.lyms.platform.operate.web.controller; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.BabyManagerFacade; +import com.lyms.platform.operate.web.request.BabyManagerQueryRequest; +import com.lyms.platform.operate.web.request.BabyManagerUpdateRequest; + +/** + * 新生儿管理接口 + * + * @author Administrator + * + */ +@Controller +public class BabyManageController { + + /** + * + * 新生儿管理门面 + */ + @Autowired + private BabyManagerFacade babyManagerFacade; + + + /** + * 新生儿管理查询接口 + * + * @param managerRequest 新生儿查询请求 + * + * @return + */ + @RequestMapping(value = "/babymanage", method = RequestMethod.GET) + @ResponseBody + public BaseListResponse findBabyDataList(@Valid BabyManagerQueryRequest babyManagerRequest){ + return babyManagerFacade.findBabyList(babyManagerRequest); + } + + + /** + * + * 修改新生儿接口 + * + * @param id 新生儿id + * + * @param babyManagerUpdateRequest 新生儿修改请求 + * + * @return 返回结果 + */ + @RequestMapping(value = "/babymanage/{id}", method = RequestMethod.PUT) + @ResponseBody + public BaseResponse updateOneBaby(@PathVariable("id")String id,@Valid BabyManagerUpdateRequest babyManagerUpdateRequest){ + babyManagerUpdateRequest.setId(id); + return babyManagerFacade.updateOneBaby(babyManagerUpdateRequest); + } + + /** + * + * 删除一条新生儿数据 + * + * @param id 新生儿id + * + * @return 返回结果 + */ + @RequestMapping(value = "/babymanage", method = RequestMethod.DELETE) + @ResponseBody + public BaseResponse deleteOneBabyById(@RequestParam("id")String id){ + return babyManagerFacade.deleteOneBabyById(id); + } +} 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 644990e..f6e3e56 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 @@ -1,8 +1,9 @@ package com.lyms.platform.operate.web.controller; -import java.util.ArrayList; import java.util.List; +import javax.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.stereotype.Controller; @@ -13,89 +14,97 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import com.lyms.platform.biz.service.BasicConfigService; -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.operate.web.request.BasicConfigRequest; +import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; +import com.lyms.platform.operate.web.request.BasicConfigAddRequest; +import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; 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.query.BasicConfigQuery; /** + * + * * 基础项配置接口 * * @author Administrator */ @Controller public class BasicConfigController { + @Autowired - private BasicConfigService basicConfigService; - + private BasicConfigFacade basicConfigFacade; + + /** + * + * 基础项配置查询 + * + * @param basicConfigQueryRequest 基础项配置查询请求 + * + * @return 返回结果 + */ @RequestMapping(method = RequestMethod.GET, value = "/basicConfig") @ResponseBody - public BaseListResponse queryBasicConfig(@RequestParam(value = "keywords", required = false) - String keywords, @RequestParam("page") - int page, @RequestParam("limit") - int limit) { - BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); - basicConfigQuery.setNeed("1"); - basicConfigQuery.setPage(page); - basicConfigQuery.setLimit(limit); - basicConfigQuery.setKeyword(keywords); - List data = basicConfigService.queryBasicConfig(basicConfigQuery); - - return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + public BaseListResponse queryBasicConfig(@Valid BasicConfigQueryRequest basicConfigQueryRequest) { + return basicConfigFacade.findBasicConfigList(basicConfigQueryRequest); } - + + /** + * + * 修改一条基础项配置 + * + * @param id 基础项id + * + * @param basicConfigUpdateRequest 基础项修改请求 + * + * @return 返回结果 + */ @RequestMapping(method = RequestMethod.PUT, value = "/basicConfig/{id}") @ResponseBody - public BaseResponse updateBasicConfig(@PathVariable("id") - String id, @RequestParam("title") - String title, @RequestParam("code") - String code) { - BasicConfig obj = new BasicConfig(); - obj.setId(id); - obj.setName(title); - obj.setCode(code); - basicConfigService.updateBasicConfig(obj); - return new BaseResponse("成功",ErrorCodeConstants.SUCCESS); + public BaseResponse updateOneBasicConfigById(@PathVariable("id") + String id, @Valid BasicConfigUpdateRequest basicConfigUpdateRequest) { + basicConfigUpdateRequest.setId(id); + return basicConfigFacade.updateOneBasicConfig(basicConfigUpdateRequest); } - - @RequestMapping(method = RequestMethod.DELETE, value = "/basicConfig/{id}") + + /** + * + * 删除一条基础项配置 + * + * @param id 基础项id + * + * @return 返回结果 + */ + @RequestMapping(method = RequestMethod.DELETE, value = "/basicConfig") @ResponseBody - public BaseResponse updateBasicConfig(@PathVariable("id") - String id) { - BasicConfig obj = new BasicConfig(); - obj.setId(id); - obj.setYn(0); - basicConfigService.updateBasicConfig(obj); - - return new BaseResponse("成功",ErrorCodeConstants.SUCCESS); + public BaseResponse deleteOneBasicConfigById(@RequestParam("id") String id) { + return basicConfigFacade.deleteOneBasicConfig(id); } + + /** + * + * 基础项树形结构数据 + * + * @return 返回结果 + */ @RequestMapping(method = RequestMethod.GET, value = "/basicConfigTree") @ResponseBody - public List buildJson() { - List list = new ArrayList(); - List l = basicConfigService.queryParentConfig(); - for (BasicConfig b : l) { - TreeNode node = TreeHelper.recursiveTree(b, basicConfigService); - if (null != node) { - list.add(node); - } - } - return list; + public List findAllBasicConfigWithTree() { + return basicConfigFacade.findAllBasicConfigWithTree(); } - + + /** + * 批量增加基础项配置 + * + * @param basicConfigRequests 批量增加请求 + * + * @return 返回结果 + */ @RequestMapping(method = RequestMethod.POST, value = "/basicConfig", consumes = { MediaType.APPLICATION_JSON_VALUE }) @ResponseBody - public BaseResponse addBasicConfig(@RequestBody - List listReq) { - for (BasicConfigRequest ba : listReq) { - basicConfigService.addBasicConfig(ba.convertToBasicConfig()); - } - return new BaseResponse("成功",ErrorCodeConstants.SUCCESS); + public BaseResponse batchAddBasicConfig(@RequestBody + List basicConfigRequests) { + return basicConfigFacade.batchAddBasicConfig(basicConfigRequests); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index dc84f0a..408f3fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -1,7 +1,5 @@ package com.lyms.platform.operate.web.controller; -import java.util.List; - import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; @@ -12,13 +10,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import com.lyms.platform.biz.service.PuerperaService; -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.operate.web.request.PuerperaManagerRequest; -import com.lyms.platform.pojo.PuerperaModel; -import com.lyms.platform.query.PuerperaModelQuery; +import com.lyms.platform.operate.web.facade.PuerperaManagerFacade; +import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; +import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest; /** * 产妇管理接口 @@ -28,8 +24,9 @@ import com.lyms.platform.query.PuerperaModelQuery; @Controller public class PuerperaManageController { + @Autowired - private PuerperaService puerperaService; + private PuerperaManagerFacade puerperaManagerFacade; /** * 产妇管理查询接口 @@ -39,40 +36,39 @@ public class PuerperaManageController { */ @RequestMapping(value = "/puerperamanage", method = RequestMethod.GET) @ResponseBody - public BaseListResponse queryPuerperaManage(@Valid - PuerperaManagerRequest managerRequest) { - - PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); - puerperaQuery.setLimit(managerRequest.getLimit()); - puerperaQuery.setPage(managerRequest.getPage()); - puerperaQuery.setDueDateEnd(managerRequest.getDueDateEnd()); - puerperaQuery.setDueDateStart(managerRequest.getDueDateStart()); - puerperaQuery.setKeyword(managerRequest.getKeyword()); - puerperaQuery.setCommunityId(managerRequest.getCommunityId()); - puerperaQuery.setVisitstatus(managerRequest.getVisitstatus()); - - // 调用service查询 - - List data = puerperaService.queryPuerpera(puerperaQuery); - - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); + public BaseListResponse queryPuerperaList(@Valid PuerperaManagerQueryRequest managerRequest) { + return puerperaManagerFacade.findPuerperaList(managerRequest); } - + + /** + * + * 产妇管理删除接口 + * + * @param id 产妇id + * + * @return 返回结果 + */ @RequestMapping(value = "/puerperamanage", method = RequestMethod.DELETE) @ResponseBody - public BaseResponse deletePuerperaManager(@RequestParam("id") - String id) { - PuerperaModel obj = new PuerperaModel(); - obj.setId(id); - obj.setYn(0); - puerperaService.updatePuerpera(obj); - return new BaseResponse("成功", 0); + public BaseResponse deleteOnePuerperaById(@RequestParam("id") String id) { + //软删除数据 + return puerperaManagerFacade.deleteOnePuerperaById(id, Boolean.TRUE); } - + + + /** + * 产妇管理修改 + * + * @param id 产妇id + * + * @param puerperaManagerUpdateRequest 产妇管理修改接口 + * + * @return 返回结果 + */ @RequestMapping(value = "/puerperamanage/{id}", method = RequestMethod.PUT) @ResponseBody - public BaseResponse updatePuerperaManager(@PathVariable("id") - String id) { - return new BaseResponse("成功", 0); + public BaseResponse updatePuerperaManager(@PathVariable("id") String id,@Valid PuerperaManagerUpdateRequest puerperaManagerUpdateRequest) { + puerperaManagerUpdateRequest.setId(id); + return puerperaManagerFacade.updateOnePuerperaData(puerperaManagerUpdateRequest); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java new file mode 100644 index 0000000..43835f6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java @@ -0,0 +1,53 @@ +package com.lyms.platform.operate.web.controller; + +import javax.validation.Valid; + +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.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.VisitFacade; +import com.lyms.platform.operate.web.request.VisitAddRequest; + +/** + * 访视记录接口 + * + * @author Administrator + */ +@Controller +public class VisitController { + + @Autowired + private VisitFacade visitFacade; + + /** + * 根据身份证获取产妇信息 + * + * @param cardno 身份证号码 + * + * @return 返回结果 + */ + @RequestMapping(value = "/visit", method = RequestMethod.GET) + @ResponseBody + public BaseObjectResponse findOneByCardNo(@RequestParam("cardno")String cardno) { + return visitFacade.findOneByCardNo(cardno); + } + + /** + * 增加访视记录 + * + * @param visitAddRequest 访视记录请求 + * + * @return 返回结果 + */ + @ResponseBody + @RequestMapping(value = "/visit", method = RequestMethod.POST) + public BaseResponse addOneVisit(@Valid VisitAddRequest visitAddRequest) { + return visitFacade.addOneVisit(visitAddRequest); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java new file mode 100644 index 0000000..4731d11 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -0,0 +1,127 @@ +package com.lyms.platform.operate.web.facade; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.lyms.platform.biz.service.BabyService; +import com.lyms.platform.biz.service.PuerperaService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.BabyManagerQueryRequest; +import com.lyms.platform.operate.web.request.BabyManagerUpdateRequest; +import com.lyms.platform.operate.web.result.BabyResult; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.PuerperaModel; +import com.lyms.platform.query.BabyModelQuery; +import com.lyms.platform.query.PuerperaModelQuery; + +@Component +public class BabyManagerFacade { + + + @Autowired + private PuerperaService puerperaService; + @Autowired + private BabyService babyService; + + + + /** + * 根据条件查询符合条件的新生儿 + * + * @param babyManagerRequest + * @return + */ + public BaseListResponse findBabyList(BabyManagerQueryRequest babyManagerRequest){ + + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setBirthEnd(babyManagerRequest.getdEnd()); + babyQuery.setBirthStart(babyManagerRequest.getdStart()); + babyQuery.setVisitstatus(babyManagerRequest.getVisitstatus()); + babyQuery.setPage(babyManagerRequest.getPage()); + babyQuery.setLimit(babyManagerRequest.getLimit()); + + List data = new ArrayList(); + //根据关键字先查询产妇信息 + if(StringUtils.isNotEmpty(babyManagerRequest.getKeyword())){ + PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); + puerperaQuery.setKeyword(babyManagerRequest.getKeyword()); + //符合关键字的产妇列表 + List puerList = puerperaService.queryPuerpera(puerperaQuery); + + if(CollectionUtils.isNotEmpty(puerList)){ + for(PuerperaModel model:puerList){ + babyQuery.setParentId(model.getId()); + List babies= babyService.queryBabyWithQuery(babyQuery); + if(CollectionUtils.isNotEmpty(babies)){ + for(BabyModel baby:babies){ + data.add(buildResult(baby, model)); + } + } + } + } + }else{ + babyQuery.setNeed("y"); + List babies= babyService.queryBabyWithQuery(babyQuery); + if(CollectionUtils.isNotEmpty(babies)){ + for(BabyModel baby:babies){ + data.add(buildResult(baby, puerperaService.findOnePuerperaById(baby.getParentId()))); + } + } + } + + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); + } + + /** + * 删除一条新生儿数据 + * + * @param id 新生儿id + * + * @return 返回结果 + */ + public BaseResponse deleteOneBabyById(String id){ + BabyModel obj = new BabyModel(); + obj.setYn(YnEnums.NO.getId()); + obj.setId(id); + babyService.updateOneBaby(obj, id); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse updateOneBaby(BabyManagerUpdateRequest babyManagerUpdateRequest){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /** + * + * 构建放回的数据 + * @param baby + * @param puerModel + * @return + */ + public BabyResult buildResult(BabyModel baby,PuerperaModel puerModel){ + BabyResult babyResult = new BabyResult(); + + //填充小孩信息 + babyResult.convertToResult(baby); + babyResult.setMotherName(puerModel.getName()); + babyResult.setMotherPhone(puerModel.getPhone()); +// HashMap map = (HashMap)JsonUtil.str2Obj(puerModel.getAddress(), HashMap.class); + //需要将数据库中的json结构地址解析出来 + HashMap map = new HashMap<>(); + map.put("address", "测试地址"); + babyResult.setAddress(map.get("address").toString()); + babyResult.setParentId(puerModel.getId()); + //TODO 需要根据产妇模型上的社区id获取社区信息 + babyResult.setCommunity(StringUtils.isEmpty(puerModel.getCommunityId())?"":puerModel.getCommunityId()); + return babyResult; + } +} 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 new file mode 100644 index 0000000..6ca172f --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -0,0 +1,110 @@ +package com.lyms.platform.operate.web.facade; + +import java.util.ArrayList; +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.BasicConfigQueryRequest; +import com.lyms.platform.operate.web.request.BasicConfigAddRequest; +import com.lyms.platform.operate.web.request.BasicConfigUpdateRequest; +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.query.BasicConfigQuery; + +@Component +public class BasicConfigFacade { + @Autowired + private BasicConfigService basicConfigService; + + /** + * 基础项查询 + * + * @param basicConfigQueryRequest + * 基础项查询请求 + * @return 返回结果 + */ + public BaseListResponse findBasicConfigList(BasicConfigQueryRequest basicConfigQueryRequest) { + BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); + basicConfigQuery.setNeed("1"); + basicConfigQuery.setPage(basicConfigQueryRequest.getPage()); + basicConfigQuery.setLimit(basicConfigQueryRequest.getLimit()); + basicConfigQuery.setKeyword(basicConfigQueryRequest.getKeywords()); + List data = basicConfigService.queryBasicConfig(basicConfigQuery); + + return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /** + * 修改一条基础项配置 + * + * @param basicConfigUpdateRequest + * 修改基础项请求 + * @return 返回结果 + */ + public BaseResponse updateOneBasicConfig(BasicConfigUpdateRequest basicConfigUpdateRequest) { + BasicConfig obj = new BasicConfig(); + obj.setCode(basicConfigUpdateRequest.getCode()); + obj.setName(basicConfigUpdateRequest.getName()); + obj.setId(basicConfigUpdateRequest.getId()); + basicConfigService.updateBasicConfig(obj); + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + } + + /** + * 删除一条基础项配置 + * + * @param id 基础项id + * + * @return 执行结果 + */ + public BaseResponse deleteOneBasicConfig(String id) { + BasicConfig obj = new BasicConfig(); + obj.setId(id); + obj.setYn(YnEnums.NO.getId()); + basicConfigService.updateBasicConfig(obj); + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + } + + /** + * + * 获取树形结构的数据 + * + * @return 树形结构数据 + */ + public List findAllBasicConfigWithTree(){ + List list = new ArrayList(); + List l = basicConfigService.queryParentConfig(); + for (BasicConfig b : l) { + TreeNode node = TreeHelper.recursiveTree(b, basicConfigService); + if (null != node) { + list.add(node); + } + } + return list; + } + + /** + * 批量添加基础数据项 + * + * @param basicConfigRequests + * @return + */ + public BaseResponse batchAddBasicConfig(List basicConfigRequests){ + for (BasicConfigAddRequest ba : basicConfigRequests) { + //转换的时候验证如果为空就跳过添加数据 + BasicConfig basicConfig =ba.convertToBasicConfig(); + if(null!=basicConfig){ + basicConfigService.addBasicConfig(basicConfig); + } + } + return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java new file mode 100644 index 0000000..72970f2 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java @@ -0,0 +1,94 @@ +package com.lyms.platform.operate.web.facade; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.lyms.platform.biz.service.PuerperaService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; +import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest; +import com.lyms.platform.operate.web.result.PuerperaResult; +import com.lyms.platform.pojo.PuerperaModel; +import com.lyms.platform.query.PuerperaModelQuery; + +/** + * 产妇管理门面 + * + * @author Administrator + * + */ +@Component +public class PuerperaManagerFacade { + + @Autowired + private PuerperaService puerperaService; + + /** + * 修改产妇信息 + * + * @param managerUpdateRequest 产妇信息修改请求 + * @return + */ + public BaseResponse updateOnePuerperaData (PuerperaManagerUpdateRequest managerUpdateRequest){ + + puerperaService.updatePuerpera(managerUpdateRequest.convertToPuerpera()); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /** + * 获取符合条件的产妇数据 + * + * @param managerRequest + * @return + */ + public BaseListResponse findPuerperaList(PuerperaManagerQueryRequest managerRequest){ + PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); + puerperaQuery.setLimit(managerRequest.getLimit()); + puerperaQuery.setPage(managerRequest.getPage()); + puerperaQuery.setDueDateEnd(managerRequest.getDueDateEnd()); + puerperaQuery.setDueDateStart(managerRequest.getDueDateStart()); + puerperaQuery.setKeyword(managerRequest.getKeyword()); + puerperaQuery.setCommunityId(managerRequest.getCommunityId()); + puerperaQuery.setVisitstatus(managerRequest.getVisitstatus()); + + // 调用service查询 + + List puerperaList = puerperaService.queryPuerpera(puerperaQuery); + List data = new ArrayList(); + if(CollectionUtils.isNotEmpty(puerperaList)){ + + for(PuerperaModel model:puerperaList){ + PuerperaResult result = new PuerperaResult(); + data.add(result.convertToResult(model)); + } + } + + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(data); + } + + /** + * 删除一条产妇数据 + * + * @param id 产妇id + * + * @param softDel 是否是软删除 true/false + * + * @return 处理结果 + */ + public BaseResponse deleteOnePuerperaById(String id,boolean softDel){ + if(softDel){ + PuerperaModel obj = new PuerperaModel(); + obj.setId(id); + obj.setYn(YnEnums.NO.getId()); + puerperaService.updatePuerpera(obj); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java new file mode 100644 index 0000000..50e380c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -0,0 +1,94 @@ +package com.lyms.platform.operate.web.facade; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.lyms.platform.biz.service.PuerperaService; +import com.lyms.platform.biz.service.VisitService; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.request.VisitAddRequest; +import com.lyms.platform.operate.web.result.SimpleVisit; +import com.lyms.platform.operate.web.result.VisitResult; +import com.lyms.platform.pojo.PuerperaModel; +import com.lyms.platform.pojo.VisitModel; +import com.lyms.platform.query.PuerperaModelQuery; +import com.lyms.platform.query.VisitQuery; + + +/** + * 产后访视门面 + * + * @author Administrator + * + */ +@Component +public class VisitFacade { + @Autowired + private VisitService visitService; + @Autowired + private PuerperaService puerperaService; + + + public BaseObjectResponse findOneByCardNo(String cardNo){ + + PuerperaModelQuery query=new PuerperaModelQuery(); + query.setCardNo(cardNo); + query.setYn(YnEnums.YES.getId()); + //根据身份证号找到产妇信息 + PuerperaModel puerperaModel = puerperaService.findOnePuerperaByCardNo(query); + VisitResult data = new VisitResult(); + if(null!=puerperaModel){ + data.convertToResult(puerperaModel); + VisitQuery visitQuery = new VisitQuery(); + visitQuery.setParentId(puerperaModel.getId()); + List visits=visitService.queryVisit(visitQuery); + List dataList = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(visits)){ + for(VisitModel visit:visits){ + dataList.add(new SimpleVisit().convertToResult(visit)); + } + } + data.setData(dataList); + } + return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + /** + * + * 增加访视记录 + * + * @param visitRequest 访视 + * + * @return 返回结果 + */ + public BaseResponse addOneVisit(VisitAddRequest visitRequest){ + //获取患者id + String parentId=visitRequest.getParentId(); + if(StringUtils.isNotEmpty(parentId)){ + PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); + puerperaQuery.setId(parentId); + PuerperaModel model; + List puerList = puerperaService.queryPuerpera(puerperaQuery); + if(CollectionUtils.isNotEmpty(puerList)){ + model = puerList.get(0); + PuerperaModel destModel = visitRequest.getPuerpera(); + //和数据库里面的对象比较如果不等就表示有修改需存入到数据库中 + if(!destModel.equals(model)){ + puerperaService.updatePuerpera(visitRequest.getPuerpera()); + } + } + + visitService.addVisit(visitRequest.getRequestVisit()); + } + + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java new file mode 100644 index 0000000..44e18f3 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java @@ -0,0 +1,108 @@ +package com.lyms.platform.operate.web.request; + +import java.util.Date; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.result.BaseModel; + +/** + * 新生儿管理请求 + * + * @author Administrator + */ +@Form +public class BabyManagerQueryRequest extends BaseModel { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * 关键字查询 + */ + @FormParam + private String keyword; + + + /** + * 访视状态 + */ + @FormParam + private int visitstatus = -1; + + /** + * 生日开始 + */ + @FormParam + private Date dStart; + + /** + * 生日结束 + */ + @FormParam + private Date dEnd; + + /** + * 页数 + */ + @FormParam + private int page; + + /** + * 行数 + */ + @FormParam + private int limit; + + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public int getVisitstatus() { + return visitstatus; + } + + public void setVisitstatus(int visitstatus) { + this.visitstatus = visitstatus; + } + + public Date getdStart() { + return dStart; + } + + public void setdStart(long dStart) { + this.dStart = new Date(dStart * 1000); + } + + public Date getdEnd() { + return dEnd; + } + + public void setdEnd(long dEnd) { + this.dEnd = new Date(dEnd * 1000); + } + + + 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; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerUpdateRequest.java new file mode 100644 index 0000000..d27b2a6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerUpdateRequest.java @@ -0,0 +1,25 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.core.annotation.form.Form; + +/** + * 新生儿管理修改请求对象 + * + * @author Administrator + * + */ +@Form +public class BabyManagerUpdateRequest { + /** + * 新生儿id + */ + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java new file mode 100644 index 0000000..ce46ec6 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java @@ -0,0 +1,60 @@ +package com.lyms.platform.operate.web.request; + +import org.apache.cxf.common.util.StringUtils; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.pojo.BasicConfig; + +@Form +public class BasicConfigAddRequest { + @FormParam + private String parentId; + + @FormParam + private String name; + + @FormParam + private String code; + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public BasicConfig convertToBasicConfig() { + BasicConfig basicConfig = new BasicConfig(); + if(StringUtils.isEmpty(code)){ + return null; + } + if(StringUtils.isEmpty(name)){ + return null; + } + if(StringUtils.isEmpty(parentId)){ + return null; + } + basicConfig.setCode(code); + basicConfig.setName(name); + basicConfig.setParentId(parentId); + return basicConfig; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java new file mode 100644 index 0000000..51d2d50 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigQueryRequest.java @@ -0,0 +1,42 @@ +package com.lyms.platform.operate.web.request; + +import javax.validation.constraints.Min; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; + +/** + * 基础项查询对象封装 + * + * @author Administrator + * + */ +@Form +public class BasicConfigQueryRequest { + @FormParam + private String keywords; + @Min(value=1,message="page不能小于1.") + @FormParam + private int page; + @Min(value=1,message="limit不能小于1.") + @FormParam + private int limit; + public String getKeywords() { + return keywords; + } + public void setKeywords(String keywords) { + this.keywords = 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; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigRequest.java deleted file mode 100644 index 4d6e8a2..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.lyms.platform.operate.web.request; - -import org.hibernate.validator.constraints.NotEmpty; - -import com.lyms.platform.common.core.annotation.form.Form; -import com.lyms.platform.common.core.annotation.form.FormParam; -import com.lyms.platform.pojo.BasicConfig; - -@Form -public class BasicConfigRequest { - @FormParam - private String parentId; - - @NotEmpty(message = "名称不能为空") - @FormParam - private String name; - - @NotEmpty(message = "简码不能为空") - @FormParam - private String code; - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCode() { - return code; - } - - public void setCode(String code) { - this.code = code; - } - - public BasicConfig convertToBasicConfig() { - BasicConfig basicConfig = new BasicConfig(); - basicConfig.setCode(code); - basicConfig.setName(name); - basicConfig.setParentId(parentId); - return basicConfig; - } -} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java new file mode 100644 index 0000000..5161708 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java @@ -0,0 +1,35 @@ +package com.lyms.platform.operate.web.request; + +import org.hibernate.validator.constraints.NotEmpty; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; + +@Form +public class BasicConfigUpdateRequest { + private String id; + @FormParam + @NotEmpty(message="name不能为空.") + private String name; + @FormParam + @NotEmpty(message="code不能为空.") + private String code; + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java new file mode 100644 index 0000000..c2d2f7c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java @@ -0,0 +1,119 @@ +package com.lyms.platform.operate.web.request; + +import java.util.Date; + +import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.result.BaseModel; + +/** + * 产妇管理请求 + * + * @author Administrator + */ +@Form +public class PuerperaManagerQueryRequest extends BaseModel { + + /** + * + */ + private static final long serialVersionUID = 1L; + + /** + * 关键字查询 + */ + @FormParam + private String keyword; + + /** + * 社区名称 + */ + @FormParam + private String communityId; + + /** + * 访视状态 + */ + @FormParam + private int visitstatus = -1; + + /** + * 分娩日期开始 + */ + @FormParam + private Date dueDateStart; + + /** + * 分娩日期结束 + */ + @FormParam + private Date dueDateEnd; + + /** + * 页数 + */ + @FormParam + private int page; + + /** + * 行数 + */ + @FormParam + private int limit; + + public String getCommunityId() { + return communityId; + } + + public void setCommunityId(String communityId) { + this.communityId = communityId; + } + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + + public int getVisitstatus() { + return visitstatus; + } + + public void setVisitstatus(int visitstatus) { + this.visitstatus = visitstatus; + } + + public Date getDueDateStart() { + return dueDateStart; + } + + public void setDueDateStart(long dueDateStart) { + this.dueDateStart = new Date(dueDateStart * 1000); + } + + public Date getDueDateEnd() { + return dueDateEnd; + } + + public void setDueDateEnd(long dueDateEnd) { + this.dueDateEnd = new Date(dueDateEnd * 1000); + } + + 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; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerRequest.java deleted file mode 100644 index ae98bae..0000000 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerRequest.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.lyms.platform.operate.web.request; - -import java.util.Date; - -import com.lyms.platform.common.core.annotation.form.Form; -import com.lyms.platform.common.core.annotation.form.FormParam; -import com.lyms.platform.common.result.BaseModel; - -/** - * 产妇管理请求 - * - * @author Administrator - */ -@Form -public class PuerperaManagerRequest extends BaseModel { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * 关键字查询 - */ - @FormParam - private String keyword; - - /** - * 社区名称 - */ - @FormParam - private String communityId; - - /** - * 访视状态 - */ - @FormParam - private int visitstatus = -1; - - /** - * 分娩日期开始 - */ - @FormParam - private Date dueDateStart; - - /** - * 分娩日期结束 - */ - @FormParam - private Date dueDateEnd; - - /** - * 页数 - */ - @FormParam - private int page; - - /** - * 行数 - */ - @FormParam - private int limit; - - public String getCommunityId() { - return communityId; - } - - public void setCommunityId(String communityId) { - this.communityId = communityId; - } - - public String getKeyword() { - return keyword; - } - - public void setKeyword(String keyword) { - this.keyword = keyword; - } - - public int getVisitstatus() { - return visitstatus; - } - - public void setVisitstatus(int visitstatus) { - this.visitstatus = visitstatus; - } - - public Date getDueDateStart() { - return dueDateStart; - } - - public void setDueDateStart(long dueDateStart) { - this.dueDateStart = new Date(dueDateStart * 1000); - } - - public Date getDueDateEnd() { - return dueDateEnd; - } - - public void setDueDateEnd(long dueDateEnd) { - this.dueDateEnd = new Date(dueDateEnd * 1000); - } - - 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; - } -} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java new file mode 100644 index 0000000..e7e9455 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerUpdateRequest.java @@ -0,0 +1,366 @@ +package com.lyms.platform.operate.web.request; + +import java.util.Map; + +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.PuerperaModel; + +/** + * 产妇管理修改接口 + * + * @author Administrator + */ +@SuppressWarnings("rawtypes") +public class PuerperaManagerUpdateRequest { + + // 产妇信息字段 start + /** + * 产妇id + */ + private String id; + + private String name; + + private int age; + + private String cardNo; + + private String dueDate; + + private String dueType; + + private String deliverOrg; + + + private Map address; + + // 产妇信息字段 end + + // 访视记录字段 start + + /** + * 访视记录的id + */ + private String visitId; + + /** + * 活产数 + */ + private String numOfLive; + + /** + * 住院分娩 + */ + private int due; + + /** + * 心法接生 + */ + private int xinType; + + /** + * 乳房 + */ + private String breast; + + /** + * 检查时间 + */ + private String checktime; + + /** + * 分娩后的天数 + */ + private String days; + + /** + * 医生签名 + */ + + private String doctorsign; + + /** + * 健康情况 + */ + private String health; + + /** + * 恶露 + */ + private String lochia; + + /** + * 子宫 + */ + private String matrix; + + /** + * 心理状态 + */ + private String mentality; + + /** + * 下次访问时间 + */ + private String nextvisit; + + /** + * 其他 + */ + private String other; + + /** + * 指导 + */ + private Map guide; + + /** + * 血压 + */ + // private Bp bp; + private Map bp; + + /** + * 转诊 + */ + // private Referral referral; + private Map referral; + + /** + * 类型 + */ + private String type; + + /** + * 伤口 + */ + private String wound; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public String getDueType() { + return dueType; + } + + public void setDueType(String dueType) { + this.dueType = dueType; + } + + public String getDeliverOrg() { + return deliverOrg; + } + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + + public Map getAddress() { + return address; + } + + public void setAddress(Map address) { + this.address = address; + } + + public String getVisitId() { + return visitId; + } + + public void setVisitId(String visitId) { + this.visitId = visitId; + } + + public String getNumOfLive() { + return numOfLive; + } + + public void setNumOfLive(String numOfLive) { + this.numOfLive = numOfLive; + } + + public int getDue() { + return due; + } + + public void setDue(int due) { + this.due = due; + } + + public int getXinType() { + return xinType; + } + + public void setXinType(int xinType) { + this.xinType = xinType; + } + + public String getBreast() { + return breast; + } + + public void setBreast(String breast) { + this.breast = breast; + } + + public String getChecktime() { + return checktime; + } + + public void setChecktime(String checktime) { + this.checktime = checktime; + } + + public String getDays() { + return days; + } + + public void setDays(String days) { + this.days = days; + } + + public String getDoctorsign() { + return doctorsign; + } + + public void setDoctorsign(String doctorsign) { + this.doctorsign = doctorsign; + } + + public String getHealth() { + return health; + } + + public void setHealth(String health) { + this.health = health; + } + + public String getLochia() { + return lochia; + } + + public void setLochia(String lochia) { + this.lochia = lochia; + } + + public String getMatrix() { + return matrix; + } + + public void setMatrix(String matrix) { + this.matrix = matrix; + } + + public String getMentality() { + return mentality; + } + + public void setMentality(String mentality) { + this.mentality = mentality; + } + + public String getNextvisit() { + return nextvisit; + } + + public void setNextvisit(String nextvisit) { + this.nextvisit = nextvisit; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public Map getGuide() { + return guide; + } + + public void setGuide(Map guide) { + this.guide = guide; + } + + public Map getBp() { + return bp; + } + + public void setBp(Map bp) { + this.bp = bp; + } + + public Map getReferral() { + return referral; + } + + public void setReferral(Map referral) { + this.referral = referral; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getWound() { + return wound; + } + + public void setWound(String wound) { + this.wound = wound; + } + public PuerperaModel convertToPuerpera(){ + PuerperaModel model = new PuerperaModel(); + model.setAge(age); + model.setCardNo(cardNo); + model.setDeliverOrg(deliverOrg); + model.setDueType(dueType); + model.setName(name); + model.setDueDate(DateUtil.parseYMD(dueDate)); + model.setAddress(JsonUtil.obj2JsonString(address)); + return model; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java new file mode 100644 index 0000000..36d9c86 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java @@ -0,0 +1,415 @@ +package com.lyms.platform.operate.web.request; + +import java.util.Date; +import java.util.Map; + +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.PuerperaModel; +import com.lyms.platform.pojo.VisitModel; + +/** + * 访视记录请求 + * + * @author Administrator + */ +@SuppressWarnings("rawtypes") +public class VisitAddRequest { + + // 产妇基本信息 start + /** + * 产妇id + */ + private String parentId; + + /** + * 产妇名称 + */ + private String name; + + /** + * 产妇年龄 + */ + private int age; + + /** + * 产妇身份证号码 + */ + private String cardNo; + + /** + * 分娩日期 + */ + private String dueDate; + + /** + * 分娩类型 + */ + private String dueType; + + /** + * 助产机构 + */ + private String deliverOrg; + + /** + * 地址 + */ + private Map address; + + // 产妇基本信息 end + /** + * 访视记录id + */ + private String id; + + /** + * 活产数 + */ + private String numOfLive; + + /** + * 住院分娩 + */ + private int due; + + /** + * 心法接生 + */ + private int xinType; + + /** + * 乳房 + */ + private String breast; + + /** + * 检查时间 + */ + private String checktime; + + /** + * 分娩后的天数 + */ + private String days; + + /** + * 医生签名 + */ + + private String doctorsign; + + /** + * 健康情况 + */ + private String health; + + /** + * 恶露 + */ + private String lochia; + + /** + * 子宫 + */ + private String matrix; + + /** + * 心理状态 + */ + private String mentality; + + /** + * 下次访问时间 + */ + private String nextvisit; + + /** + * 其他 + */ + private String other; + + /** + * 指导 + */ + private Map guide; + + /** + * 血压 + */ + // private Bp bp; + private Map bp; + + /** + * 转诊 + */ + // private Referral referral; + private Map referral; + + /** + * 类型 + */ + private String type; + + /** + * 伤口 + */ + private String wound; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + public String getDueType() { + return dueType; + } + + public void setDueType(String dueType) { + this.dueType = dueType; + } + + public String getDeliverOrg() { + return deliverOrg; + } + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + + public Map getAddress() { + return address; + } + + public void setAddress(Map address) { + this.address = address; + } + + public String getNumOfLive() { + return numOfLive; + } + + public void setNumOfLive(String numOfLive) { + this.numOfLive = numOfLive; + } + + public int getDue() { + return due; + } + + public void setDue(int due) { + this.due = due; + } + + public int getXinType() { + return xinType; + } + + public void setXinType(int xinType) { + this.xinType = xinType; + } + + public String getBreast() { + return breast; + } + + public void setBreast(String breast) { + this.breast = breast; + } + + public String getChecktime() { + return checktime; + } + + public void setChecktime(String checktime) { + this.checktime = checktime; + } + + public String getDays() { + return days; + } + + public void setDays(String days) { + this.days = days; + } + + public String getDoctorsign() { + return doctorsign; + } + + public void setDoctorsign(String doctorsign) { + this.doctorsign = doctorsign; + } + + public String getHealth() { + return health; + } + + public void setHealth(String health) { + this.health = health; + } + + public String getLochia() { + return lochia; + } + + public void setLochia(String lochia) { + this.lochia = lochia; + } + + public String getMatrix() { + return matrix; + } + + public void setMatrix(String matrix) { + this.matrix = matrix; + } + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getMentality() { + return mentality; + } + + public void setMentality(String mentality) { + this.mentality = mentality; + } + + public String getNextvisit() { + return nextvisit; + } + + public void setNextvisit(String nextvisit) { + this.nextvisit = nextvisit; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public Map getGuide() { + return guide; + } + + public void setGuide(Map guide) { + this.guide = guide; + } + + public Map getBp() { + return bp; + } + + public void setBp(Map bp) { + this.bp = bp; + } + + public Map getReferral() { + return referral; + } + + public void setReferral(Map referral) { + this.referral = referral; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getWound() { + return wound; + } + + public void setWound(String wound) { + this.wound = wound; + } + + public PuerperaModel getPuerpera() { + PuerperaModel puerperaModel = new PuerperaModel(); + + puerperaModel.setId(parentId); + puerperaModel.setName(name); + puerperaModel.setAge(age); + puerperaModel.setCardNo(cardNo); + puerperaModel.setDueDate(new Date()); + puerperaModel.setDeliverOrg(deliverOrg); + puerperaModel.setDueType(dueType); + puerperaModel.setAddress(JsonUtil.obj2JsonString(address)); + return puerperaModel; + } + + public VisitModel getRequestVisit(){ + VisitModel visit = new VisitModel(); + try { + visit.setBp(JsonUtil.obj2JsonString(bp)); + visit.setGuide(JsonUtil.obj2JsonString(guide)); + visit.setReferral(JsonUtil.obj2JsonString(referral)); + } catch (Exception e) { + } + + visit.setBreast(breast); + visit.setChecktime(checktime); + visit.setDays(days); + visit.setDoctorsign(doctorsign); + visit.setDue(due); + visit.setHealth(health); + visit.setLochia(lochia); + visit.setMatrix(matrix); + visit.setMentality(mentality); + visit.setNextvisit(nextvisit); + visit.setNumOfLive(numOfLive); + visit.setOther(other); + visit.setType(type); + visit.setWound(wound); + visit.setXinType(xinType); + visit.setParentId(parentId); + return visit; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java new file mode 100644 index 0000000..58774f2 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyResult.java @@ -0,0 +1,97 @@ +package com.lyms.platform.operate.web.result; + +import com.lyms.platform.common.enums.SexTypeEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.BabyModel; + + +/** + * + * 新生儿返回对象 + * + * @author Administrator + * + */ +public class BabyResult { + private String id; + private String parentId; + private String name; + private String sex; + private String birth; + private String motherName; + private String motherPhone; + private String address; + private String community; + + private String visit; + + public String getVisit() { + return visit; + } + public void setVisit(String visit) { + this.visit = visit; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getSex() { + return sex; + } + public void setSex(String sex) { + this.sex = sex; + } + public String getBirth() { + return birth; + } + public void setBirth(String birth) { + this.birth = birth; + } + public String getMotherName() { + return motherName; + } + public void setMotherName(String motherName) { + this.motherName = motherName; + } + public String getMotherPhone() { + return motherPhone; + } + public void setMotherPhone(String motherPhone) { + this.motherPhone = motherPhone; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getCommunity() { + return community; + } + public void setCommunity(String community) { + this.community = community; + } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getParentId() { + return parentId; + } + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public BabyResult convertToResult(BabyModel baby){ + setBirth(DateUtil.getyyyy_MM_dd(baby.getBirth())); + setId(baby.getId()); + setName(baby.getName()); + setVisit(baby.getVisitstatus()==-1?"未访视":"已访视"); + setSex(SexTypeEnums.getTitleById(baby.getSex())); + return this; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java new file mode 100644 index 0000000..c9656e2 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PuerperaResult.java @@ -0,0 +1,82 @@ +package com.lyms.platform.operate.web.result; + +import org.apache.commons.lang.StringUtils; + +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.pojo.PuerperaModel; + +/** + * 产妇管理结果 + * + * @author Administrator + * + */ +public class PuerperaResult { + private String id; + private String name; + private int age; + private String dueDate; + private String address; + private String community; + private String visit; + private String phone; + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public int getAge() { + return age; + } + public void setAge(int age) { + this.age = age; + } + public String getDueDate() { + return dueDate; + } + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + public String getAddress() { + return address; + } + public void setAddress(String address) { + this.address = address; + } + public String getCommunity() { + return community; + } + public void setCommunity(String community) { + this.community = community; + } + public String getVisit() { + return visit; + } + public void setVisit(String visit) { + this.visit = visit; + } + + public String getPhone() { + return phone; + } + public void setPhone(String phone) { + this.phone = phone; + } + public PuerperaResult convertToResult(PuerperaModel model){ + setAddress(model.getAddress()); + setId(model.getId()); + setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); + setVisit(model.getIsVisit()==0 ?"未访视":"已访视"); + setCommunity(StringUtils.isEmpty(model.getCommunityId())?"未分配":model.getCommunityId()); + setPhone(model.getPhone()); + setAge(model.getAge()); + return this; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimpleVisit.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimpleVisit.java new file mode 100644 index 0000000..da9bd50 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimpleVisit.java @@ -0,0 +1,351 @@ +package com.lyms.platform.operate.web.result; + +import java.util.Map; + +import org.apache.commons.lang.StringUtils; + +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.VisitModel; +@SuppressWarnings("rawtypes") +public class SimpleVisit { + + private static final String UNKNOWN = "未见异常"; + + private String id; + + /** + * 活产数 + */ + private String numOfLive; + + /** + * 住院分娩 + */ + private int due; + + /** + * 心法接生 + */ + private int xinType; + + /** + * 乳房 + */ + private String breast; + + /** + * 检查时间 + */ + private String checktime; + + /** + * 分娩后的天数 + */ + private String days; + + /** + * 医生签名 + */ + + private String doctorsign; + + /** + * 健康情况 + */ + private String health; + + /** + * 恶露 + */ + private String lochia; + + /** + * 子宫 + */ + private String matrix; + + /** + * 心理状态 + */ + private String mentality; + + /** + * 下次访问时间 + */ + private String nextvisit; + + /** + * 其他 + */ + private String other; + + /** + * 指导 + */ + private Map guide; + + /** + * 血压 + */ +// private Bp bp; + private Map bp; + + /** + * 转诊 + */ +// private Referral referral; + private Map referral; + + /** + * 类型 + */ + private String type; + + /** + * 伤口 + */ + private String wound; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getNumOfLive() { + return numOfLive; + } + + public void setNumOfLive(String numOfLive) { + this.numOfLive = numOfLive; + } + + public int getDue() { + return due; + } + + public void setDue(int due) { + this.due = due; + } + + public int getXinType() { + return xinType; + } + + public void setXinType(int xinType) { + this.xinType = xinType; + } + + public String getBreast() { + return breast; + } + + public void setBreast(String breast) { + this.breast = breast; + } + + public String getChecktime() { + return checktime; + } + + public void setChecktime(String checktime) { + this.checktime = checktime; + } + + public String getDays() { + return days; + } + + public void setDays(String days) { + this.days = days; + } + + public String getDoctorsign() { + return doctorsign; + } + + public void setDoctorsign(String doctorsign) { + this.doctorsign = doctorsign; + } + + public String getHealth() { + return health; + } + + public void setHealth(String health) { + this.health = health; + } + + public String getLochia() { + return lochia; + } + + public void setLochia(String lochia) { + this.lochia = lochia; + } + + public String getMatrix() { + return matrix; + } + + public void setMatrix(String matrix) { + this.matrix = matrix; + } + + public String getMentality() { + return mentality; + } + + public void setMentality(String mentality) { + this.mentality = mentality; + } + + public String getNextvisit() { + return nextvisit; + } + + public void setNextvisit(String nextvisit) { + this.nextvisit = nextvisit; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public Map getGuide() { + return guide; + } + + public void setGuide(Map guide) { + this.guide = guide; + } + + /* public Bp getBp() { + return bp; + } + + public void setBp(Bp bp) { + this.bp = bp; + }*/ + + /* public Referral getReferral() { + return referral; + }*/ + + public Map getBp() { + return bp; + } + + public void setBp(Map bp) { + this.bp = bp; + } + + public void setReferral(Map referral) { + this.referral = referral; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getWound() { + return wound; + } + + public void setWound(String wound) { + this.wound = wound; + } + + + public Map getReferral() { + return referral; + } + + public SimpleVisit convertToResult(VisitModel model) { + try { + setBp(JsonUtil.str2Obj(model.getBp(), Map.class)); + setGuide(JsonUtil.str2Obj(model.getGuide(),Map.class)); + setReferral(JsonUtil.str2Obj(model.getReferral(),Map.class)); + } catch (Exception e) { + } + + setBreast(model.getBreast()); + setChecktime(model.getChecktime()); + setDays(model.getDays()); + setDoctorsign(model.getDoctorsign()); + + setDue(model.getDue()); + setHealth(StringUtils.isEmpty(model.getHealth()) ? UNKNOWN : model.getHealth()); + setId(model.getId()); + setLochia(model.getLochia()); + setMatrix(model.getMatrix()); + setNumOfLive(model.getNumOfLive()); + + return this; + } + class Bp { + private String h; + private String l; + + public Bp(String h,String l){ + this.h=h; + this.l=l; + } + public Bp(){ + } + public String getH() { + return h; + } + public void setH(String h) { + this.h = h; + } + public String getL() { + return l; + } + public void setL(String l) { + this.l = l; + } + } + + class Referral{ + private int check; + private String dept; + private String org; + private String reason; + public int getCheck() { + return check; + } + public void setCheck(int check) { + this.check = check; + } + public String getDept() { + return dept; + } + public void setDept(String dept) { + this.dept = dept; + } + public String getOrg() { + return org; + } + public void setOrg(String org) { + this.org = org; + } + public String getReason() { + return reason; + } + public void setReason(String reason) { + this.reason = reason; + } + + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java new file mode 100644 index 0000000..a8996f4 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java @@ -0,0 +1,114 @@ +package com.lyms.platform.operate.web.result; + +import java.util.List; +import java.util.Map; + +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.PuerperaModel; +@SuppressWarnings("rawtypes") +public class VisitResult { + private String name; + + private int age; + private String cardNo; + private String dueDate; + private String dueType; + private String deliverOrg; + + private Map address; + + private List data; + + + public String getName() { + return name; + } + + + public void setName(String name) { + this.name = name; + } + + + public int getAge() { + return age; + } + + + public void setAge(int age) { + this.age = age; + } + + + public String getCardNo() { + return cardNo; + } + + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + + public String getDueDate() { + return dueDate; + } + + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + + + public String getDueType() { + return dueType; + } + + + public void setDueType(String dueType) { + this.dueType = dueType; + } + + + public String getDeliverOrg() { + return deliverOrg; + } + + + public void setDeliverOrg(String deliverOrg) { + this.deliverOrg = deliverOrg; + } + + + public Map getAddress() { + return address; + } + + + public void setAddress(Map address) { + this.address = address; + } + + + public List getData() { + return data; + } + + + public void setData(List data) { + this.data = data; + } + + public void convertToResult(PuerperaModel model){ + try { + setAddress(JsonUtil.str2Obj(model.getAddress(), Map.class)); + } catch (Exception e) { + } + setAge(model.getAge()); + setCardNo(model.getCardNo()); + setDeliverOrg(model.getDeliverOrg()); + setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); + setDueType(model.getDueType()); + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java index e0d12d2..1d5daab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/TreeHelper.java @@ -22,7 +22,7 @@ public class TreeHelper { * @return 节点 */ public static TreeNode recursiveTree(BasicConfig b, BasicConfigService basicConfigService) { - TreeNode node = converToNode(b); + TreeNode node = convertToNode(b); List l2 = basicConfigService.queryByParentId(b.getId()); for (BasicConfig b1 : l2) { TreeNode node1 = recursiveTree(b1, basicConfigService); @@ -39,7 +39,7 @@ public class TreeHelper { * @param c * @return */ - private static TreeNode converToNode(BasicConfig c) { + private static TreeNode convertToNode(BasicConfig c) { TreeNode node = new TreeNode(); node.setCid(c.getId()); node.setCname(c.getName()); diff --git a/platform-operate-api/src/main/resources/spring/applicationContext.xml b/platform-operate-api/src/main/resources/spring/applicationContext.xml index b84b2b9..5fccd37 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext.xml @@ -16,7 +16,7 @@ - + \ No newline at end of file -- 1.8.3.1