diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java index 0089b55..7b4471b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java @@ -4,10 +4,13 @@ import com.lyms.platform.biz.dal.ISyncDataDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.pojo.SyncMysqlDataModel; +import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SerializUtils; +import com.lyms.platform.pojo.TServiceTimeRecord; import com.lyms.platform.query.SyncDataQuery; +import net.sf.json.JSONObject; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -28,6 +31,7 @@ public class SyncDataService { @Autowired private ISyncDataDao iSyncDataDao; + /** * 对于不能访问外网的医院，先存到本地的库，由公网定时读并转发到短信中心 */ @@ -80,4 +84,5 @@ public class SyncDataService { } return true; } + } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java new file mode 100644 index 0000000..78e22d9 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java @@ -0,0 +1,14 @@ +package com.lyms.platform.permission.dao.master; + + + +import com.lyms.platform.pojo.TServiceTimeRecord; +import com.lyms.platform.query.TServiceTimeRecordQuery; + +import java.util.List; + +public interface TServiceTimeRecordMapper { + + void addServiceTimeRecord(TServiceTimeRecord record); + List selectServiceTimeRecords(TServiceTimeRecordQuery query); +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java new file mode 100644 index 0000000..de53b6a --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java @@ -0,0 +1,12 @@ +package com.lyms.platform.permission.service; + + +import com.lyms.platform.pojo.TServiceTimeRecord; +import com.lyms.platform.query.TServiceTimeRecordQuery; + +import java.util.List; + +public interface TServiceTimeRecordService { + void addServiceTimeRecord(TServiceTimeRecord record); + List selectServiceTimeRecords(TServiceTimeRecordQuery query); +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java new file mode 100644 index 0000000..ff2cf78 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java @@ -0,0 +1,29 @@ +package com.lyms.platform.permission.service.impl; + + +import com.lyms.platform.permission.dao.master.TServiceTimeRecordMapper; +import com.lyms.platform.permission.service.TServiceTimeRecordService; +import com.lyms.platform.pojo.TServiceTimeRecord; +import com.lyms.platform.query.TServiceTimeRecordQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TServiceTimeRecordServiceImpl implements TServiceTimeRecordService { + + @Autowired + private TServiceTimeRecordMapper tserviceTimeRecordMapper; + + + @Override + public void addServiceTimeRecord(TServiceTimeRecord record) { + tserviceTimeRecordMapper.addServiceTimeRecord(record); + } + + @Override + public List selectServiceTimeRecords(TServiceTimeRecordQuery query) { + return tserviceTimeRecordMapper.selectServiceTimeRecords(query); + } +} \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml b/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml new file mode 100644 index 0000000..906e22f --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml @@ -0,0 +1,68 @@ + + + + + + insert into t_service_time_record + (serviceId,createTime,updateTime,startTime,endTime,type + ,weekStart,weekEnd,remark,patientId,memberId,foreignId) values + (#{serviceId},#{createTime},#{updateTime}, + #{startTime},#{endTime},#{type},#{weekStart},#{weekEnd},#{remark},#{patientId},#{memberId},#{foreignId}) + + + + + + + + 1 = 1 + + and id = #{id,jdbcType=INTEGER} + + + and serviceId = #{serviceId,jdbcType=INTEGER} + + + and type = #{type,jdbcType=INTEGER} + + + and patientId = #{patientId,jdbcType=INTEGER} + + + and foreignId = #{foreignId} + + + and memberId = #{memberId,jdbcType=INTEGER} + + + = #{weekStart,jdbcType=INTEGER} ]]> + + + + + + = #{startTime,jdbcType=TIMESTAMP} ]]> + + + + + + + + + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java new file mode 100644 index 0000000..6107f78 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TServiceTimeRecord.java @@ -0,0 +1,144 @@ +package com.lyms.platform.pojo; + +import java.util.Date; + +/** + * 服务周期表 + */ +public class TServiceTimeRecord { + private Integer id; + private Integer serviceId;//t_patient_service_record表的主键', + private Date createTime;//创建时间', + private Date updateTime; + private Date startTime;//服务开始时间', + private Date endTime;//服务结束时间', + private Integer type;//'1单次服务 2一个月 3、一个季度 4 全孕周', + private Integer weekStart;//服务孕周', + private Integer weekEnd;//服务孕周', + private String remark;//备注', + private Integer patientId; + private Integer memberId; + private String foreignId; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getServiceId() { + return serviceId; + } + + public void setServiceId(Integer serviceId) { + this.serviceId = serviceId; + } + + public Date getCreateTime() { + return createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + + public Integer getWeekStart() { + return weekStart; + } + + public void setWeekStart(Integer weekStart) { + this.weekStart = weekStart; + } + + public Integer getWeekEnd() { + return weekEnd; + } + + public void setWeekEnd(Integer weekEnd) { + this.weekEnd = weekEnd; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Integer getPatientId() { + return patientId; + } + + public void setPatientId(Integer patientId) { + this.patientId = patientId; + } + + public Integer getMemberId() { + return memberId; + } + + public void setMemberId(Integer memberId) { + this.memberId = memberId; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + @Override + public String toString() { + return "TServiceTimeRecord{" + + "id=" + id + + ", serviceId=" + serviceId + + ", createTime=" + createTime + + ", startTime=" + startTime + + ", endTime=" + endTime + + ", type=" + type + + ", weekStart=" + weekStart + + ", weekEnd=" + weekEnd + + ", remark='" + remark + '\'' + + ", patientId=" + patientId + + ", memberId=" + memberId + + ", foreignId='" + foreignId + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java new file mode 100644 index 0000000..a470f63 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/TServiceTimeRecordQuery.java @@ -0,0 +1,119 @@ +package com.lyms.platform.query; + + + +import com.lyms.platform.common.dao.BaseQuery; + +import java.util.Date; + + +public class TServiceTimeRecordQuery extends BaseQuery { + private Integer id; + private Integer serviceId;//t_patient_service_record表的主键', + private Date createTime;//创建时间', + private Date startTime;//服务开始时间', + private Date endTime;//服务结束时间', + private Date type;//'1单次服务 2一个月 3、一个季度 4 全孕周', + private Date weekStart;//服务孕周', + private Date weekEnd;//服务孕周', + private Date remark;//备注', + private Integer memberId; + private String foreignId;// + private String patientId; + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getRemark() { + return remark; + } + + public void setRemark(Date remark) { + this.remark = remark; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public Integer getMemberId() { + return memberId; + } + + public void setMemberId(Integer memberId) { + this.memberId = memberId; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getServiceId() { + return serviceId; + } + + public void setServiceId(Integer serviceId) { + this.serviceId = serviceId; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getType() { + return type; + } + + public void setType(Date type) { + this.type = type; + } + + public Date getWeekStart() { + return weekStart; + } + + public void setWeekStart(Date weekStart) { + this.weekStart = weekStart; + } + + public Date getWeekEnd() { + return weekEnd; + } + + public void setWeekEnd(Date weekEnd) { + this.weekEnd = weekEnd; + } +} \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java index 21b2102..b150e6b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.Config; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.LymsEncodeUtil; +import com.lyms.platform.operate.web.facade.PatientServiceSysFacade; import com.lyms.platform.operate.web.facade.SysBaseFacade; import com.lyms.platform.operate.web.request.SqlRequest; import com.lyms.platform.permission.service.OrganizationService; @@ -54,6 +55,9 @@ public class SyncDataController extends BaseController { @Autowired private OrganizationService organizationService; + @Autowired + private PatientServiceSysFacade patientServiceSysFacade; + public static String mongo_crypto_key = Config.getItem("mongo_crypto_key", "0"); /** @@ -85,6 +89,26 @@ public class SyncDataController extends BaseController { } } + @ResponseBody + @RequestMapping(value = "/syncJzServiceData", method = RequestMethod.POST) + public BaseResponse syncJzServiceData( + @RequestParam(value = "action", required = true) String action, + @RequestParam(value = "synForm", required = true) String synForm + ) { + try { + System.out.println("syncJzServiceData：action:" + action + ",synForm:" + synForm); + return patientServiceSysFacade.syncJzServiceData(synForm); + } catch (Exception e) { + log.error("syncJzServiceData",e); + BaseResponse baseResponse = new BaseResponse(); + baseResponse.setObject(e.getMessage()); + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + return baseResponse; + } + } + + /** * 小程序同步数据接口 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 69db5a0..25617f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -16,12 +16,10 @@ import com.lyms.platform.operate.web.request.BasePageQueryRequest; import com.lyms.platform.operate.web.result.PatientSerResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; -import com.lyms.platform.pojo.AssistBuildUserModel; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.BasicConfig; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.TServiceTimeRecordQuery; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -71,6 +69,9 @@ public class PatientServiceFacade { private static List tiRuoBasicConfigList; @Autowired + private TServiceTimeRecordService serviceTimeRecordService; + + @Autowired private AssistBuildService assistBuildService; public BaseResponse babyServiceInit(Integer userId) { @@ -543,6 +544,12 @@ public class PatientServiceFacade { result.setPid(ps.getPid()); result.setSerType(ps.getSerType()); String serType = PatientSerEnums.SerTypeEnums.getTitle(ps.getSerType()); + + if (String.valueOf(PatientSerEnums.SerTypeEnums.yqjzzd.getId()).equals(serType)) + { + serType+=getServiceCricle(ps.getParentid()); + } + result.setSerTypeStr(serType); result.setSerStatus(ps.getSerStatus()); String serStatus = PatientSerEnums.SerStatusEnums.getTitle(ps.getSerStatus()); @@ -582,6 +589,35 @@ public class PatientServiceFacade { return result; } + public String getServiceCricle(String patientId) + { + TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery(); + stquery.setForeignId(patientId); + stquery.setSort(" createTime desc"); + String serType = ""; + List tsList = serviceTimeRecordService.selectServiceTimeRecords(stquery); + if (CollectionUtils.isNotEmpty(tsList)) + { + TServiceTimeRecord serviceTimeRecord = tsList.get(0); + if (serviceTimeRecord.getType() != null) + { + if (serviceTimeRecord.getType() == 1) + { + serType+="(单次)"; + } + else if (serviceTimeRecord.getType() == 2) + { + serType+="(一个月)"; + } + else if (serviceTimeRecord.getType() == 3) + { + serType+="(一个季度)"; + } + } + } + return serType; + } + /** * 根据条件查询开通服务记录 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java index d03a883..e857ec1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java @@ -7,13 +7,16 @@ import com.lyms.platform.common.enums.PatientSerEnums; import com.lyms.platform.common.enums.ServiceStatusEnums; import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.PatientServiceQuery; import com.lyms.platform.permission.service.PatientServiceService; +import com.lyms.platform.permission.service.TServiceTimeRecordService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.TServiceTimeRecord; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; @@ -43,6 +46,10 @@ public class PatientServiceSysFacade implements SysBaseFacade { @Autowired private BabyBookbuildingFacade babyBookbuildingFacade; + + @Autowired + private TServiceTimeRecordService serviceTimeRecordService; + @Override public BaseResponse execute(String synForm) { JSONArray jsonArray = JSONArray.fromObject(synForm); @@ -145,10 +152,7 @@ public class PatientServiceSysFacade implements SysBaseFacade { } } } - - System.out.println("同步数据方法结束"); baseResponse.setErrorcode(0); - // baseResponse.setObject(synForm); baseResponse.setErrormsg("成功"); return baseResponse; } @@ -213,4 +217,24 @@ public class PatientServiceSysFacade implements SysBaseFacade { return baseResponse; } + + + public BaseResponse syncJzServiceData(String synForm) { + BaseResponse baseResponse = new BaseResponse(); + + try { + TServiceTimeRecord serviceTimeRecord = JsonUtil.str2Obj(synForm, TServiceTimeRecord.class); + serviceTimeRecordService.addServiceTimeRecord(serviceTimeRecord); + } + catch (Exception e) + { + baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); + baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + return baseResponse; + } + baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); + baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + return baseResponse; + } + }