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

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

@@ -5,7 +5,6 @@ package com.yihu.wlyy.service.synergy;/**
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.User;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerLogDO;
import com.yihu.wlyy.repository.PatientDao;
@@ -55,24 +54,17 @@ 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());
        workorderServicerDO.setExecutorType(2);
        workorderServicerDO.setCompleteTime(new Date());
        ManageSynergyWorkorderServicerDO workorderServicerDO1 = workorderServicerDao.save(workorderServicerDO);
        String sql = "select * from manage_synergy_workorder_servicer where workorder_code = '"+workorderServicerLogDO.getWorkorderCode()+"' and status IN(1,2) AND service_patient_code != '"+workorderServicerDO1.getServicePatientCode()+"'";
        List<ManageSynergyWorkorderServicerDO> workorderServicerDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ManageSynergyWorkorderServicerDO.class));
        if ((workorderServicerDOS == null || workorderServicerDOS.size() == 0)&&workorderServicerDO1.getStatus() ==3){
            ManageSynergyWorkorderDO workorderDO = manageSynergyWorkOrderDao.findByCode(workorderServicerLogDO.getWorkorderCode());
            workorderDO.setStatus(3);
            workorderDO.setCompleteTime(new Date());
            manageSynergyWorkOrderDao.save(workorderDO);
        }
        workorderServicerDao.save(workorderServicerDO);
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

@@ -1241,4 +1241,10 @@ public class FollowUpService extends BaseService {
            }
        }
    }
    public void updateFollowup(Long id){
        Followup followup = followupDao.findOne(id);
        followup.setStatus("1");
        followupDao.save(followup);
    }
}

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

@@ -100,6 +100,7 @@ public class SynergyManagerController extends BaseController{
                String followupProjectData = array.getJSONObject(i).getString("followupProjectData");
                followUpService.esSaveFollowupProjectData(id, followupProject, followupProjectData);
            }
            followUpService.updateFollowup(Long.parseLong(id));
            return write(200, "保存随访项目数据成功！");
        } catch (Exception e) {
            error(e);