Merge branch 'dev' of humingfen/wlyy2.0 into dev

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/rehabilitation/DiagnosisInformationController.java

@@ -1,5 +1,6 @@
package com.yihu.jw.controller.rehabilitation;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.specialist.rehabilitation.PatientDiagnosisInformationDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationPlanTemplateDO;
import com.yihu.jw.restmodel.web.Envelop;
@@ -14,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
/**
 * Created by humingfen on 2019/2/11.
 */
@@ -32,7 +35,9 @@ public class DiagnosisInformationController extends EnvelopRestEndpoint {
    public Envelop createDiagnosisInformation(@ApiParam(name = "diagnosisInformationJson", value = "实体JSON")
                                                       @RequestParam(value = "diagnosisInformationJson")String diagnosisInformationJson){
        try {
            PatientDiagnosisInformationDO diagnosisInformationDO = toEntity(diagnosisInformationJson, PatientDiagnosisInformationDO.class);
            ObjectMapper objectMapper = new ObjectMapper();
            objectMapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
            PatientDiagnosisInformationDO diagnosisInformationDO = objectMapper.readValue(diagnosisInformationJson, PatientDiagnosisInformationDO.class);
            return diagnosisInformationService.createDiagnosisInformation(diagnosisInformationDO);
        }catch (Exception e){
            e.printStackTrace();

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@@ -439,13 +439,13 @@ public class RehabilitationManageService {
            }
            map.put(executeTime,m);
        }
        List list = new ArrayList();
        /*List list = new ArrayList();
        for(String key : map.keySet()){
            Map<String,Object> result = map.get(key);
            result.put("executeTime", key);
            list.add(result);
        }
        return ObjEnvelop.getSuccess(SpecialistMapping.api_success,list);
        }*/
        return ObjEnvelop.getSuccess(SpecialistMapping.api_success,map);
    }
    /**