|
@@ -76,21 +76,24 @@ public class ReportApiController {
|
|
|
report.setVisitingHospital(visitingHospital);
|
|
|
report.setVisitingHospitalName(visitingHospitalName);
|
|
|
dataDictionary = dataDictionaryService.findByCatalogNameAndValue("就诊医院", report.getVisitingHospital());
|
|
|
- if(dataDictionary != null && !"其他".equals(dataDictionary.getName())) report.setVisitingHospitalName(dataDictionary.getName());
|
|
|
+ if(dataDictionary != null && !"其他".equals(dataDictionary.getName())) {
|
|
|
+ report.setVisitingHospitalName(dataDictionary.getName());
|
|
|
+ }
|
|
|
report.setInsuranceType(insuranceType);
|
|
|
report.setWhatHappened(whatHappened);
|
|
|
report.setRemark(remark);
|
|
|
report.setVisitingDepartment(visitingDepartment);
|
|
|
report.setAdmissionNumber(admissionNumber);
|
|
|
- if(report.getIsDischarged() == null) report.setIsDischarged(false);
|
|
|
+ if(isDischarged == null){
|
|
|
+ report.setIsDischarged(false);
|
|
|
+ }
|
|
|
+ else{
|
|
|
+ report.setIsDischarged(isDischarged);
|
|
|
+ }
|
|
|
if(report.getIsOutland() == null) report.setIsOutland(false);
|
|
|
report.setDelFlag(false);
|
|
|
report.setCreateBy("8ed505d2-e36b-4343-bffb-1de9972b1f75");
|
|
|
report.setCreateTime(new Date());
|
|
|
- dataDictionary = dataDictionaryService.findByCatalogNameAndValue("就诊医院", report.getVisitingHospital());
|
|
|
- if(dataDictionary != null && !"其他".equals(dataDictionary.getName())) {
|
|
|
- report.setVisitingHospitalName(dataDictionary.getName());
|
|
|
- }
|
|
|
|
|
|
int affectCount = reportService.insert(report);
|
|
|
|