|
@@ -18,9 +18,19 @@ import cn.hnthyy.thmz.entity.his.zd.ZdChargeItem;
|
|
|
import cn.hnthyy.thmz.entity.his.zd.ZdChequeType;
|
|
|
import cn.hnthyy.thmz.entity.his.zd.ZdUnitCode;
|
|
|
import cn.hnthyy.thmz.entity.his.zy.ZyZdAuditItem;
|
|
|
-import cn.hnthyy.thmz.entity.thmz.*;
|
|
|
-import cn.hnthyy.thmz.enums.*;
|
|
|
+import cn.hnthyy.thmz.entity.thmz.Clinic;
|
|
|
+import cn.hnthyy.thmz.entity.thmz.HybirdTest;
|
|
|
+import cn.hnthyy.thmz.entity.thmz.PayInfo;
|
|
|
+import cn.hnthyy.thmz.entity.thmz.TurnToConsultation;
|
|
|
+import cn.hnthyy.thmz.entity.thmz.User;
|
|
|
+import cn.hnthyy.thmz.entity.thmz.Windows;
|
|
|
+import cn.hnthyy.thmz.enums.ClinicStatusEnum;
|
|
|
+import cn.hnthyy.thmz.enums.GenderEnum;
|
|
|
+import cn.hnthyy.thmz.enums.MzfzStatusEnum;
|
|
|
+import cn.hnthyy.thmz.enums.PayMarkEnum;
|
|
|
+import cn.hnthyy.thmz.enums.YesNoEnum;
|
|
|
import cn.hnthyy.thmz.pageDto.MzChargeDetailPageDto;
|
|
|
+import cn.hnthyy.thmz.service.his.ResponceTypeService;
|
|
|
import cn.hnthyy.thmz.service.his.mz.*;
|
|
|
import cn.hnthyy.thmz.service.his.yp.YpZdDictService;
|
|
|
import cn.hnthyy.thmz.service.his.yp.YpZdDrugKindService;
|
|
@@ -28,10 +38,21 @@ import cn.hnthyy.thmz.service.his.zd.JcJyItemChargeService;
|
|
|
import cn.hnthyy.thmz.service.his.zd.ZdChargeItemService;
|
|
|
import cn.hnthyy.thmz.service.his.zd.ZdChequeTypeService;
|
|
|
import cn.hnthyy.thmz.service.his.zd.ZdUnitCodeService;
|
|
|
-import cn.hnthyy.thmz.service.his.zy.ZyActpatientService;
|
|
|
import cn.hnthyy.thmz.service.his.zy.ZyZdAuditItemService;
|
|
|
-import cn.hnthyy.thmz.service.thmz.*;
|
|
|
-import cn.hnthyy.thmz.vo.*;
|
|
|
+import cn.hnthyy.thmz.service.thmz.ClinicService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.HaiCiAdapterService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.HybirdTestService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.RationalUseService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.TransactionService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.TsmzService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.TurnToConsultationService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.UserDeptRelationService;
|
|
|
+import cn.hnthyy.thmz.service.thmz.WindowsService;
|
|
|
+import cn.hnthyy.thmz.vo.ChargeFeeParamsVo;
|
|
|
+import cn.hnthyy.thmz.vo.MzDepositFileVo;
|
|
|
+import cn.hnthyy.thmz.vo.MzPrescriptionVo;
|
|
|
+import cn.hnthyy.thmz.vo.PageViewVo;
|
|
|
+import cn.hnthyy.thmz.vo.ThmzmxsrParamsVo;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
@@ -42,12 +63,16 @@ import org.json.JSONObject;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.dao.DataIntegrityViolationException;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -110,6 +135,8 @@ public class MzChargeDetailController {
|
|
|
private ZdChequeTypeService zdChequeTypeService;
|
|
|
@Value("${healthEducationUrl}")
|
|
|
private String healthEducationUrl;
|
|
|
+ @Resource
|
|
|
+ private ResponceTypeService responceTypeService;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -1921,6 +1948,9 @@ public class MzChargeDetailController {
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("data", mzChargeDetailService.getMzPrescriptionVo(patientId, times, MzBlRecordFlag, payMark));
|
|
|
MzPatientMi mzPatientMi = mzPatientMiService.queryByPatientId(patientId);
|
|
|
+ if(mzPatientMi !=null && StrUtil.isNotBlank(mzPatientMi.getResponseType())){
|
|
|
+ mzPatientMi.setResponseTypeName(responceTypeService.queryMzNameByCode(mzPatientMi.getResponseType()));
|
|
|
+ }
|
|
|
if (PayMarkEnum.CHARGED.code.equals(payMark)) {
|
|
|
mzPatientMi.setGender(GenderEnum.getGenderByCode(mzPatientMi.getSex()).name);
|
|
|
}
|