diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
index 3f04eef..b37a8a0 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
@@ -107,6 +107,11 @@
and m.record_count = #{m.recordCount,jdbcType=INTEGER}
+
+
+ AND date_format(m.modified,'%Y-%m-%d') = #{modified}
+
+
AND m.created >= date_format(#{createdTimeStart},'%Y-%m-%d')
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MeasureDataInfoQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MeasureDataInfoQuery.java
index 1c9e995..0458068 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/MeasureDataInfoQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MeasureDataInfoQuery.java
@@ -53,6 +53,7 @@ public class MeasureDataInfoQuery extends BaseQuery {
private Date modifiedTimeStart;
private Date modifiedTimeEnd;
+
//面部
private String face;
@@ -75,9 +76,9 @@ public class MeasureDataInfoQuery extends BaseQuery {
private Integer recordCount;
//创建时间
- private Date created;
+ private String created;
//修改时间
- private Date modified;
+ private String modified;
//当天记录次数
private Integer todayCount;
@@ -178,12 +179,19 @@ public class MeasureDataInfoQuery extends BaseQuery {
}
+ public Date getModifiedTimeEnd() {
+ return modifiedTimeEnd;
+ }
+
+ public void setModifiedTimeEnd(Date modifiedTimeEnd) {
+ this.modifiedTimeEnd = modifiedTimeEnd;
+ }
- public Date getCreated() {
+ public String getCreated() {
return created;
}
- public void setCreated(Date created) {
+ public void setCreated(String created) {
this.created = created;
}
@@ -299,11 +307,11 @@ public class MeasureDataInfoQuery extends BaseQuery {
this.recordCount = recordCount;
}
- public Date getModified() {
+ public String getModified() {
return modified;
}
- public void setModified(Date modified) {
+ public void setModified(String modified) {
this.modified = modified;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java
index a038cc3..0225f85 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java
@@ -22,26 +22,22 @@ public class PatientCourseController extends BaseController {
private PatientCourseFacade patientCourseFacade;
/**
- * 预约列表
- * @param courseId 课程id
+ * 可预约课程
* @param request
* @return
*/
@RequestMapping(method = RequestMethod.GET, value = "/getOrderPatientCourseList")
@ResponseBody
@TokenRequired
- public BaseResponse getOrderPatientCourseList(@RequestParam(required = false) String courseId,
- @RequestParam("page") Integer page,
- @RequestParam("limit") Integer limit,
+ public BaseResponse getOrderPatientCourseList(
HttpServletRequest request) {
- return patientCourseFacade.getPatientCourseList(1,courseId, page,limit,getUserId(request));
+ return patientCourseFacade.getPatientCourseList(getUserId(request));
}
/**
* 签到列表
- * @param courseId 课程id
* @param request
* @return
*/
@@ -49,12 +45,9 @@ public class PatientCourseController extends BaseController {
@ResponseBody
@TokenRequired
public BaseResponse getSignPatientCourseList(
- @RequestParam(required = false) String courseId,
- @RequestParam("page") Integer page,
- @RequestParam("limit") Integer limit,
HttpServletRequest request) {
- return patientCourseFacade.getPatientCourseList(2,courseId, page, limit, getUserId(request));
+ return patientCourseFacade.getPatientCourseList(getUserId(request));
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
index 03a30d2..7fa3baa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
@@ -540,6 +540,7 @@ public class MeasureInfoFacade {
query.setCertNo(certNo);
query.setCertType(certType);
query.setHospitalId(hospitalId);
+ query.setModified(DateUtil.getyyyy_MM_dd(new Date()));
List list = mysqlMeasureDataInfoService.queryMeasureList(query);
if (CollectionUtils.isNotEmpty(list))
{
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
index 4d9b21d..81ecbe6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
@@ -6,14 +6,17 @@ import com.lyms.platform.biz.service.CourseTypeService;
import com.lyms.platform.biz.service.PatientCourseService;
import com.lyms.platform.biz.service.PatientsService;
import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.CourseStatusEnums;
import com.lyms.platform.common.enums.YnEnums;
import com.lyms.platform.common.result.BaseListResponse;
import com.lyms.platform.common.result.BaseObjectResponse;
import com.lyms.platform.common.result.BaseResponse;
import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.operate.web.result.CourseResult;
import com.lyms.platform.operate.web.result.CourseTypeResult;
import com.lyms.platform.operate.web.result.PatientCourseResult;
import com.lyms.platform.permission.model.Organization;
+import com.lyms.platform.permission.model.Users;
import com.lyms.platform.permission.service.OrganizationService;
import com.lyms.platform.permission.service.UsersService;
import com.lyms.platform.pojo.CourseModel;
@@ -61,31 +64,74 @@ public class PatientCourseFacade {
private OrganizationService organizationService;
- public BaseResponse getPatientCourseList(Integer status,String courseId, Integer page,
- Integer limit, Integer userId) {
+ public BaseResponse getPatientCourseList(Integer userId) {
String hospitalId = autoMatchFacade.getHospitalId(userId);
-
- PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
- patientCourseQuery.setYn(YnEnums.YES.getId());
- patientCourseQuery.setNeed("true");
- patientCourseQuery.setPage(page);
- patientCourseQuery.setLimit(limit);
- patientCourseQuery.setHospitalId(hospitalId);
- patientCourseQuery.setCourseId(courseId);
- //状态 1预约，2签到
- patientCourseQuery.setStatus(status);
-
- List results = getPatientCourse(patientCourseQuery);
+ CourseQuery query = new CourseQuery();
+ query.setYn(YnEnums.YES.getId());
+ query.setStatus(CourseStatusEnums.YFB.getId());
+ query.setHospitalId(hospitalId);
+ List results = getCourseList(query);
BaseListResponse objectResponse = new BaseListResponse();
objectResponse.setData(results);
- objectResponse.setPageInfo(patientCourseQuery.getPageInfo());
+ objectResponse.setPageInfo(query.getPageInfo());
objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
objectResponse.setErrormsg("成功");
return objectResponse;
}
+ private List getCourseList(CourseQuery query) {
+
+ List courseModels = courseService.queryCourseList(query);
+ List results = new ArrayList<>();
+ CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
+ courseTypeQuery.setYn(YnEnums.YES.getId());
+
+ if (CollectionUtils.isNotEmpty(courseModels))
+ {
+ for (CourseModel model : courseModels)
+ {
+ CourseResult result = new CourseResult();
+ result.setId(model.getId());
+
+ String courseType = "";
+ courseTypeQuery.setId(model.getCourseTypeId());
+ List typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery);
+ if (CollectionUtils.isNotEmpty(typeModels))
+ {
+ courseType = typeModels.get(0).getCourseTypeName();
+ }
+ result.setCourseType(courseType);
+ result.setCourseTypeId(model.getCourseTypeId());
+
+ result.setCourseName(model.getCourseName());
+ result.setCourseSpeaker(model.getCourseSpeaker());
+ result.setCourseAddress(model.getCourseAddress());
+ result.setCourseTime(DateUtil.gety_m_dhm(model.getCourseTime()));
+ result.setTimeLong(model.getTimeLong());
+ result.setLimitNum(model.getLimitNum());
+ result.setEnrolmentNum(model.getEnrolmentNum());
+ result.setSignNum(model.getSignNum());
+ result.setStatus(CourseStatusEnums.getNameById(model.getStatus()));
+ result.setCourseRemark(model.getCourseRemark());
+ result.setCourseDesc(model.getCourseDesc());
+
+ String createUser = "";
+ Users users = usersService.getUsers(Integer.parseInt(model.getCreateUserId()));
+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
+ createUser = users.getName();
+ }
+ result.setCreateUser(createUser);
+
+ result.setCreated(DateUtil.getyyyy_MM_dd_hms(model.getCreated()));
+ results.add(result);
+ }
+ }
+
+ return null;
+ }
+
public BaseResponse queryOrderPatient(String queryNo,String courseId, Integer userId) {
String hospitalId = autoMatchFacade.getHospitalId(userId);
@@ -143,6 +189,7 @@ public class PatientCourseFacade {
private List getPatientCourse(PatientCourseQuery patientCourseQuery)
{
+
List results = new ArrayList<>();
List patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery);
if (CollectionUtils.isNotEmpty(patientCourseModels))