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

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

@@ -120,6 +120,12 @@ public class SignPatientLabelInfoService extends BaseService {
                json.put("signType", 1);
                // 设置签约状态
                json.put("ssStatus", ssSign.getStatus());
                json.put("ssDoctor",ssSign.getDoctor());
                json.put("ssDoctorName",ssSign.getDoctorName());
                json.put("ssDoctorHealth",ssSign.getDoctorHealth());
                json.put("ssDoctorHealthName",ssSign.getDoctorHealthName());
                json.put("ssAdminTeam",ssSign.getAdminTeamId());
            }
            if (familySign != null) {
                // 设置患者紧急联系人
@@ -139,6 +145,10 @@ public class SignPatientLabelInfoService extends BaseService {
                // 设置签约状态
                json.put("familyStatus", familySign.getStatus());
                json.put("jtDoctor",familySign.getDoctor());
                json.put("jtDoctorHealth",familySign.getDoctorHealth());
                json.put("jtAdminTeam",familySign.getAdminTeamId());
                if ("1".equals(familySign.getExpensesStatus())) {
                    json.put("qyrq", familySign.getExpensesTime() != null ? DateUtil.dateToStr((Date) familySign.getExpensesTime(), DateUtil.YYYY_MM_DD) : "");
                }