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

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

@@ -130,6 +130,8 @@ public class SignPatientLabelInfoService extends BaseService {
            json.put("ssDoctorHealth", ssSign.getDoctorHealth());
            json.put("ssDoctorHealthName", ssSign.getDoctorHealthName());
            json.put("ssAdminTeam", ssSign.getAdminTeamId());
            json.put("ssHospital", ssSign.getHospital());
            json.put("ssHospitalName", ssSign.getHospitalName());
            json.put("ssBeginDate", DateUtil.dateToStr(ssSign.getBegin(), DateUtil.YYYY_MM_DD));
            json.put("ssEndDate", DateUtil.dateToStr(ssSign.getEnd(), DateUtil.YYYY_MM_DD));
        }
@@ -158,6 +160,8 @@ public class SignPatientLabelInfoService extends BaseService {
            json.put("jtDoctorHealth", familySign.getDoctorHealth());
            json.put("jtDoctorHealthName", familySign.getDoctorHealthName());
            json.put("jtAdminTeam", familySign.getAdminTeamId());
            json.put("jtHospital", familySign.getHospital());
            json.put("jtHospitalName", familySign.getHospitalName());
            if ("1".equals(familySign.getExpensesStatus())) {
                json.put("qyrq", familySign.getExpensesTime() != null ? DateUtil.dateToStr((Date) familySign.getExpensesTime(), DateUtil.YYYY_MM_DD) : "");