|
|
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -105,7 +106,6 @@ public class PatientService {
|
|
|
}
|
|
|
|
|
|
public Patient getPatientBaseInfo(String inpatientNo, Integer times, String inOutStatusFlag) {
|
|
|
-
|
|
|
Patient data = dao.getPatientInfo(inpatientNo, "1".equals(inOutStatusFlag) ? "zy_inactpatient" : "zy_actpatient", times);
|
|
|
String msg = "1".equals(inOutStatusFlag) ? "出院" : "在院";
|
|
|
if (null == data) {
|
|
|
@@ -220,7 +220,7 @@ public class PatientService {
|
|
|
*
|
|
|
* @param data 患者数据
|
|
|
*/
|
|
|
- private void setExpenseInformation(Patient data) {
|
|
|
+ private void setExpenseInformation(@NotNull Patient data) {
|
|
|
data.setMedTypeName(MedType.getName(data.getMedType()));
|
|
|
data.setDutyNurseName(redis.getEmployeeName(data.getDutyNurse()));
|
|
|
|
