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

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

@@ -903,10 +903,8 @@ public class FamilyContractService extends BaseService {
        if (sc != null) {
            throw new Exception("已签约了家庭医生！");
        }
        // 查询该患者是否已注册
        Patient patient = patientDao.findByIdcard(idcard);
        //1.3.7.2  判断是否建档---------------------------
        String rp = familyContractService.getSickArchiveFlag(patient.getCode());
        String rp = familyContractService.checkSickArchiveFlag(idcard);
        if("0".equals(rp)){
            return "-1";
        }
@@ -978,6 +976,8 @@ public class FamilyContractService extends BaseService {
            signWebService.setSevId(sf, sevId);
        }
        // 查询该患者是否已注册
        Patient patient = patientDao.findByIdcard(idcard);
        if (patient == null) {
            // 插入患者基本信息
            IdcardInfoExtractor ie = new IdcardInfoExtractor(idcard);
@@ -4074,4 +4074,11 @@ public class FamilyContractService extends BaseService {
        return rs ;
    }
    public String checkSickArchiveFlag(String idCard)throws Exception{
        String rs = jwArchivesService.getSickArchiveFlag(idCard);
        return rs ;
    }
}