esb 8 lat temu
rodzic
commit
680e84ea00

+ 3 - 0
src/main/java/com/yihu/wlyy/repository/consult/ConsultTeamDao.java

@ -234,4 +234,7 @@ public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam,
    @Modifying
    @Query("UPDATE ConsultTeam a set a.status = -2 where CURRENT_TIME - a.czrq > 87840")
    void updateUnresponsedConsultOver24Hours();
	@Query("FROM ConsultTeam a where a.type=?1 and a.adminTeamId is null")
	List<ConsultTeam> findByTypeAndAdminTeamIdIsNull(Integer s);
}

+ 24 - 0
src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@ -868,4 +868,28 @@ public class ConsultTeamService extends ConsultService {
            transfer(uid, doctors[i], consult);
        }
    }
    public String produceConsultAdminTeamCode() {
        StringBuffer sf=new StringBuffer();
        StringBuffer sf1=new StringBuffer();
        Long size=0L;
        //找出家庭签约中团队code是空的
        List<ConsultTeam> consultTeams= consultTeamDao.findByTypeAndAdminTeamIdIsNull(2);
        sf.append("家庭签约咨询中团队code是空的数据数:"+consultTeams.size());
        for(ConsultTeam consultTeam:consultTeams){
            //得到签约中的全科医生的团队
            SignFamily signfamily= signFamilyDao.findByjiatingPatient(consultTeam.getPatient());
            if(signfamily!=null){
                if(signfamily.getAdminTeamId()!=null&&signfamily.getAdminTeamId()>0){
                    consultTeam.setAdminTeamId(signfamily.getAdminTeamId());
                    size++;
                }
            }else{
                sf1.append(",找不到医生所属的团队,家庭签约咨询的Id:"+consultTeam.getId());
            }
        }
        sf.append(",填充团队的签约数据数:"+size);
        sf.append(sf1);
        return sf.toString();
    }
}

+ 1 - 1
src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@ -1651,7 +1651,7 @@ public class FamilyContractService extends BaseService {
    }
    public String produceSignTeamCode() {
    public String produceSignAdminTeamCode() {
        StringBuffer sf=new StringBuffer();
        StringBuffer sf1=new StringBuffer();
        Long size=0L;

+ 22 - 4
src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@ -1,6 +1,7 @@
package com.yihu.wlyy.web.data;
import com.yihu.wlyy.entity.organization.HospitalDept;
import com.yihu.wlyy.service.app.consult.ConsultTeamService;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.web.BaseController;
import org.json.JSONArray;
@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
/**
 * Created by Administrator on 2016.10.08.
 * 历史数据处理控制器
 * 修改历史数据处理控制器
 */
@Controller
@RequestMapping(value = "/dataHandling")
@ -22,14 +23,31 @@ public class DataHandlingController extends BaseController {
    @Autowired
    private FamilyContractService familyContractService;
    @Autowired
    private ConsultTeamService consultTeamService;
    /**
     * 生成签约表中的行政团队的code
     */
    @RequestMapping(value = "produceSignTeamCode")
    @RequestMapping(value = "produceSignAdminTeamCode")
    @ResponseBody
    public String produceSignAdminTeamCode() {
        try {
            return write(200, familyContractService.produceSignAdminTeamCode());
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
    /**
     * 生成咨询表中中的行政团队的code
     * @return
     */
    @RequestMapping(value = "produceConsultAdminTeamCode")
    @ResponseBody
    public String produceSignTeamCode() {
    public String produceConsultAdminTeamCode() {
        try {
            return write(200, familyContractService.produceSignTeamCode());
            return write(200, consultTeamService.produceConsultAdminTeamCode());
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());