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

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/common/thread/LoadThread.java

@@ -20,7 +20,7 @@ public class LoadThread implements Runnable {
    Integer morningHours = 6;
    //默认线程间隔
    Integer sleepTime = 600;
    Integer sleepTime = 180;
    @Override
    public void run() {
@@ -51,7 +51,7 @@ public class LoadThread implements Runnable {
                            System.out.print(DateUtil.dateToStrLong(new Date()) + " 采集签约结束。\r\n");
                        }
                        Thread.sleep(sleepTime*1000);
                        Thread.sleep(sleepTime*1000);//间隔三分钟
                        continue;
                    }
                    else{

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/SignZYService.java

@@ -580,7 +580,7 @@ public class SignZYService {
                else{
                    boolean needSave = false;
                    //社保卡号（为空填值）
                    if(!StringUtil.isEmpty(patientCardNo) && StringUtil.isEmpty(patient.getSsc()))
                    if(!StringUtil.isEmpty(patientCardNo) && ( StringUtil.isEmpty(patient.getSsc()) || !patientCardNo.equals(patient.getSsc())))
                    {
                        patient.setSsc(patientCardNo);
                        needSave = true;