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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -96,16 +96,6 @@ public class SignPatientLabelInfoService extends BaseService {
        // 社保号
        json.put("ssc", p.getSsc());
        if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
            String epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
            if (StringUtils.isEmpty(epTime)) {
                json.put("expensesRemindStatus", 0);
            } else {
                json.put("expensesRemindStatus", new SimpleDateFormat("yyyy-MM-dd").format(new Date()).equals(epTime) ? 1 : 0);
            }
        }
        if(signs != null && signs.size() > 0){
            SignFamily ssSign = null;
            SignFamily familySign = null;
@@ -149,6 +139,16 @@ public class SignPatientLabelInfoService extends BaseService {
                    json.put("qyrq", familySign.getExpensesTime() != null ? DateUtil.dateToStr((Date) familySign.getExpensesTime(), DateUtil.YYYY_MM_DD) : "");
                }
            }
            if (json.has("expensesStatus") && (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0"))) {
                String epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                if (StringUtils.isEmpty(epTime)) {
                    json.put("expensesRemindStatus", 0);
                } else {
                    json.put("expensesRemindStatus", new SimpleDateFormat("yyyy-MM-dd").format(new Date()).equals(epTime) ? 1 : 0);
                }
            }
        }
        return result;