|
|
@ -359,12 +359,14 @@ public class SignWebService extends BaseService {
|
|
|
List<SignFamily> signFamilys = signFamilyDao.findAllActiveSignByPatient(patient);
|
|
|
JSONArray jsonArray = new JSONArray();
|
|
|
for(SignFamily signFamily: signFamilys){
|
|
|
AdminTeam adminTeam = new AdminTeam();
|
|
|
Doctor doctor = new Doctor();
|
|
|
AdminTeam adminTeam = null;
|
|
|
Doctor doctor = null;
|
|
|
if(signFamily.getAdminTeamId()!=null){
|
|
|
adminTeam = adminTeamService.getTeam(signFamily.getAdminTeamId());
|
|
|
doctor = doctorService.findDoctorByCode(adminTeam.getLeaderCode());
|
|
|
}
|
|
|
if(adminTeam==null)adminTeam = new AdminTeam();
|
|
|
if(doctor==null)doctor = new Doctor();
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
jsonObject.put("hospitalName",signFamily.getHospitalName());
|
|
|
jsonObject.put("hospital",signFamily.getHospital());
|
|
|
@ -379,7 +381,7 @@ public class SignWebService extends BaseService {
|
|
|
jsonObject.put("doctorHealth",signFamily.getDoctorHealth());
|
|
|
jsonObject.put("doctorName",signFamily.getDoctorName());
|
|
|
jsonObject.put("doctorHealthName",signFamily.getDoctorHealthName());
|
|
|
jsonObject.put("expensesStatus",signFamily.getExpensesStatus());
|
|
|
jsonObject.put("expensesStatus",StringUtils.isNotBlank(signFamily.getExpensesStatus())?signFamily.getExpensesStatus():"1");
|
|
|
jsonObject.put("applyDate",signFamily.getApplyDate());
|
|
|
jsonObject.put("type",signFamily.getType());
|
|
|
jsonObject.put("typeName",signFamily.getType()==1?"三师签约":"家庭签约");
|
