|
@ -182,7 +182,7 @@ public class RehabilitationManageService {
|
|
|
String relationType = detailDO.getHospitalServiceItemId();
|
|
|
Integer plan_start_time_type = detailDO.getTimeType();//计划开始时间类型
|
|
|
String server_count = detailDO.getServerCount();//服务次数
|
|
|
if(StringUtils.isBlank(server_count)&&!"3".equals(relationType)){
|
|
|
if(StringUtils.isBlank(server_count)&&!"2".equals(relationType)&&!"3".equals(relationType)){
|
|
|
return planDOList;
|
|
|
}
|
|
|
String planDetailId = detailDO.getId();
|
|
@ -1356,9 +1356,12 @@ public class RehabilitationManageService {
|
|
|
List<RehabilitationServiceItemDO> itemDOList = serviceItemDao.findList();
|
|
|
Map<String, String> serviceItemMap = itemDOList.stream().collect(Collectors.toMap(RehabilitationServiceItemDO::getCode, RehabilitationServiceItemDO::getName));
|
|
|
List<ServiceItemPlanDO> planDOList = serviceItemPlanDao.findByPlanId(planId);
|
|
|
PatientRehabilitationPlanDO patientRehabilitationPlanDO = patientRehabilitationPlanDao.findById(planId).orElse(null);
|
|
|
String patient = patientRehabilitationPlanDO.getPatient();
|
|
|
Map<String,List<ServiceItemPlanDO>> planListMap = planDOList.stream().collect(Collectors.groupingBy(ServiceItemPlanDO::getRelationType));
|
|
|
for (RehabilitationDetailDO detailDO:detailDOList){
|
|
|
String key = detailDO.getHospitalServiceItemId();
|
|
|
String doctor = detailDO.getDoctor();
|
|
|
List<ServiceItemPlanDO> planDOS = planListMap.get(key);
|
|
|
if(planDOS==null){
|
|
|
planDOS = new ArrayList<>();
|
|
@ -1386,9 +1389,22 @@ public class RehabilitationManageService {
|
|
|
detailDO.setCompleteTime(completeTime);
|
|
|
detailDO.setPlanTime(planTime);
|
|
|
detailDO.setName(serviceItemMap.get(key));
|
|
|
if("2".equals(key)){
|
|
|
//康复咨询
|
|
|
String sqlTotal = "SELECT COUNT(*) from wlyy_consult_team WHERE patient='"+patient+"' and doctor='"+doctor+"' and type = '28' ";
|
|
|
Integer signCount = jdbcTemplate.queryForObject(sqlTotal,Integer.class);
|
|
|
detailDO.setFinishNum(signCount);
|
|
|
if(signCount>0){
|
|
|
String sqlTemp = "select DATE_FORMAT(czrq, '%Y-%m-%d %H:%i:%s') czrq from wlyy_consult_team p where p.patient ='" + patient + "' and doctor='"+doctor+"' and " +
|
|
|
"type = '28' order by p.czrq desc limit 0,1 ";
|
|
|
List<Map<String,Object>> indexList = jdbcTemplate.queryForList(sqlTemp);
|
|
|
if(indexList.size()>0){
|
|
|
detailDO.setCompleteTime(indexList.get(0).get("")+"czrq");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if("3".equals(key)){
|
|
|
PatientRehabilitationPlanDO patientRehabilitationPlanDO = patientRehabilitationPlanDao.findById(planId).orElse(null);
|
|
|
String patient = patientRehabilitationPlanDO.getPatient();
|
|
|
//健康监测
|
|
|
String sqlTotal = "select count(*) as total from wlyy_patient_health_index p " +
|
|
|
"where p.user ='" + patient + "' and p.type IN(1,2) ";//and p.record_date >= '"+createTime+"'
|
|
|
Integer signCount = jdbcTemplate.queryForObject(sqlTotal,Integer.class);
|