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

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

@@ -34,5 +34,5 @@ public interface SignFamilyRenewDao extends PagingAndSortingRepository<SignFamil
    // 查询患者已生效的家庭续签约
    @Query("select a from SignFamilyRenew a where a.patient = ?1 and a.type = 2 and a.status = 0")
    SignFamily findSigningByPatient(String patient);
    SignFamilyRenew findSigningByPatient(String patient);
}

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

@@ -154,7 +154,7 @@ public class FamilyContractService extends BaseService {
     * @param patient
     * @return
     */
    public SignFamily findSigningRenewByPatient(String patient) {
    public SignFamilyRenew findSigningRenewByPatient(String patient) {
        return signFamilyRenewDao.findSigningByPatient(patient);
    }
    /**

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -8,6 +8,7 @@ import java.util.concurrent.TimeUnit;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabel;
import com.yihu.wlyy.entity.message.Message;
import com.yihu.wlyy.entity.patient.SignFamilyRenew;
import com.yihu.wlyy.logs.BusinessLogs;
import com.yihu.wlyy.repository.doctor.SignPatientLabelDao;
import com.yihu.wlyy.service.app.account.PatientInfoService;
@@ -921,7 +922,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
                    json.put("diseases", "");
                }
                SignFamily jtSign = familyContractService.findSigningRenewByPatient(patient);
                SignFamilyRenew jtSign = familyContractService.findSigningRenewByPatient(patient);
                // 家庭签约
                if (jtSign != null) {