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

# Conflicts:
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManagerController.java

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyWorkorderServicerLogService.java

@@ -54,10 +54,11 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
     */
    @Transactional
    public void create(ManageSynergyWorkorderServicerLogDO synergyWorkorderServicerLogDO,String userCode){
        ManageSynergyWorkorderServicerDO workorderServicerDO = workorderServicerDao.findByWorkOrderCodeAndPatientCode1(synergyWorkorderServicerLogDO.getWorkorderCode(),synergyWorkorderServicerLogDO.getWorkorderServiceCode());
        synergyWorkorderServicerLogDO.setCreateTime(new Date());
        synergyWorkorderServicerLogDO.setWorkorderServiceCode(workorderServicerDO.getCode());
        ManageSynergyWorkorderServicerLogDO workorderServicerLogDO = manageSynergyWorkorderServicerLogDao.save(synergyWorkorderServicerLogDO);
        User user = userDao.findByCode(userCode);
        ManageSynergyWorkorderServicerDO workorderServicerDO = workorderServicerDao.findByWorkOrderCodeAndPatientCode1(workorderServicerLogDO.getWorkorderCode(),workorderServicerLogDO.getWorkorderServiceCode());
        workorderServicerDO.setStatus(3);
        workorderServicerDO.setExecutorCode(user.getCode());
        workorderServicerDO.setExecutorName(user.getName());