Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/dao/PatientDiseaseDao.java

@@ -54,6 +54,6 @@ public interface PatientDiseaseDao extends PagingAndSortingRepository<PatientDis
    @Query("update PatientDisease set del = '0' where patient = ?1 and del = '1' and signType = '2' ")
    int updateDiseaseDel(String patient);
    @Query("select a from PatientDisease a where a.del = '1' and a.id > ?1 and a.id > ?2")
    Page<PatientDisease> findByIdRange(Long start, Long end, Pageable pageRequest);
    @Query("select a from PatientDisease a where a.del = '1' and a.id >= ?1")
    Page<PatientDisease> findByIdRange(Long start, Pageable pageRequest);
}

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/task/PatientDiseaseToLabel.java

@@ -21,16 +21,14 @@ import java.util.*;
 */
public class PatientDiseaseToLabel implements Runnable {
    long start = 0;
    long end = 0;
    long start = 1;
    PatientDiseaseDao diseaseDao;
    SignPatientLabelInfoDao labelInfoDao;
    JpaTransactionManager transactionManager;
    public PatientDiseaseToLabel(Long start, Long end) {
    public PatientDiseaseToLabel(Long start) {
        this.start = start;
        this.end = end;
        this.diseaseDao = Application.ctx.getBean(PatientDiseaseDao.class);
        this.labelInfoDao = Application.ctx.getBean(SignPatientLabelInfoDao.class);
        this.transactionManager = Application.ctx.getBean(JpaTransactionManager.class);
@@ -43,7 +41,7 @@ public class PatientDiseaseToLabel implements Runnable {
        while (flag) {
            PageRequest pageRequest = new PageRequest(0, 500);
            Page<PatientDisease> diseases = diseaseDao.findByIdRange(start,end,pageRequest);
            Page<PatientDisease> diseases = diseaseDao.findByIdRange(start,pageRequest);
            if (diseases != null && diseases.getContent().size() < 500) {
                flag = false;

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelService.java

@@ -50,7 +50,7 @@ public class SignPatientLabelService extends BaseService {
        label.setLabelCode(getCode());
        label.setLabelName(lableName);
        label.setLabelType("4");
        label.setIsSystem(1);
        label.setIsSystem(0);
        label.setCreator(creator);
        label.setTeamCode(teamCode);
        label.setStatus(1);