diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index 81a7770..0eb97ea 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -232,13 +232,7 @@
and ser_type = #{serType,jdbcType=INTEGER}
-
- and ser_type in (
-
- #{serType}
-
- )
-
+
and ser_doct = #{serDoct,jdbcType=VARCHAR}
@@ -278,6 +272,13 @@
and hospital_id = #{hospitalId,jdbcType=VARCHAR}
+
+ and ser_type in (
+
+ #{serType}
+
+ )
+
and ser_code = #{serCode,jdbcType=VARCHAR}
@@ -662,7 +663,7 @@ FROM
`hospital_service_content` hso
INNER JOIN hospital_doct_service hds
on hso.id=hds.hosp_service_id
-where hso.hospital_id=#{hospitalId} and hso.ser_type in (3,4,6)
+where hso.hospital_id=#{hospitalId} and hso.ser_type in (1,3,4,6)
\ No newline at end of file
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 ee545fc..14d60be 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
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -223,16 +224,14 @@ public class PatientServiceFacade {
}
-
-
map.put("towns", towns);
// 居住类别
List liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
//秦皇岛需求-增加有居住证，客服配置（其他地区不需要这个选项）
- if(StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)){
+ if (StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)) {
for (BasicConfigResult basicConfigResult : liveType) {
- if("有居住证".equals(basicConfigResult.getName())){
+ if ("有居住证".equals(basicConfigResult.getName())) {
liveType.remove(basicConfigResult);
break;
}
@@ -300,107 +299,114 @@ public class PatientServiceFacade {
/**
* 威县开通服务同步任务
- * 只同步 6围产小助理/3血糖管理服务/4血压管理服务
+ * 只同步 6围产小助理/3血糖管理服务/4血压管理服务/1精准医疗服务
*/
- public void patientServiceSync(){
+ public void patientServiceSync() {
logger.info("patientServiceSync start");
- String hospitalId="2100002421";
- List> mapList= patientServiceService.selectServiceByHospital(hospitalId);
- if (CollectionUtils.isNotEmpty(mapList)){
- Integer [] serTypes={3,4,6};
+ final String hospitalId = "2100002421";
+ List> mapList = patientServiceService.selectServiceByHospital(hospitalId);
+ if (CollectionUtils.isNotEmpty(mapList)) {
+ logger.info("patientServiceSync mapList is not null");
+ final Integer[] serTypes = {1,3, 4, 6};
PatientServiceQuery patientQuery = new PatientServiceQuery();
patientQuery.setHospitalId(hospitalId);
patientQuery.setSerTypes(serTypes);
List patientServices = patientServiceService.queryPatientService(patientQuery);
- PatientsQuery patientsQuery=new PatientsQuery();
+ PatientsQuery patientsQuery = new PatientsQuery();
patientsQuery.setHospitalId(hospitalId);
patientsQuery.setExtEnable(false);
patientsQuery.setBuildTypeNot(1);
patientsQuery.setYn(YnEnums.YES.getId());
- if (CollectionUtils.isNotEmpty(patientServices)){
- List ids=new ArrayList<>();
- for (int i = 0,j=patientServices.size(); i < j; i++) {
- PatientService patientService= patientServices.get(i);
- ids.add(patientService.getParentid());
+ if (CollectionUtils.isNotEmpty(patientServices)) {
+ logger.info("patientServiceSync patientServices is not null");
+ List ids = new ArrayList<>();
+ Set set = new HashSet<>();
+ for (int i = 0, j = patientServices.size(); i < j; i++) {
+ PatientService patientService = patientServices.get(i);
+ set.add(patientService.getParentid());
}
+ ids.addAll(set);
patientsQuery.setIdns(ids);
}
- List patientsList= patientsService.queryPatient(patientsQuery);
- if (CollectionUtils.isNotEmpty(patientsList)){
- for (int i = 0,j=mapList.size(); i < j; i++) {
- Map params= mapList.get(i);
- Integer serType= Integer.parseInt(String.valueOf(params.get("serType")));
- String createUser=String.valueOf(params.get("doctId"));
- for (int k = 0,f=patientsList.size(); k < f; k++) {
- Patients patients= patientsList.get(k);
- String parentId= patients.getId();
- //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
- /* PatientServiceQuery patientQuery = new PatientServiceQuery();
- patientQuery.setParentid(parentId);
- patientQuery.setSerType(serType);
- List patientServices = patientServiceService.queryPatientService(patientQuery);
- if (CollectionUtils.isNotEmpty(patientServices)) {
- continue;
- }*/
- PatientService pser = new PatientService();
- pser.setCreateUser(createUser);
- pser.setCreateDate(patients.getCreated());
- //设置服务对象类型 服务人类型(1-孕妇、2-儿童)
- pser.setPerType(1);
- pser.setPid(patients.getPid());
- //如果有数据源id，取主档案id
- if (StringUtils.isNotEmpty(patients.getSource())) {
- pser.setParentid(patients.getSource());
- }else {
- pser.setParentid(parentId);
- }
- pser.setId(UUID.randomUUID().toString().replace("-", ""));
- //开通医院
- pser.setHospitalId(hospitalId);
- //默认开通状态
- pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
- //服务类型
- pser.setSerType(serType);
- //默认已经领取
- pser.setStatus(2);
- //默认待同步
- pser.setSynStatus(1);
- //领取时间
- pser.setReceiveDate(new Date());
- //领取操作医生id
- pser.setReceiveUser(createUser);
- //服务开通操作时间
- pser.setUpdateDate(new Date());
- //服务开通操作人
- pser.setUpdateUser(createUser);
- //默认是全孕周42
- pser.setDoctorWeek(42);
- pser.setServiceWeek(42);
-
- setServiceRecordAdd(pser, patients);
-
- patientServiceService.addPatientService(pser);
-
- operateLogFacade.addAddOptLog(Integer.valueOf(createUser), Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务");
-
-
- if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) {
- PatientServiceQuery query = new PatientServiceQuery();
- query.setParentid(parentId);
- query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
- int count = patientServiceService.queryPatientServiceCount(query);
- //是否有增值服务--没有则处理标准服务
- if (count == 0) {
- Patients patient = new Patients();
- patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
- patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
- bookbuildingFacade.updatePatientSerById(parentId, patient);
+ final List patientsList = patientsService.queryPatient(patientsQuery);
+ if (CollectionUtils.isNotEmpty(patientsList)) {
+ logger.info("patientServiceSync patientsList is not null");
+ for (int i = 0, j = mapList.size(); i < j; i++) {
+ Map params = mapList.get(i);
+ final Integer serType = Integer.parseInt(String.valueOf(params.get("serType")));
+ final String createUser = String.valueOf(params.get("doctId"));
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ for (int k = 0, f = patientsList.size(); k < f; k++) {
+ Patients patients = patientsList.get(k);
+
+ logger.info("patientServiceSync Thread start");
+ String parentId = patients.getId();
+ PatientService pser = new PatientService();
+ pser.setCreateUser(createUser);
+ pser.setCreateDate(patients.getCreated());
+ //设置服务对象类型 服务人类型(1-孕妇、2-儿童)
+ pser.setPerType(1);
+ pser.setPid(patients.getPid());
+ //如果有数据源id，取主档案id
+ if (StringUtils.isNotEmpty(patients.getSource())) {
+ pser.setParentid(patients.getSource());
+ } else {
+ pser.setParentid(parentId);
+ }
+ pser.setId(UUID.randomUUID().toString().replace("-", ""));
+ //开通医院
+ pser.setHospitalId(hospitalId);
+ //默认开通状态
+ pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
+ //服务类型
+ pser.setSerType(serType);
+ //默认已经领取
+ pser.setStatus(2);
+ //默认待同步
+ pser.setSynStatus(1);
+ //领取时间
+ pser.setReceiveDate(new Date());
+ //领取操作医生id
+ pser.setReceiveUser(createUser);
+ //服务开通操作时间
+ pser.setUpdateDate(new Date());
+ //服务开通操作人
+ pser.setUpdateUser(createUser);
+ //默认是全孕周42
+ pser.setDoctorWeek(42);
+ pser.setServiceWeek(42);
+
+ setServiceRecordAdd(pser, patients);
+ patientServiceService.addPatientService(pser);
+ operateLogFacade.addAddOptLog(Integer.valueOf(createUser), Integer.valueOf(hospitalId), pser, OptActionEnums.ADD.getId(), "开通增值服务");
+ if (PatientSerEnums.SerTypeEnums.yqjzzd.getId() == serType) {//孕期精准指导同步到建档
+
+ Patients patient = new Patients();
+ patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
+ patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
+ bookbuildingFacade.updatePatientSerById(parentId, patient);
+
+ }else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == serType) {
+ PatientServiceQuery query = new PatientServiceQuery();
+ query.setParentid(parentId);
+ query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
+ int count = patientServiceService.queryPatientServiceCount(query);
+ //是否有增值服务--没有则处理标准服务
+ if (count == 0) {
+ Patients patient = new Patients();
+ patient.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId());
+ patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
+ bookbuildingFacade.updatePatientSerById(parentId, patient);
+ }
+ }
+ logger.info("patientServiceSync Thread end");
}
}
- }
+ }).start();
}
- logger.info("addPatientServiceAll end");
}
}
logger.info("patientServiceSync end");
@@ -479,10 +485,10 @@ public class PatientServiceFacade {
//服务开通操作人
pser.setUpdateUser(String.valueOf(userId));
- if (serInfo.containsKey("device") && StringUtils.isNotEmpty(serInfo.get("device")) ) {
+ if (serInfo.containsKey("device") && StringUtils.isNotEmpty(serInfo.get("device"))) {
pser.setDevice(Integer.parseInt(serInfo.get("device")));
}
- if (serInfo.containsKey("deviceCon") && StringUtils.isNotEmpty(serInfo.get("deviceCon")) ) {
+ if (serInfo.containsKey("deviceCon") && StringUtils.isNotEmpty(serInfo.get("deviceCon"))) {
pser.setDeviceCon(Integer.parseInt(serInfo.get("deviceCon")));
}
if (serInfo.containsKey("doctorWeek")) {
@@ -553,11 +559,9 @@ public class PatientServiceFacade {
return baseResponse;
}
- public void setServiceRecordAdd(PatientService pser, Patients patients)
- {
+ public void setServiceRecordAdd(PatientService pser, Patients patients) {
Date currentDate = new Date();
- if (pser.getCreateDate() != null)
- {
+ if (pser.getCreateDate() != null) {
currentDate = pser.getCreateDate();
}
@@ -569,32 +573,28 @@ public class PatientServiceFacade {
Integer serviceWeek = pser.getServiceWeek();
Integer doctorService = pser.getDoctorWeek();
- if (serviceWeek != null)
- {
+ if (serviceWeek != null) {
Date endTime = DateUtil.addWeek(currentDate, serviceWeek);
- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
- {
+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
endTime = DateUtil.addWeek(lastMenses, 42);
}
Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + serviceWeek;
- endWeek = endWeek > 42 ? 42 : endWeek;
+ endWeek = endWeek > 42 ? 42 : endWeek;
pser.setSerStartTime(currentDate);
pser.setSerEndTime(endTime);
pser.setSerStartWeek(DateUtil.getWeek(lastMenses, currentDate));
pser.setSerEndWeek(endWeek);
}
- if (doctorService != null)
- {
+ if (doctorService != null) {
Date endTime = DateUtil.addWeek(currentDate, doctorService);
- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
- {
+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
endTime = DateUtil.addWeek(lastMenses, 42);
}
Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + doctorService;
- endWeek = endWeek > 42 ? 42 : endWeek;
+ endWeek = endWeek > 42 ? 42 : endWeek;
pser.setDocStartTime(currentDate);
pser.setDocEndTime(endTime);
@@ -604,38 +604,31 @@ public class PatientServiceFacade {
}
- public void setServiceRecordUpdate(PatientService pser, Patients patients)
- {
+ public void setServiceRecordUpdate(PatientService pser, Patients patients) {
Date lastMenses = patients.getLastMenses();
Integer serviceWeek = pser.getServiceWeek();
Integer doctorWeek = pser.getDoctorWeek();
- if (pser.getId() != null)
- {
- if (serviceWeek != null && serviceWeek > 0)
- {
+ if (pser.getId() != null) {
+ if (serviceWeek != null && serviceWeek > 0) {
//未过期
- if (pser.getSerEndTime() != null && pser.getSerEndTime().getTime() > new Date().getTime())
- {
+ if (pser.getSerEndTime() != null && pser.getSerEndTime().getTime() > new Date().getTime()) {
Date startTime = pser.getSerStartTime();
Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek);
- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
- {
+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
endTime = DateUtil.addWeek(lastMenses, 42);
}
Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek;
- endWeek = endWeek > 42 ? 42 : endWeek;
+ endWeek = endWeek > 42 ? 42 : endWeek;
pser.setSerStartTime(startTime);
pser.setSerEndTime(endTime);
pser.setSerStartWeek(startWeek);
pser.setSerEndWeek(endWeek);
- }
- else
- {
+ } else {
pser.setSerStartTime(new Date());
pser.setSerEndTime(DateUtil.addWeek(new Date(), serviceWeek));
pser.setSerStartWeek(DateUtil.getWeek(lastMenses, new Date()));
@@ -643,29 +636,24 @@ public class PatientServiceFacade {
}
}
- if (doctorWeek != null && doctorWeek > 0)
- {
- if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime())
- {
- Date endTime = DateUtil.addWeek(pser.getDocEndTime(),doctorWeek);
- if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime())
- {
+ if (doctorWeek != null && doctorWeek > 0) {
+ if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime()) {
+ Date endTime = DateUtil.addWeek(pser.getDocEndTime(), doctorWeek);
+ if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) {
endTime = DateUtil.addWeek(lastMenses, 42);
}
Date startTime = pser.getSerStartTime();
Integer startWeek = DateUtil.getWeek(lastMenses, startTime);
Integer endWeek = DateUtil.getWeek(lastMenses, pser.getDocEndTime()) + doctorWeek;
- endWeek = endWeek > 42 ? 42 : endWeek;
+ endWeek = endWeek > 42 ? 42 : endWeek;
pser.setDocEndTime(endTime);
pser.setDocStartTime(startTime);
pser.setDocStartWeek(startWeek);
pser.setDocEndWeek(endWeek);
- }
- else
- {
+ } else {
pser.setDocStartTime(new Date());
pser.setDocEndTime(DateUtil.addWeek(new Date(), doctorWeek));
pser.setDocStartWeek(DateUtil.getWeek(lastMenses, new Date()));
@@ -716,19 +704,17 @@ public class PatientServiceFacade {
}
//增加购买孕周 cfl
- if(before.getSerStatus() == 1 && ps.getSerStatus() ==1){
- if (ps.getServiceWeek() != null && ps.getServiceWeek() > 0)
- {
- ps.setServiceWeek(ps.getServiceWeek() + (before.getServiceWeek() != null ? before.getServiceWeek():0));
+ if (before.getSerStatus() == 1 && ps.getSerStatus() == 1) {
+ if (ps.getServiceWeek() != null && ps.getServiceWeek() > 0) {
+ ps.setServiceWeek(ps.getServiceWeek() + (before.getServiceWeek() != null ? before.getServiceWeek() : 0));
}
- if (ps.getDoctorWeek() != null && ps.getDoctorWeek() > 0)
- {
- ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek():0));
+ if (ps.getDoctorWeek() != null && ps.getDoctorWeek() > 0) {
+ ps.setDoctorWeek(ps.getDoctorWeek() + (before.getDoctorWeek() != null ? before.getDoctorWeek() : 0));
}
}
//修改服务时增加孕周内容 cfl 20231019
Patients patients = patientsService.findOnePatientById(ps.getParentid());
- setServiceRecordUpdate(ps,patients);
+ setServiceRecordUpdate(ps, patients);
patientServiceService.updatePatientService(ps);
@@ -769,10 +755,10 @@ public class PatientServiceFacade {
}
babyBookbuildingFacade.updateBabySerInfo(babyBookbuildingAddRequest);
} else {
- //孕妇建档服务数据处理
+ //孕妇建档服务数据处理
Patients patient = new Patients();
if (PatientSerEnums.SerTypeEnums.yqjzzd.getId().intValue() == ps.getSerType().intValue()) {
- //孕期精准指导同步到建档
+ //孕期精准指导同步到建档
patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.kt.getId().intValue()) {
patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
@@ -783,7 +769,7 @@ public class PatientServiceFacade {
} else if (ps.getSerStatus().intValue() == PatientSerEnums.SerStatusEnums.zt.getId().intValue()) {
patient.setServiceStatus(ServiceStatusEnums.SUSPEND.getId());
}
- }else if(PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()){
+ } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == ps.getSerType().intValue()) {
PatientServiceQuery query = new PatientServiceQuery();
query.setParentid(after.getParentid());
query.setSerType(PatientSerEnums.SerTypeEnums.yqjzzd.getId());
@@ -826,14 +812,14 @@ public class PatientServiceFacade {
result.setId(ps.getId());
if (ps.getPerType() != null && ps.getPerType() == 2) {//儿童
BabyModel model = babyService.getOneBabyById(ps.getParentid());
- if(model!=null){
+ if (model != null) {
result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
result.setBabyName(StringUtils.emptyDeal(model.getName()));
result.setBirthday(StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
result.setName(StringUtils.emptyDeal(model.getMname()));
result.setMonthAge(StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
- }else {
- System.out.println("根据儿童Id没有找到儿童："+ps.getParentid());
+ } else {
+ System.out.println("根据儿童Id没有找到儿童：" + ps.getParentid());
}
} else {
Patients patients = patientsService.findOnePatientById(ps.getParentid());
@@ -853,14 +839,13 @@ public class PatientServiceFacade {
if (!"-".equals(result.getRiskFactor()) && org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
result.setRiskFactor(result.getRiskFactor() + "," + patients.getoRiskFactor());
- }else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor()))
- {
+ } else if (org.apache.commons.lang.StringUtils.isNotEmpty(patients.getoRiskFactor())) {
result.setRiskFactor(patients.getoRiskFactor());
}
//高危等级颜色
result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId()));
- }else{
- System.out.println("根据孕妇id没有找到孕妇建档："+ps.getParentid());
+ } else {
+ System.out.println("根据孕妇id没有找到孕妇建档：" + ps.getParentid());
}
}
if (StringUtils.isNotEmpty(ps.getHospitalId())) {//查询医院名称
@@ -893,9 +878,8 @@ public class PatientServiceFacade {
result.setSerType(ps.getSerType());
String serType = PatientSerEnums.SerTypeEnums.getTitle(ps.getSerType());
- if (ps.getSerType() != null && PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType())
- {
- serType+=getServiceCricle(ps.getParentid());
+ if (ps.getSerType() != null && PatientSerEnums.SerTypeEnums.yqjzzd.getId() == ps.getSerType()) {
+ serType += getServiceCricle(ps.getParentid());
}
result.setSerTypeStr(serType);
@@ -945,30 +929,22 @@ public class PatientServiceFacade {
return result;
}
- public String getServiceCricle(String patientId)
- {
- TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();
+ public String getServiceCricle(String patientId) {
+ TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();
stquery.setForeignId(patientId);
stquery.setSort(" createTime desc");
stquery.setgEndTime(new Date());
String serType = "";
- List tsList = serviceTimeRecordService.selectServiceTimeRecords(stquery);
- if (CollectionUtils.isNotEmpty(tsList))
- {
+ 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+="(一个季度)";
+ if (serviceTimeRecord.getType() != null) {
+ if (serviceTimeRecord.getType() == 1) {
+ serType += "(单次)";
+ } else if (serviceTimeRecord.getType() == 2) {
+ serType += "(一个月)";
+ } else if (serviceTimeRecord.getType() == 3) {
+ serType += "(一个季度)";
}
}
}
@@ -1284,10 +1260,10 @@ public class PatientServiceFacade {
/**
* 默认服务开通
+ *
* @return
*/
- public List> defaultServiceOpen()
- {
+ public List> defaultServiceOpen() {
//标准服务开通
List> serInfos = new ArrayList<>();
// Map serMap = new HashMap<>();
@@ -1297,7 +1273,6 @@ public class PatientServiceFacade {
}
-
/**
* 同步医院医生服务价格配置
*
@@ -1372,24 +1347,20 @@ public class PatientServiceFacade {
return map;
}
- public void doServiceEndExcute()
- {
+ public void doServiceEndExcute() {
PatientServiceQuery patientQuery = new PatientServiceQuery();
patientQuery.setSerEndTime(new Date());
patientQuery.setStatus(1);
List patientServices = patientServiceService.queryPatientService(patientQuery);
- if (CollectionUtils.isNotEmpty(patientServices))
- {
- for (PatientService service : patientServices)
- {
+ if (CollectionUtils.isNotEmpty(patientServices)) {
+ for (PatientService service : patientServices) {
service.setSerType(1);
service.setSerStatus(3);
patientServiceService.updatePatientService(service);
Patients patients = patientsService.findOnePatientById(service.getParentid());
- if (patients != null)
- {
+ if (patients != null) {
patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
patientsService.updatePatient(patients);
@@ -1398,7 +1369,6 @@ public class PatientServiceFacade {
}
-
// TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery();
// stquery.setEndTime(new Date());
// List tsList = serviceTimeRecordService.queryServiceTimeRecordsEnd(stquery);
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
index cac8de3..83d1a92 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
@@ -668,7 +668,7 @@
-
+