成都二院

tran-service/src/main/java/com/diagbot/facade/PatientInfoDjFacade.java

@@ -30,6 +30,7 @@ import com.google.common.collect.Lists;
 import com.google.gson.JsonObject;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ContentType;
@@ -417,36 +418,37 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
             signInDTOS.forEach(signInDTO -> {
                 //病人信息
                 PatientInfo patientInfo = new PatientInfo();
-                patientInfo.setCode(!signInDTO.getPatientCode().isEmpty() ? signInDTO.getPatientCode() : "");
-                patientInfo.setHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
-                patientInfo.setSex(Integer.valueOf(!signInDTO.getSex().isEmpty() ? signInDTO.getSex() : ""));
-                patientInfo.setName(!signInDTO.getPatientName().isEmpty() ? signInDTO.getPatientName() : "");
-                patientInfo.setBirthday(DateUtil.parseDate(!signInDTO.getBirthday().isEmpty() ? signInDTO.getBirthday() : ""));
-                patientInfo.setIdentityNum(!signInDTO.getIdentityNum().isEmpty() ? signInDTO.getIdentityNum() : "");
+                patientInfo.setCode(StringUtils.isNotEmpty(signInDTO.getPatientCode()) ? signInDTO.getPatientCode() : "");
+                patientInfo.setHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
+                patientInfo.setSex(Integer.valueOf(StringUtils.isNotEmpty(signInDTO.getSex()) ? signInDTO.getSex() : ""));
+                patientInfo.setName(StringUtils.isNotEmpty(signInDTO.getPatientName()) ? signInDTO.getPatientName() : "");
+                patientInfo.setBirthday(DateUtil.parseDate(StringUtils.isNotEmpty(signInDTO.getBirthday()) ? signInDTO.getBirthday() : ""));
+                patientInfo.setIdentityNum(StringUtils.isNotEmpty(signInDTO.getIdentityNum())? signInDTO.getIdentityNum() : "");
+                patientInfo.setIdNo(StringUtils.isNotEmpty(signInDTO.getPatientCode()) ? signInDTO.getPatientCode() : "");
                 //医生信息
                 DoctorInfo doctorInfo = new DoctorInfo();
-                doctorInfo.setHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
-                doctorInfo.setHospitalDeptCode(!signInDTO.getHospitalDeptCode().isEmpty() ? signInDTO.getHospitalDeptCode() : "");
-                doctorInfo.setSex(Integer.valueOf(!signInDTO.getSex().isEmpty() ? signInDTO.getSex() : ""));
-                doctorInfo.setName(!signInDTO.getDoctorName().isEmpty() ? signInDTO.getDoctorName() : "");
-                doctorInfo.setCode(!signInDTO.getDoctorCode().isEmpty() ? signInDTO.getDoctorCode() : "");
+                doctorInfo.setHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
+                doctorInfo.setHospitalDeptCode(StringUtils.isNotEmpty(signInDTO.getHospitalDeptCode()) ? signInDTO.getHospitalDeptCode() : "");
+                doctorInfo.setSex(Integer.valueOf(StringUtils.isNotEmpty(signInDTO.getSex()) ? signInDTO.getSex() : ""));
+                doctorInfo.setName(StringUtils.isNotEmpty(signInDTO.getDoctorName()) ? signInDTO.getDoctorName() : "");
+                doctorInfo.setCode(StringUtils.isNotEmpty(signInDTO.getDoctorCode()) ? signInDTO.getDoctorCode() : "");
                 //病人详情
                 List<RegisterInfoDetailDTO> detail = new ArrayList<>();
                 RegisterInfoDetailDTO registerInfoDetailDTO = new RegisterInfoDetailDTO();
                 registerInfoDetailDTO.setDoctorInfo(doctorInfo);
-                registerInfoDetailDTO.setRecordTime(!signInDTO.getRecordTime().isEmpty()?signInDTO.getRecordTime():"");
-                registerInfoDetailDTO.setRegisterNum(!signInDTO.getRegisterNum().isEmpty() ? signInDTO.getRegisterNum() : "");
-                registerInfoDetailDTO.setHospitalDeptName(!signInDTO.getHospitalDeptName().isEmpty() ? signInDTO.getHospitalDeptName() : "");
-                registerInfoDetailDTO.setRecordId(!signInDTO.getRecordId().isEmpty() ? signInDTO.getRecordId() : "");
-                registerInfoDetailDTO.setRegisterNum(!signInDTO.getRegisterNum().isEmpty() ? signInDTO.getRegisterNum() : "");
-                registerInfoDetailDTO.setHospitalDeptCode(!signInDTO.getHospitalDeptCode().isEmpty() ? signInDTO.getHospitalDeptCode() : "");
+                registerInfoDetailDTO.setRecordTime(StringUtils.isNotEmpty(signInDTO.getRecordTime())?signInDTO.getRecordTime():"");
+                registerInfoDetailDTO.setRegisterNum(StringUtils.isNotEmpty(signInDTO.getRegisterNum()) ? signInDTO.getRegisterNum() : "");
+                registerInfoDetailDTO.setHospitalDeptName(StringUtils.isNotEmpty(signInDTO.getHospitalDeptName()) ? signInDTO.getHospitalDeptName() : "");
+                registerInfoDetailDTO.setRecordId(StringUtils.isNotEmpty(signInDTO.getRecordId()) ? signInDTO.getRecordId() : "");
+                registerInfoDetailDTO.setRegisterNum(StringUtils.isNotEmpty(signInDTO.getRegisterNum()) ? signInDTO.getRegisterNum() : "");
+                registerInfoDetailDTO.setHospitalDeptCode(StringUtils.isNotEmpty(signInDTO.getHospitalDeptCode()) ? signInDTO.getHospitalDeptCode() : "");
                 detail.add(registerInfoDetailDTO);
                 //医院挂号信息
                 RegisterInfoDTO registerInfoDTO = new RegisterInfoDTO();
-                registerInfoDTO.setHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
-                registerInfoDTO.setHospitalName(!signInDTO.getHospitalName().isEmpty() ? signInDTO.getHospitalName() : "");
-                registerInfoDTO.setSonHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
-                registerInfoDTO.setSonHospitalName(!signInDTO.getHospitalName().isEmpty() ? signInDTO.getHospitalName() : "");
+                registerInfoDTO.setHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
+                registerInfoDTO.setHospitalName(StringUtils.isNotEmpty(signInDTO.getHospitalName()) ? signInDTO.getHospitalName() : "");
+                registerInfoDTO.setSonHospitalCode(StringUtils.isNotEmpty(signInDTO.getHospitalCode()) ? signInDTO.getHospitalCode() : "");
+                registerInfoDTO.setSonHospitalName(StringUtils.isNotEmpty(signInDTO.getHospitalName()) ? signInDTO.getHospitalName() : "");
                 registerInfoDTO.setPatientInfo(patientInfo);
                 registerInfoDTO.setDetail(detail);
                 registerInfoDTOS.add(registerInfoDTO);