代码修改

business/base-service/src/main/java/com/yihu/jw/device/dao/DevicePatientHealthIndexDao.java

@@ -39,7 +39,7 @@ public interface DevicePatientHealthIndexDao
			"WHERE\n" +
			"	a.type IN ('1', '2' ) \n" +
			"	AND a.record_date BETWEEN ?1 AND ?2 \n" +
			"	AND c.doctor_id =?3 \n" +
			"	AND c.doctor =?3 \n" +
			"	AND b.disease IN('1','2','3')\n" +
			"	AND b.disease_condition IN ('1','2','1,2')",nativeQuery = true)
	List<DevicePatientHealthIndex> findByDoctor(Date start, Date end, String doctorcode);

business/base-service/src/main/java/com/yihu/jw/sign/dao/WlyySignDao.java

@@ -3,10 +3,13 @@ package com.yihu.jw.sign.dao;
import com.yihu.jw.entity.door.WlyySign;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
/**
 * Created by yeshijie on 2024/7/16.
 */
public interface WlyySignDao extends JpaRepository<WlyySign, Long>, JpaSpecificationExecutor<WlyySign> {
    @Query("from WlyySign a where a.idcard = ?1")
    WlyySign findByIdcard(String idcard);
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/LabelService.java

@@ -83,6 +83,8 @@ public class LabelService {
                                sign.setEnd(json.getString("end"));
                                sign.setSignYear(json.getString("sign_year"));
                                sign.setSignSource(json.getString("sign_source"));
                                sign.setDiseaseCondition(json.getString("disease_condition"));
                                sign.setAdminTeamId(json.getString("admin_team_id"));
                                jsonArray.remove(i);
                                break;
                            }

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/dao/TrackPatientDao.java

@@ -24,7 +24,7 @@ public interface TrackPatientDao extends PagingAndSortingRepository<TrackPatient
            "INNER JOIN base_patient b ON a.patient_code=b.id \n" +
            "INNER JOIN wlyy_outpatient c ON b.id=c.patient  \n" +
            "WHERE 1=1\n" +
            "AND c.doctor_id=?1 \n" +
            "AND c.doctor=?1 \n" +
            "AND a.del=?2 ",nativeQuery = true)
    List<TrackPatient> findByDoctor(String doctor,String del);
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/service/scheme/DoctorSchemeService.java

@@ -191,7 +191,7 @@ public class DoctorSchemeService {
                sql = sql + " and dev.user is not null ";
            }
        }
        sql += " AND b.doctor_id ='" + doctorcode + "' ";
        sql += " AND b.doctor ='" + doctorcode + "' ";
        //1.4.2加入跟踪居民过滤
        if (StringUtils.isNotBlank(trackFlag) && "1".equals(trackFlag)) {
            sql += " AND tp.del='1' AND tp.doctor_code = '" + doctorcode + "' ";
@@ -466,7 +466,7 @@ public class DoctorSchemeService {
                "WHERE 1=1\n" +
                "AND a.disease_condition IN('1','2','3')\n" +
                "AND a.disease IN ('1','2','1,2','2,1')\n" +
                "AND b.doctor_id ='" + doctorcode + "'";
                "AND b.doctor ='" + doctorcode + "'";
        patients = jdbcTemplate.query(patientsql, new BeanPropertyRowMapper(PatientVO.class));