|
|
@@ -5,6 +5,7 @@ import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import thyyxxk.webserver.config.auth.PassToken;
|
|
|
import thyyxxk.webserver.config.exception.ExceptionEnum;
|
|
|
+import thyyxxk.webserver.constants.sidicts.MedType;
|
|
|
import thyyxxk.webserver.dao.his.inpatient.PatientDao;
|
|
|
import thyyxxk.webserver.entity.ResultVo;
|
|
|
import thyyxxk.webserver.entity.medicalinsurance.inpatient.ZyPatientInfo;
|
|
|
@@ -13,6 +14,7 @@ import thyyxxk.webserver.entity.inpatient.patient.Patient;
|
|
|
import thyyxxk.webserver.service.medicalinsurance.SiZyService;
|
|
|
import thyyxxk.webserver.service.inpatient.DismissService;
|
|
|
import thyyxxk.webserver.utils.ResultVoUtil;
|
|
|
+import thyyxxk.webserver.utils.StringUtil;
|
|
|
import thyyxxk.webserver.utils.TokenUtil;
|
|
|
|
|
|
import java.util.List;
|
|
|
@@ -97,7 +99,7 @@ public class DismissController {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "未找到住院号【" + param.getInpatientNo() + "】的在院业务。");
|
|
|
}
|
|
|
p.setTable(table);
|
|
|
- if (p.getMedType().equals("01")) {
|
|
|
+ if (StringUtil.isBlank(p.getMedType()) || p.getMedType().equals(MedType.SELF_PAY.getCode())) {
|
|
|
MedinsSettleFee feePojo = new MedinsSettleFee();
|
|
|
feePojo.setInpatientNo(p.getInpatientNo());
|
|
|
feePojo.setAdmissTimes(p.getAdmissTimes());
|
|
|
@@ -114,6 +116,7 @@ public class DismissController {
|
|
|
zyPatientInfo.setInpatientNo(param.getInpatientNo());
|
|
|
zyPatientInfo.setAdmissTimes(param.getAdmissTimes());
|
|
|
zyPatientInfo.setMidSetl(param.getDismissFlag() == 2);
|
|
|
+ zyPatientInfo.setZjdzDatetime(param.getZjdzDatetime());
|
|
|
zyPatientInfo.setStaffId(param.getStaffId());
|
|
|
return zyService.dischargeProcessing(zyPatientInfo);
|
|
|
}
|
