|
@ -144,25 +144,18 @@ public class FollowUpService extends BaseService {
|
|
|
List<Followup> list = followupDao.findByDoctor(doctorCode, DateUtil.strToDate(startTime), DateUtil.strToDate(endTime));
|
|
|
if (list != null && list.size() > 0) {
|
|
|
for (Followup followup : list) {
|
|
|
String status = followup.getStatus();
|
|
|
String date = DateUtil.dateToStrShort(followup.getFollowupDate());
|
|
|
Map<String, String> map = getFollowupDetail(followup);
|
|
|
if(temp.containsKey(date)){
|
|
|
Map<String, Object> vo = temp.get(date);
|
|
|
if(!"1".equals(status)){
|
|
|
vo.put("num",Integer.parseInt(vo.get("num").toString())+1);
|
|
|
}
|
|
|
vo.put("num",Integer.parseInt(vo.get("num").toString())+1);
|
|
|
((List<Map<String, String>>)vo.get("list")).add(map);
|
|
|
temp.put(date,vo);
|
|
|
}else{
|
|
|
Map<String, Object> vo = new HashMap<>();
|
|
|
List<Map<String, String>> list1 = new ArrayList<>();
|
|
|
vo.put("date",date);
|
|
|
if(!"1".equals(status)){
|
|
|
vo.put("num",1);//未完成数量
|
|
|
}else{
|
|
|
vo.put("num",0);
|
|
|
}
|
|
|
vo.put("num",1);
|
|
|
list1.add(map);
|
|
|
vo.put("list",list1);
|
|
|
temp.put(date,vo);
|