From 0db77de8e6cb430e171aad924c28c89f9104101c Mon Sep 17 00:00:00 2001 From: wtt Date: Fri, 9 Apr 2021 11:57:13 +0800 Subject: [PATCH] update --- .../biz/service/EmotionalMiniTestService.java | 71 +++++++ .../java/com/lyms/platform/beans/SerialIdEnum.java | 1 + .../lyms/platform/pojo/EmotionalMiniTestModel.java | 191 ++++++++++++++++++ .../platform/query/EmotionalMiniTestQuery.java | 207 ++++++++++++++++++++ .../controller/EmotionalMiniTestController.java | 115 +++++++++++ .../operate/web/facade/AntExRecordFacade.java | 1 + .../web/facade/EmotionalMiniTestFacade.java | 178 +++++++++++++++++ .../web/request/EmotionalMiniTestRequest.java | 184 ++++++++++++++++++ .../web/result/EmotionalMiniTestResult.java | 214 +++++++++++++++++++++ 9 files changed, 1162 insertions(+) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmotionalMiniTestService.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/EmotionalMiniTestModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/EmotionalMiniTestQuery.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmotionalMiniTestController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/EmotionalMiniTestFacade.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EmotionalMiniTestRequest.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EmotionalMiniTestResult.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmotionalMiniTestService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmotionalMiniTestService.java new file mode 100644 index 0000000..74daa59 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/EmotionalMiniTestService.java @@ -0,0 +1,71 @@ +package com.lyms.platform.biz.service; + +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.enums.YnEnums; +import com.lyms.platform.pojo.EmotionalMiniTestModel; +import com.lyms.platform.query.EmotionalMiniTestQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 逻辑 + * + * 由于是基本增删改查功能直接使用BaseMongoDAOImpl接口 + * @Author: 武涛涛 + */ +@Service("emotionalMiniTestService") +public class EmotionalMiniTestService extends BaseMongoDAOImpl { + + public EmotionalMiniTestModel add(EmotionalMiniTestModel model) { + return save(model); + } + + public void update(EmotionalMiniTestModel model, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), model); + } + + public void deleteById(String id) { + EmotionalMiniTestModel obj = new EmotionalMiniTestModel(); + obj.setYn(YnEnums.NO.getId()); + obj.setId(id); + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj); + } + public List queryOne(EmotionalMiniTestQuery babyQuery) { + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild((int)count(babyQuery.convertToQuery().convertToMongoQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + query.addOrder(Sort.Direction.ASC, babyQuery.getSort()); + return find(query.convertToMongoQuery()); + } + + public List queryAll(EmotionalMiniTestQuery babyQuery) { + MongoQuery query = babyQuery.convertToQuery(); + if (StringUtils.isNotEmpty(babyQuery.getNeed())) { + babyQuery.mysqlBuild((int)count(babyQuery.convertToQuery().convertToMongoQuery())); + query.start(babyQuery.getOffset()).end(babyQuery.getLimit()); + } + query.addOrder(Sort.Direction.DESC, babyQuery.getSort());// Sort "createDate" + return find(query.convertToMongoQuery()); + } + + + public EmotionalMiniTestModel queryById(String id) { + EmotionalMiniTestQuery emotionalMiniTestQuery = new EmotionalMiniTestQuery(); + emotionalMiniTestQuery.setId(id); + MongoQuery query = emotionalMiniTestQuery.convertToQuery(); + return findOne(query.convertToMongoQuery()); + } + + + + + +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index 700b1a2..83a81f6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -27,6 +27,7 @@ public enum SerialIdEnum { FamilyPlanningModel("FamilyPlanningModel", 8090991974395394537L), BabyFirstCheckModel("BabyHighRiskBabyModel", -6200631186554568668L), BabyStuntingModel("BabyStuntingModel", 6185807286762682531L), + EmotionalMiniTestModel("EmotionalMiniTestModel", -8467545877185359482L), BabyModel("BabyModel", 97531000080L), BabyRecordModel("BabyModel", 97531050080L), Records("records", 97531000081L), diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/EmotionalMiniTestModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/EmotionalMiniTestModel.java new file mode 100644 index 0000000..f2df40d --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/EmotionalMiniTestModel.java @@ -0,0 +1,191 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 实体类 + * @Author: 武涛涛 + */ +@Document(collection = "lyms_emotional_mini_test") +public class EmotionalMiniTestModel extends BaseModel { + private static final long serialVersionUID = SerialIdEnum.EmotionalMiniTestModel.getCid(); + + private String id; + private Integer yn; + //档案id + private String patientId; + private String pid; + //患者姓名 + private String username; + //手机 + private String phone; + //身份证号 + private String cardNo; + //年龄 + private Integer age; + //登记时间 + private Date createDate; + private Date modifyDate; + //机构 + private String hospitalId; + private String hospitalName; + private List testQuestionsList; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public Date getModifyDate() { + return modifyDate; + } + + public void setModifyDate(Date modifyDate) { + this.modifyDate = modifyDate; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public List getTestQuestionsList() { + return testQuestionsList; + } + + public void setTestQuestionsList(List testQuestionsList) { + this.testQuestionsList = testQuestionsList; + } + + + public static class TestQuestions implements Serializable { + + private static final long serialVersionUID = -6747362940632598075L; + //1. 我能笑的起来和看到事物有趣的一面：2.我看待事物的乐趣： + private String title; + + // A.像以前一样多 B.不那么多 C.肯定没那么多 D.根本没有了 + private String project; + + //0 A.像以前一样多, 0分 + private String fraction; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getFraction() { + return fraction; + } + + public void setFraction(String fraction) { + this.fraction = fraction; + } + } + + + +} + + + + + + + diff --git a/platform-dal/src/main/java/com/lyms/platform/query/EmotionalMiniTestQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/EmotionalMiniTestQuery.java new file mode 100644 index 0000000..4639274 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/EmotionalMiniTestQuery.java @@ -0,0 +1,207 @@ +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; +import com.lyms.platform.common.utils.StringUtils; +import org.springframework.data.mongodb.core.query.Criteria; + +import java.util.Date; + +/** + * 发育迟缓专科检查 查询模型 + * + * @author Administrator + */ +public class EmotionalMiniTestQuery extends BaseQuery implements IConvertToNativeQuery { + + private String id; + private Integer yn; + //档案id + private String patientId; + private String pid; + //患者姓名 + private String username; + //手机 + private String phone; + //身份证号 + private String cardNo; + + private String queryNo; + + private String hospitalId; + //登记时间 + private Date createDateStart; + private Date createDateEnd; + + private String sort; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Date getCreateDateStart() { + return createDateStart; + } + + public void setCreateDateStart(Date createDateStart) { + this.createDateStart = createDateStart; + } + + public Date getCreateDateEnd() { + return createDateEnd; + } + + public void setCreateDateEnd(Date createDateEnd) { + this.createDateEnd = createDateEnd; + } + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + + @Override + public String getSort() { + return sort; + } + + @Override + public void setSort(String sort) { + this.sort = sort; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if (StringUtils.isNotEmpty(id)) { + + condition = condition.and("id", id, MongoOper.IS); + } + if (null != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + if (StringUtils.isNotEmpty(patientId)) { + condition = condition.and("patientId", patientId, MongoOper.IS); + } + if (StringUtils.isNotEmpty(pid)) { + condition = condition.and("pid", pid, MongoOper.IS); + } + if (StringUtils.isNotEmpty(username)) { + condition = condition.and("username", username, MongoOper.IS); + } + if (StringUtils.isNotEmpty(phone)) { + condition = condition.and("phone", phone, MongoOper.IS); + } + if (StringUtils.isNotEmpty(cardNo)) { + condition = condition.and("cardNo", cardNo, MongoOper.IS); + } + if (StringUtils.isNotEmpty(hospitalId)) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + + Criteria c = null; + // 预约检查时间 + if (null != createDateStart) { + if (null != c) { + c = c.and("createDate").gte(createDateStart); + } else { + c = Criteria.where("createDate").gte(createDateStart); + } + } + if (null != createDateEnd) { + if (null != c) { + c = c.lte(createDateEnd); + } else { + c = Criteria.where("createDate").lte(createDateEnd); + } + } + + // 查询号 + if (StringUtils.isNotEmpty(queryNo)) { + MongoCondition c1 = MongoCondition.newInstance(); + MongoCondition con1 = MongoCondition.newInstance("username", queryNo, MongoOper.LIKE); + MongoCondition con2 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); + MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); + if (c != null) { + c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); + condition.andCondition(c1); + } else { + c = c1.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); + } + } + if (c != null) { + return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery(); + } + + return condition.toMongoQuery(); + } + + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmotionalMiniTestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmotionalMiniTestController.java new file mode 100644 index 0000000..140b9f0 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EmotionalMiniTestController.java @@ -0,0 +1,115 @@ +package com.lyms.platform.operate.web.controller; + + +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.facade.EmotionalMiniTestFacade; +import com.lyms.platform.operate.web.request.EmotionalMiniTestRequest; +import com.lyms.platform.query.EmotionalMiniTestQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.validation.Valid; + + +/** + *情绪小测试 控制 + */ +@Controller +@RequestMapping("/emotionalMiniTest") +public class EmotionalMiniTestController extends BaseController { + + @Autowired + private EmotionalMiniTestFacade emotionalMiniTestFacade; + + + /** + * 添加或者修改 + * + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "/addOrUp") + @ResponseBody + public BaseResponse addOrUp(@Valid @RequestBody EmotionalMiniTestRequest request) { + BaseResponse baseResponse = emotionalMiniTestFacade.addOrUp(request); + return baseResponse; + } + + /** + * 查看 显示 + * + * @param id + * @return + */ + @RequestMapping(value = "/queryByIdShow/{id}", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryByIdShow(@PathVariable("id") String id) { + return emotionalMiniTestFacade.queryByIdShow(id); + } + + /** + * 查询全部所有 记录 + * + * @param + */ + @RequestMapping(value = "/queryAll", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryAll(EmotionalMiniTestQuery emotionalMiniTestQuery, HttpServletRequest request) { + return emotionalMiniTestFacade.queryAll(emotionalMiniTestQuery,getUserId(request)); + } + + /** + * 删除 + * + * @param id + * @return + + @RequestMapping(value = "/deleteById/{id}", method = RequestMethod.DELETE) + @ResponseBody + @TokenRequired + public BaseResponse deleteById(@PathVariable("id") String id, HttpServletRequest request) { + babyStuntingFacade.deleteById(id, getUserId(request)); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } */ + + + + + + /** + *编辑 显示 + * + * @param id + * @return + @RequestMapping(value = "/queryByIdEdit/{id}", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryByIdEdit(@PathVariable("id") String id) { + return babyStuntingFacade.queryByIdEdit(id); + + } + */ + + /** + * 查询单人所有 历史记录 + * buildId + * @param + + @RequestMapping(value = "/queryOne", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryOne(BabyStuntingQuery babyStuntingQuery, HttpServletRequest request) { + return babyStuntingFacade.queryOne(babyStuntingQuery,getUserId(request)); + } + */ + + + + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 1e9fbb0..9d2b020 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -1497,6 +1497,7 @@ public class AntExRecordFacade { } } catch (Exception e) { ExceptionUtils.catchException(e, "antexrecord findList get result future error."); + return null; } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/EmotionalMiniTestFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/EmotionalMiniTestFacade.java new file mode 100644 index 0000000..85b34f4 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/EmotionalMiniTestFacade.java @@ -0,0 +1,178 @@ +package com.lyms.platform.operate.web.facade; + +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.biz.service.EmotionalMiniTestService; +import com.lyms.platform.biz.service.YunBookbuildingService; +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.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.request.EmotionalMiniTestRequest; +import com.lyms.platform.operate.web.result.EmotionalMiniTestResult; +import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.EmotionalMiniTestModel; +import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.EmotionalMiniTestQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * 逻辑处理 + * + * @Author: 武涛涛 + */ +@Component +public class EmotionalMiniTestFacade extends BaseServiceImpl { + + @Autowired + private EmotionalMiniTestService emotionalMiniTestService; + @Autowired + private AutoMatchFacade autoMatchFacade; + @Autowired + private OperateLogFacade operateLogFacade; + @Autowired + private OrganizationService organizationService; + @Autowired + private BasicConfigService basicConfigService; + @Autowired + private UsersService usersService; + @Autowired + private MongoTemplate mongoTemplate; + + @Autowired + private YunBookbuildingService yunBookbuildingService; + + /** + * 构造保存对象 + * + * @param request + * @return + */ + private EmotionalMiniTestModel getEmotionalMiniTestModel(EmotionalMiniTestRequest request) { + EmotionalMiniTestModel model = new EmotionalMiniTestModel(); + if (request != null && StringUtils.isNotEmpty(request.getPatientId())) { + Patients patients = yunBookbuildingService.findOneById(request.getPatientId()); + if (patients != null) { + model.setPatientId(patients.getId()); + model.setPid(patients.getPid()); + model.setCardNo(patients.getCardNo()); + model.setPhone(patients.getPhone()); + + } + } + model.setUsername(request.getUsername()); + model.setAge(request.getAge()); + model.setModifyDate(new Date()); + List testQuestionsLists = new ArrayList <>(); + for (EmotionalMiniTestRequest.TestQuestions testQuestions : request.getTestQuestionsList()) { + testQuestionsLists.add(testQuestions.convertToDataModel()); + } + model.setTestQuestionsList(testQuestionsLists); + return model; + + } + + + /** + * 新增或更新 + * + * @param request + * @Author: 武涛涛 + */ + public BaseResponse addOrUp(EmotionalMiniTestRequest request) { + + EmotionalMiniTestModel model = getEmotionalMiniTestModel(request); + if (StringUtils.isNotEmpty(request.getId())) { + EmotionalMiniTestModel models = emotionalMiniTestService.queryById(request.getId()); + if (models != null && models.getId() != null) { + emotionalMiniTestService.update(model, request.getId()); + } + } else {//add + model.setCreateDate(new Date()); + model.setYn(YnEnums.YES.getId()); + /*if (StringUtils.isNotEmpty(request.getHospitalName())) { + OrganizationQuery query = new OrganizationQuery(); + query.setYn(YnEnums.YES.getId()); + query.setName(request.getHospitalName()); + List list = organizationService.queryOrganization(query); + }*/ + model.setHospitalId(request.getHospitalId()); + model.setHospitalName(request.getHospitalName()); + model = emotionalMiniTestService.add(model); + } + + BaseObjectResponse br = new BaseObjectResponse(); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + br.setData(model.getId()); + return br; + } + + + /** + * 根据专病id ,查看显示 + * + * @Author: 武涛涛 + */ + public BaseObjectResponse queryByIdShow(String id) { + BaseObjectResponse br = new BaseObjectResponse(); + + if (StringUtils.isNotEmpty(id)) { + EmotionalMiniTestModel emotionalMiniTestModel = emotionalMiniTestService.queryById(id); + EmotionalMiniTestResult emotionalMiniTestResult = new EmotionalMiniTestResult(); + br.setData(emotionalMiniTestResult.convertToResult(emotionalMiniTestModel)); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + } + return br; + } + + /** + * 查询全部所有 记录 + * @param userId + * @Author: 武涛涛 + */ + public BaseObjectResponse queryAll(EmotionalMiniTestQuery query, Integer userId) { + + BaseObjectResponse br = new BaseObjectResponse(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + List emotionalMiniTestResultList = new ArrayList <>(); + //单人多条专病记录 + List miniTestModels = new ArrayList <>(); + if (StringUtils.isEmpty(query.getPatientId())) { + query.setNeed("true"); + query.setYn(YnEnums.YES.getId()); + query.setHospitalId(hospitalId); + query.setSort("createDate"); + if (query.getCreateDateEnd() != null) { + query.setCreateDateEnd(DateUtil.getDayLastSecond(query.getCreateDateEnd())); + } + miniTestModels = emotionalMiniTestService.queryAll(query); + System.out.println(query.convertToQuery().convertToMongoQuery()); + } + for (int i = 0; i < miniTestModels.size(); i++) { + EmotionalMiniTestModel miniTestModel = miniTestModels.get(i); + EmotionalMiniTestResult miniTestResult = new EmotionalMiniTestResult(); + if (miniTestModel != null) { + emotionalMiniTestResultList.add(miniTestResult.convertToResult(miniTestModel)); + } + } + br.setData(emotionalMiniTestResultList); + br.setPageInfo(query.getPageInfo()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + + } + + +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EmotionalMiniTestRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EmotionalMiniTestRequest.java new file mode 100644 index 0000000..6d2342c --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/EmotionalMiniTestRequest.java @@ -0,0 +1,184 @@ +package com.lyms.platform.operate.web.request; + +import com.lyms.platform.common.base.IBasicRequestConvert; +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.pojo.EmotionalMiniTestModel; +import org.hibernate.validator.constraints.NotEmpty; + +import java.util.List; + +/** + 入参类 + * + * 时间是字符串类型 + * @Author: 武涛涛 + */ +public class EmotionalMiniTestRequest { + + private String id; + //档案id + @FormParam + @NotEmpty(message = "建档ID不能为空.") + private String patientId; + private String pid; + //患者姓名 + private String username; + //手机 + private String phone; + //身份证号 + private String cardNo; + //年龄 + private Integer age; + //登记时间 + private String createDate; + private String modifyDate; + //机构 + private String hospitalId; + private String hospitalName; + + private List testQuestionsList; + + public static class TestQuestions implements IBasicRequestConvert { + //1. 我能笑的起来和看到事物有趣的一面：2.我看待事物的乐趣： + private String title; + + // A.像以前一样多 B.不那么多 C.肯定没那么多 D.根本没有了 + private String project; + + //0 A.像以前一样多, 0分 + private String fraction; + + public String getFraction() { + return fraction; + } + + public void setFraction(String fraction) { + this.fraction = fraction; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Override + public EmotionalMiniTestModel.TestQuestions convertToDataModel() { + EmotionalMiniTestModel.TestQuestions testQuestions = new EmotionalMiniTestModel.TestQuestions(); + testQuestions.setFraction(fraction); + testQuestions.setTitle(title); + testQuestions.setProject(project); + return testQuestions; + } + } + + + public List getTestQuestionsList() { + return testQuestionsList; + } + + public void setTestQuestionsList(List testQuestionsList) { + this.testQuestionsList = testQuestionsList; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatientId() { + return patientId; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getModifyDate() { + return modifyDate; + } + + public void setModifyDate(String modifyDate) { + this.modifyDate = modifyDate; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + +} + diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EmotionalMiniTestResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EmotionalMiniTestResult.java new file mode 100644 index 0000000..2656023 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/EmotionalMiniTestResult.java @@ -0,0 +1,214 @@ +package com.lyms.platform.operate.web.result; + + +import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.pojo.EmotionalMiniTestModel; + +import java.util.ArrayList; +import java.util.List; + +public class EmotionalMiniTestResult implements IBasicResultConvert { + + + private String id; + //档案id + private String patientId; + private String pid; + //患者姓名 + private String username; + //手机 + private String phone; + //身份证号 + private String cardNo; + //年龄 + private Integer age; + //登记时间 + private String createDate; + private String modifyDate; + //机构 + private String hospitalId; + private String hospitalName; + + private List testQuestionsList; + //总分数 + private String fractionCount; + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getFractionCount() { + return fractionCount; + } + + public void setFractionCount(String fractionCount) { + this.fractionCount = fractionCount; + } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getModifyDate() { + return modifyDate; + } + + public void setModifyDate(String modifyDate) { + this.modifyDate = modifyDate; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public List getTestQuestionsList() { + return testQuestionsList; + } + + public void setTestQuestionsList(List testQuestionsList) { + this.testQuestionsList = testQuestionsList; + } + + public static class TestQuestions { + //1. 我能笑的起来和看到事物有趣的一面：2.我看待事物的乐趣： + private String title; + + // A.像以前一样多 B.不那么多 C.肯定没那么多 D.根本没有了 + private String project; + + //0 A.像以前一样多, 0分 + private String fraction; + + + + public String getFraction() { + return fraction; + } + + public void setFraction(String fraction) { + this.fraction = fraction; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + + } + + @Override + public EmotionalMiniTestResult convertToResult(EmotionalMiniTestModel destModel) { + EmotionalMiniTestResult miniTestResult = new EmotionalMiniTestResult(); + miniTestResult.setId(destModel.getId()); + miniTestResult.setPatientId(destModel.getPatientId()); + miniTestResult.setPid(destModel.getPid()); + miniTestResult.setUsername(destModel.getUsername()); + miniTestResult.setPhone(destModel.getPhone()); + miniTestResult.setCardNo(destModel.getCardNo()); + miniTestResult.setAge(destModel.getAge()); + miniTestResult.setCreateDate(DateUtil.getYyyyMmDd(destModel.getCreateDate())); + miniTestResult.setModifyDate(DateUtil.getYyyyMmDd(destModel.getModifyDate())); + miniTestResult.setHospitalId(destModel.getHospitalId()); + miniTestResult.setHospitalName(destModel.getHospitalName()); + + Integer count = 0; + List testQuestionsList = new ArrayList <>(); + for (EmotionalMiniTestModel.TestQuestions testQuestions : destModel.getTestQuestionsList()) { + TestQuestions testQuestions1 = new TestQuestions(); + if (StringUtils.isNotEmpty(testQuestions.getFraction())) { + count += Integer.parseInt(testQuestions.getFraction()); + miniTestResult.setFractionCount(count.toString()); + } + testQuestions1.setFraction(testQuestions.getFraction()); + testQuestions1.setProject(testQuestions.getProject()); + testQuestions1.setTitle(testQuestions.getTitle()); + testQuestionsList.add(testQuestions1); + } + miniTestResult.setTestQuestionsList(testQuestionsList); + return miniTestResult; + + } + + +} -- 1.8.3.1