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

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

@@ -1973,34 +1973,34 @@ public class FamilyContractService extends BaseService {
        Map<String, JSONObject> docMap = new HashMap<>();
        SignFamily ssSign = signFamilyDao.findSignByPatient(patient, 1);
        SignFamily jtSign = signFamilyDao.findSignByPatient(patient, 2);
        JSONArray ssArray = new JSONArray();
        JSONArray jtArray = new JSONArray();
        JSONObject ssArray = new JSONObject();
        JSONObject jtArray = new JSONObject();
        if (ssSign != null) {
            JSONObject qkDoc = new JSONObject();
            qkDoc.put("doctor",ssSign.getDoctor());
            qkDoc.put("doctorName",ssSign.getDoctorName());
            ssArray.put(qkDoc);
            ssArray.put("doctor", qkDoc);
            JSONObject jgDoc = new JSONObject();
            jgDoc.put("doctorHealth",ssSign.getDoctorHealth());
            jgDoc.put("doctorHealthName",ssSign.getDoctorHealthName());
            jgDoc.put("doctor",ssSign.getDoctorHealth());
            jgDoc.put("doctorName",ssSign.getDoctorHealthName());
            ssArray.put(qkDoc);
            ssArray.put("doctorHealth", jgDoc);
        }
        if (jtSign != null) {
            JSONObject qkDoc = new JSONObject();
            qkDoc.put("doctor",jtSign.getDoctor());
            qkDoc.put("doctorName",jtSign.getDoctorName());
            jtArray.put(qkDoc);
            jtArray.put("doctor", qkDoc);
            JSONObject jgDoc = new JSONObject();
            jgDoc.put("doctorHealth",jtSign.getDoctorHealth());
            jgDoc.put("doctorHealthName",jtSign.getDoctorHealthName());
            jgDoc.put("doctor",jtSign.getDoctorHealth());
            jgDoc.put("doctorName",jtSign.getDoctorHealthName());
            jtArray.put(qkDoc);
            jtArray.put("doctorHealth", jgDoc);
        }
        result.put("ssSign",ssArray);