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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/SignFamilyDao.java

@@ -35,6 +35,9 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    @Query("select a from SignFamily a where a.patient = ?1 and status = ?2 and a.type = 2")
    SignFamily findByPatientCodeStatus(String patient, int status);
    @Query("select a from SignFamily a where a.patient = ?1 and status >= ?2 and a.type = 2")
    SignFamily findByPatientCodeStatus2(String patient, int status);
    @Query("select a from SignFamily a where a.patient = ?1 and a.type = ?2 and a.status >= 1")
    SignFamily findByPatientAndType(String patient, int type);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -2459,7 +2459,7 @@ public class SignWebService extends BaseService {
        patient.setSickVillage(countryCode);
        patient.setSickVillageName(country.getName());
        patientService.save(patient);
        SignFamily signFamily = signFamilyDao.findByPatientCodeStatus(patientCode,0);
        SignFamily signFamily = signFamilyDao.findByPatientCodeStatus2(patientCode,0);
        if(signFamily!=null){
            signFamily.setSickVillage(countryCode);
            signFamily.setSickVillageName(country.getName());