Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/specialist/HopsitalServiceItemController.java
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/SpecialistHospitalItemService.java

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistEvaluateSevice.java

@@ -154,7 +154,7 @@ public class SpecialistEvaluateSevice extends BaseService {
            message.setState(1);
            message.setCzrq(new Date());
            message.setReceiverName(receiverDoctor.getName());
            message.setReason(patientCode);
            message.setData(patientCode);
            messageDao.save(message);
        }catch (Exception e){
            e.printStackTrace();