|
@@ -81,6 +81,7 @@ public class MzChargeDetailController {
|
|
|
private YpZdDictService ypZdDictService;
|
|
|
@Autowired
|
|
|
private YpZdDrugKindService ypZdDrugKindService;
|
|
|
+
|
|
|
/**
|
|
|
* 查询费用列表
|
|
|
*
|
|
@@ -364,8 +365,8 @@ public class MzChargeDetailController {
|
|
|
int receiptNo = mzChargeDetailService.chargeFeeForByjz(tokenUser.getUserIdCode(), mzDepositFileVo);
|
|
|
resultMap.put("receiptNo", receiptNo);
|
|
|
} else {
|
|
|
- String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
- int receiptNo = mzChargeDetailService.chargeFee(tokenUser.getUserIdCode(), mzDepositFileVo,ipAddress);
|
|
|
+ String ipAddress = HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ int receiptNo = mzChargeDetailService.chargeFee(tokenUser.getUserIdCode(), mzDepositFileVo, ipAddress);
|
|
|
resultMap.put("receiptNo", receiptNo);
|
|
|
}
|
|
|
resultMap.put("code", 0);
|
|
@@ -423,8 +424,8 @@ public class MzChargeDetailController {
|
|
|
resultMap.put("message", "病人姓名更新成功");
|
|
|
return resultMap;
|
|
|
} catch (Exception e) {
|
|
|
- if (e instanceof DataIntegrityViolationException){
|
|
|
- if(e.getMessage().contains("将截断字符串或二进制数据")){
|
|
|
+ if (e instanceof DataIntegrityViolationException) {
|
|
|
+ if (e.getMessage().contains("将截断字符串或二进制数据")) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "病人姓名超长");
|
|
|
log.error("系统异常,错误信息{病人姓名超长}");
|
|
@@ -482,7 +483,7 @@ public class MzChargeDetailController {
|
|
|
mzChargeDetailYb.setPatientId(mzChargeDetail.getPatientId());
|
|
|
mzChargeDetailYb.setTimes(mzChargeDetail.getTimes());
|
|
|
mzChargeDetailYb.setReceiptNo(mzChargeDetail.getReceiptNo());
|
|
|
- // int count = mzChargeDetailYbService.queryTmCount(mzChargeDetailYb);
|
|
|
+ // int count = mzChargeDetailYbService.queryTmCount(mzChargeDetailYb);
|
|
|
for (MzChargeDetail md : mzChargeDetailList) {
|
|
|
if ("TC".equals(md.getBillItemCode()) || Constants.SSWRF.equals(md.getBillItemCode())) {
|
|
|
removeList.add(md);
|
|
@@ -768,8 +769,8 @@ public class MzChargeDetailController {
|
|
|
DecodedJWT decodedJWT = TokenUtil.parseJWT(token);
|
|
|
User tokenUser = (User) JsonUtil.jsontoObject(decodedJWT.getSubject(), User.class);
|
|
|
//如果返回的是0,表示全退,大于0,表示新的收费记录的就诊次数
|
|
|
- String ipAddress=HttpUtil.getIPAddress(httpServletRequest);
|
|
|
- int times = mzChargeDetailService.refundFee(tokenUser.getUserIdCode(), mzDepositFileVo,ipAddress);
|
|
|
+ String ipAddress = HttpUtil.getIPAddress(httpServletRequest);
|
|
|
+ int times = mzChargeDetailService.refundFee(tokenUser.getUserIdCode(), mzDepositFileVo, ipAddress);
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("times", times);
|
|
|
resultMap.put("patientId", mzDepositFileVo.getPatientId());
|
|
@@ -831,7 +832,7 @@ public class MzChargeDetailController {
|
|
|
chargeFeeParamsVo.setSerialNo("%" + chargeFeeParamsVo.getSerialNo() + "%");
|
|
|
}
|
|
|
resultMap.put("code", 0);
|
|
|
- resultMap.put("mzChargeDetailList", mzChargeDetailService.queryChargeListByPatient(chargeFeeParamsVo.getPatientId(), chargeFeeParamsVo.getName(), chargeFeeParamsVo.getSerialNo(), chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate(),chargeFeeParamsVo.getWarnDept()));
|
|
|
+ resultMap.put("mzChargeDetailList", mzChargeDetailService.queryChargeListByPatient(chargeFeeParamsVo.getPatientId(), chargeFeeParamsVo.getName(), chargeFeeParamsVo.getSerialNo(), chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate(), chargeFeeParamsVo.getWarnDept()));
|
|
|
resultMap.put("message", "查询病人缴费记录成功");
|
|
|
return resultMap;
|
|
|
} catch (Exception e) {
|
|
@@ -932,7 +933,7 @@ public class MzChargeDetailController {
|
|
|
resultMap.put("message", "病人id不能为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- List<Map<String, Object>> mzChargeDetailList = mzChargeDetailService.queryChargeListByPatient("%" + chargeFeeParamsVo.getPatientId() + "%", null, null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate(),chargeFeeParamsVo.getWarnDept());
|
|
|
+ List<Map<String, Object>> mzChargeDetailList = mzChargeDetailService.queryChargeListByPatient("%" + chargeFeeParamsVo.getPatientId() + "%", null, null, chargeFeeParamsVo.getBeginDate(), chargeFeeParamsVo.getEndDate(), chargeFeeParamsVo.getWarnDept());
|
|
|
List<Map<String, Object>> data = new ArrayList<>();
|
|
|
if (mzChargeDetailList != null) {
|
|
|
StringBuilder sbf = new StringBuilder();
|
|
@@ -1043,22 +1044,22 @@ public class MzChargeDetailController {
|
|
|
return resultMap;
|
|
|
}
|
|
|
//因为医生当天开的处方还没有日结,所以需要按照收费日期查询
|
|
|
- if(!DateUtil.getFirstSecond(thmzmxsrParamsVo.getBeginDate()).before(DateUtil.getFirstSecond())){
|
|
|
+ if (!DateUtil.getFirstSecond(thmzmxsrParamsVo.getBeginDate()).before(DateUtil.getFirstSecond())) {
|
|
|
thmzmxsrParamsVo.setDateType(YesNoEnum.NO.code.toString());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
thmzmxsrParamsVo.setDateType(YesNoEnum.YES.code.toString());
|
|
|
}
|
|
|
if (StringUtils.isBlank(thmzmxsrParamsVo.getExecDept())) {
|
|
|
thmzmxsrParamsVo.setExecDept(null);
|
|
|
}
|
|
|
//如果门诊医生或者科室核算标志不为空,设置科室或者医生信息
|
|
|
- if(thmzmxsrParamsVo.getType()!=null){
|
|
|
+ if (thmzmxsrParamsVo.getType() != null) {
|
|
|
User tokenUser = TokenUtil.getUser(httpServletRequest);
|
|
|
- if(thmzmxsrParamsVo.getType()==1){
|
|
|
+ if (thmzmxsrParamsVo.getType() == 1) {
|
|
|
thmzmxsrParamsVo.setJzSqDoctor(tokenUser.getUserIdCode());
|
|
|
- }else {
|
|
|
- Employee employee= employeeService.queryByUserCode(tokenUser.getUserIdCode());
|
|
|
- if(employee!=null){
|
|
|
+ } else {
|
|
|
+ Employee employee = employeeService.queryByUserCode(tokenUser.getUserIdCode());
|
|
|
+ if (employee != null) {
|
|
|
thmzmxsrParamsVo.setExecDept(employee.getDeptCode());
|
|
|
}
|
|
|
}
|
|
@@ -1102,48 +1103,48 @@ public class MzChargeDetailController {
|
|
|
List<ZyZdAuditItem> zyZdAuditItems = zyZdAuditItemService.querytAll();
|
|
|
//实际项目与父类码对应关系,因为数据查询中的父类码不准
|
|
|
Map<String, ZyZdAuditItem> auditMap = zyZdAuditItems.stream().collect(Collectors.toMap(ZyZdAuditItem::getCode, zyZdAuditItem -> zyZdAuditItem));
|
|
|
- List<YpZdDrugKind> ypZdDrugKinds=ypZdDrugKindService.queryAllYpZdDrugKind();
|
|
|
+ List<YpZdDrugKind> ypZdDrugKinds = ypZdDrugKindService.queryAllYpZdDrugKind();
|
|
|
//药品类型与住院发票编码关系
|
|
|
- Map<String, String> ypTypeMap =ypZdDrugKinds.stream().collect(Collectors.toMap(YpZdDrugKind::getCode, YpZdDrugKind::getYpType));
|
|
|
+ Map<String, String> ypTypeMap = ypZdDrugKinds.stream().collect(Collectors.toMap(YpZdDrugKind::getCode, YpZdDrugKind::getYpType));
|
|
|
if (depetBusinessReports.size() > 0) {
|
|
|
List<String> chargeItemCodes = new ArrayList<>(depetBusinessReports.stream().map(d -> (String) d.get("charge_item_code")).collect(Collectors.toSet()));
|
|
|
//构造收费编码与核算码关系
|
|
|
List<ZdChargeItem> zdChargeItemList = zdChargeItemService.queryZdChargeItemByCodeList(chargeItemCodes);
|
|
|
Map<String, String> zdChargeItemMap = new HashMap<>();
|
|
|
- if(zdChargeItemList!=null && zdChargeItemList.size()>0){
|
|
|
+ if (zdChargeItemList != null && zdChargeItemList.size() > 0) {
|
|
|
for (ZdChargeItem zdChargeItem : zdChargeItemList) {
|
|
|
zdChargeItemMap.put(zdChargeItem.getCode(), zdChargeItem.getAuditCode());
|
|
|
}
|
|
|
}
|
|
|
- List<YpZdDict> ypZdDictList= ypZdDictService.queryYpZdDictByCodeList(chargeItemCodes);
|
|
|
- if(ypZdDictList!=null && ypZdDictList.size()>0){
|
|
|
+ List<YpZdDict> ypZdDictList = ypZdDictService.queryYpZdDictByCodeList(chargeItemCodes);
|
|
|
+ if (ypZdDictList != null && ypZdDictList.size() > 0) {
|
|
|
for (YpZdDict ypZdDict : ypZdDictList) {
|
|
|
- if(zdChargeItemMap.containsKey(ypZdDict.getCode())){
|
|
|
+ if (zdChargeItemMap.containsKey(ypZdDict.getCode())) {
|
|
|
continue;
|
|
|
}
|
|
|
- String ypType= ypTypeMap.get(ypZdDict.getDrugKind());
|
|
|
- String auditCode="";
|
|
|
- if(ypType.equals("1")){
|
|
|
- auditCode="20";
|
|
|
- }else if(ypType.equals("2")){
|
|
|
- auditCode="21";
|
|
|
- }else if(ypType.equals("3")){
|
|
|
- auditCode="22";
|
|
|
- }else if(ypType.equals("4")){
|
|
|
- auditCode="62";
|
|
|
+ String ypType = ypTypeMap.get(ypZdDict.getDrugKind());
|
|
|
+ String auditCode = "";
|
|
|
+ if (ypType.equals("1")) {
|
|
|
+ auditCode = "20";
|
|
|
+ } else if (ypType.equals("2")) {
|
|
|
+ auditCode = "21";
|
|
|
+ } else if (ypType.equals("3")) {
|
|
|
+ auditCode = "22";
|
|
|
+ } else if (ypType.equals("4")) {
|
|
|
+ auditCode = "62";
|
|
|
}
|
|
|
zdChargeItemMap.put(ypZdDict.getCode(), auditCode);
|
|
|
}
|
|
|
}
|
|
|
for (Map<String, Object> map : depetBusinessReports) {
|
|
|
repeatSet.add((Date) map.get("charge_dcount_date"));
|
|
|
- String chargeItemCode=(String)map.get("charge_item_code");
|
|
|
+ String chargeItemCode = (String) map.get("charge_item_code");
|
|
|
String auditCode = zdChargeItemMap.get(chargeItemCode);
|
|
|
ZyZdAuditItem zyZdAuditItem = auditMap.get(auditCode);
|
|
|
if (zyZdAuditItem != null) {
|
|
|
map.put("parent", zyZdAuditItem.getParentCode());
|
|
|
map.put("audit_code", zyZdAuditItem.getName());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
log.info(" 没有父类型{}", chargeItemCode);
|
|
|
}
|
|
|
map.put("exec_dept", zdUnitCodeService.queryDeptNameByIdInCache((String) map.get("exec_dept")));
|
|
@@ -1261,10 +1262,10 @@ public class MzChargeDetailController {
|
|
|
List<String> auditCodeList = parentMap.get(parent);
|
|
|
if (auditCodeList == null) {
|
|
|
Map<String, Object> parentTemp = new HashMap<>();
|
|
|
- String parentName=mzBillItemMap.get(parent);
|
|
|
- if(parentName==null){
|
|
|
- BillItem billItem= mzBillItemService.queryMzBillItemByCode(parent);
|
|
|
- parentName=billItem==null?"":billItem.getName();
|
|
|
+ String parentName = mzBillItemMap.get(parent);
|
|
|
+ if (parentName == null) {
|
|
|
+ BillItem billItem = mzBillItemService.queryMzBillItemByCode(parent);
|
|
|
+ parentName = billItem == null ? "" : billItem.getName();
|
|
|
}
|
|
|
parentTemp.put("parentName", parentName);
|
|
|
parentTemp.put("parentCode", parent);
|
|
@@ -1430,7 +1431,7 @@ public class MzChargeDetailController {
|
|
|
results.put("message", "患者ID不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- Clinic clinic = mzChargeDetailService.nucleicAcidApplication(patientId,Constants.BRZZJF_CODE);
|
|
|
+ Clinic clinic = mzChargeDetailService.nucleicAcidApplication(patientId, Constants.BRZZJF_CODE);
|
|
|
if (clinic != null && clinic.getId() != null) {
|
|
|
results.put("code", 0);
|
|
|
results.put("message", "核酸申请保存成功");
|
|
@@ -1469,7 +1470,7 @@ public class MzChargeDetailController {
|
|
|
results.put("message", "患者ID不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- Clinic clinic = mzChargeDetailService.hybridTestApplication(patientId,Constants.BRZZJF_CODE);
|
|
|
+ Clinic clinic = mzChargeDetailService.hybridTestApplication(patientId, Constants.BRZZJF_CODE);
|
|
|
if (clinic != null && clinic.getId() != null) {
|
|
|
results.put("code", 0);
|
|
|
results.put("message", "核酸申请保存成功");
|
|
@@ -1509,14 +1510,14 @@ public class MzChargeDetailController {
|
|
|
results.put("message", "患者ID不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- Integer times = mzChargeDetailService.queryCountMzChargeDetailByPatientIdAndChargeItemCode(patientId,Constants.HYBRID_TEST_CHARGE_CODE);
|
|
|
- if (times == null || times<=0) {
|
|
|
+ Integer times = mzChargeDetailService.queryCountMzChargeDetailByPatientIdAndChargeItemCode(patientId, Constants.HYBRID_TEST_CHARGE_CODE);
|
|
|
+ if (times == null || times <= 0) {
|
|
|
results.put("code", -1);
|
|
|
results.put("message", "当前患者没有已缴费的混采申请");
|
|
|
return results;
|
|
|
}
|
|
|
- HybirdTest hybirdTest=hybirdTestService.queryByPatientIdAndTimes(patientId,times);
|
|
|
- if(hybirdTest!=null){
|
|
|
+ HybirdTest hybirdTest = hybirdTestService.queryByPatientIdAndTimes(patientId, times);
|
|
|
+ if (hybirdTest != null) {
|
|
|
results.put("code", -1);
|
|
|
results.put("message", "当前患者本次缴费的混采已经被采集,请勿重复添加");
|
|
|
return results;
|
|
@@ -1525,7 +1526,7 @@ public class MzChargeDetailController {
|
|
|
results.put("times", times);
|
|
|
results.put("message", "查询患者混采记录成功");
|
|
|
return results;
|
|
|
- }catch (Exception e) {
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
results.put("code", -1);
|
|
|
results.put("message", "查询患者混采记录失败,请联系管理员");
|
|
@@ -1535,7 +1536,6 @@ public class MzChargeDetailController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 保存处方信息
|
|
|
*
|
|
@@ -1544,7 +1544,7 @@ public class MzChargeDetailController {
|
|
|
*/
|
|
|
@UserLoginToken
|
|
|
@RequestMapping(value = "/savePrescription", method = {RequestMethod.POST})
|
|
|
- public Map<String, Object> savePrescription(@RequestBody MzPrescriptionVo mzPrescriptionVo,HttpServletRequest httpServletRequest) {
|
|
|
+ public Map<String, Object> savePrescription(@RequestBody MzPrescriptionVo mzPrescriptionVo, HttpServletRequest httpServletRequest) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
try {
|
|
|
User tokenUser = TokenUtil.getUser(httpServletRequest);
|
|
@@ -1555,21 +1555,21 @@ public class MzChargeDetailController {
|
|
|
// return resultMap;
|
|
|
// }
|
|
|
Clinic clinic = null;
|
|
|
- List<String> deptCodes=userDeptRelationService.queryAllByUserIdCode(tokenUser.getUserIdCode());
|
|
|
- Integer ghjzFlag=YesNoEnum.YES.code;
|
|
|
- String deptCodeMghjz=null;
|
|
|
- if(deptCodes!=null && deptCodes.size()>0){
|
|
|
- for (String deptCode:deptCodes){
|
|
|
- ZdUnitCode zdUnitCode=zdUnitCodeService.queryByCode(deptCode);
|
|
|
- if(zdUnitCode!=null && YesNoEnum.NO.code.equals(zdUnitCode.getGhjzFlag())){
|
|
|
- ghjzFlag=YesNoEnum.NO.code;
|
|
|
- deptCodeMghjz=deptCode;
|
|
|
+ List<String> deptCodes = userDeptRelationService.queryAllByUserIdCode(tokenUser.getUserIdCode());
|
|
|
+ Integer ghjzFlag = YesNoEnum.YES.code;
|
|
|
+ String deptCodeMghjz = null;
|
|
|
+ if (deptCodes != null && deptCodes.size() > 0) {
|
|
|
+ for (String deptCode : deptCodes) {
|
|
|
+ ZdUnitCode zdUnitCode = zdUnitCodeService.queryByCode(deptCode);
|
|
|
+ if (zdUnitCode != null && YesNoEnum.NO.code.equals(zdUnitCode.getGhjzFlag())) {
|
|
|
+ ghjzFlag = YesNoEnum.NO.code;
|
|
|
+ deptCodeMghjz = deptCode;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
//当前接诊医生所有可接诊科室含有免挂号接诊科室,且转诊id 和分诊流水号同时为空时,是免挂号接诊
|
|
|
- if (YesNoEnum.NO.code.equals(ghjzFlag) && mzPrescriptionVo.getTurnToConsultationId()==null && StringUtils.isBlank(mzPrescriptionVo.getSerialNo())){
|
|
|
+ if (YesNoEnum.NO.code.equals(ghjzFlag) && mzPrescriptionVo.getTurnToConsultationId() == null && StringUtils.isBlank(mzPrescriptionVo.getSerialNo())) {
|
|
|
//免挂号就诊
|
|
|
if (mzPrescriptionVo.getSerialNo().startsWith("clnicId_")) {
|
|
|
Long clnicId = Long.valueOf(mzPrescriptionVo.getSerialNo().replace("clnicId_", ""));
|
|
@@ -1578,10 +1578,10 @@ public class MzChargeDetailController {
|
|
|
mzPrescriptionVo.setDoctorCode(tokenUser.getUserIdCode());
|
|
|
mzPrescriptionVo.setVisitDeptCode(deptCodeMghjz);
|
|
|
mzPrescriptionVo.setSerialNo(null);
|
|
|
- }else if(mzPrescriptionVo.getTurnToConsultationId()!=null){
|
|
|
+ } else if (mzPrescriptionVo.getTurnToConsultationId() != null) {
|
|
|
//转诊接诊
|
|
|
- TurnToConsultation turnToConsultation=turnToConsultationService.queryTurnToConsultationById(mzPrescriptionVo.getTurnToConsultationId());
|
|
|
- if(turnToConsultation==null){
|
|
|
+ TurnToConsultation turnToConsultation = turnToConsultationService.queryTurnToConsultationById(mzPrescriptionVo.getTurnToConsultationId());
|
|
|
+ if (turnToConsultation == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "未查询到对应的会诊申请记录不存在");
|
|
|
return resultMap;
|
|
@@ -1589,7 +1589,7 @@ public class MzChargeDetailController {
|
|
|
mzPrescriptionVo.setDoctorCode(turnToConsultation.getTargetDoctorNo());
|
|
|
mzPrescriptionVo.setVisitDeptCode(turnToConsultation.getTargetDeptNo());
|
|
|
mzPrescriptionVo.setSerialNo(null);
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
//正常就诊
|
|
|
if (StringUtils.isBlank(mzPrescriptionVo.getSerialNo())) {
|
|
|
resultMap.put("code", -1);
|
|
@@ -1733,26 +1733,25 @@ public class MzChargeDetailController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 删除病人某次处方信息
|
|
|
*
|
|
|
- * @param clnicId 就诊记录id
|
|
|
+ * @param clnicId 就诊记录id
|
|
|
* @return
|
|
|
*/
|
|
|
@UserLoginToken
|
|
|
@RequestMapping(value = "/deletePrescription", method = {RequestMethod.GET})
|
|
|
- public Map<String, Object> deletePrescription(@RequestParam("clnicId") Long clnicId,HttpServletRequest httpServletRequest) {
|
|
|
+ public Map<String, Object> deletePrescription(@RequestParam("clnicId") Long clnicId, HttpServletRequest httpServletRequest) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
try {
|
|
|
- if(clnicId==null){
|
|
|
+ if (clnicId == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "请求参数为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
User tokenUser = TokenUtil.getUser(httpServletRequest);
|
|
|
- int num = mzChargeDetailService.deletePrescription(clnicId,tokenUser);
|
|
|
- if(num<=0){
|
|
|
+ int num = mzChargeDetailService.deletePrescription(clnicId, tokenUser);
|
|
|
+ if (num <= 0) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "删除处方失败");
|
|
|
return resultMap;
|
|
@@ -1775,7 +1774,6 @@ public class MzChargeDetailController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 门诊缴费指引单查询
|
|
|
*
|
|
@@ -1851,7 +1849,7 @@ public class MzChargeDetailController {
|
|
|
totalAmount = totalAmount.add(tempAmount);
|
|
|
map.put("itemTotalFee", amount.add(tempAmount));
|
|
|
}
|
|
|
- totalAmount=totalAmount.setScale(1, BigDecimal.ROUND_HALF_UP);
|
|
|
+ totalAmount = totalAmount.setScale(1, BigDecimal.ROUND_HALF_UP);
|
|
|
String payQrcode = haiCiAdapterService.genMzPayQrcode(totalAmount.multiply(BigDecimal.valueOf(100)).intValue(), patientId, patientId + "_" + times + "_1");
|
|
|
results.put("code", 0);
|
|
|
results.put("message", "门诊缴费指引单查询成功");
|
|
@@ -2032,8 +2030,6 @@ public class MzChargeDetailController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 查询核酸检查(混检)列表
|
|
|
*
|
|
@@ -2101,22 +2097,22 @@ public class MzChargeDetailController {
|
|
|
public Map<String, Object> directRegistration(@RequestBody MzPrescriptionVo mzPrescriptionVo, HttpServletRequest httpServletRequest) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
try {
|
|
|
- if(StringUtils.isBlank(mzPrescriptionVo.getPatientId())){
|
|
|
+ if (StringUtils.isBlank(mzPrescriptionVo.getPatientId())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "职工门诊统筹试算失败,患者id为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(mzPrescriptionVo.getTimes()==null){
|
|
|
+ if (mzPrescriptionVo.getTimes() == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "职工门诊统筹试算失败,就诊次数为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(mzPrescriptionVo.getReadCardType())){
|
|
|
+ if (StringUtils.isBlank(mzPrescriptionVo.getReadCardType())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "职工门诊统筹试算失败,读卡类型为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(mzPrescriptionVo.getReadCardResult())){
|
|
|
+ if (StringUtils.isBlank(mzPrescriptionVo.getReadCardResult())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "职工门诊统筹试算失败,读卡返回为空");
|
|
|
return resultMap;
|
|
@@ -2127,7 +2123,7 @@ public class MzChargeDetailController {
|
|
|
resultMap.put("message", "职工门诊统筹试算失败,用户Token不存在");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- tsmzService.directRegistration(tokenUser.getUserIdCode(),mzPrescriptionVo.getPatientId(),mzPrescriptionVo.getTimes(),mzPrescriptionVo.getReadCardResult(),mzPrescriptionVo.getGrzhzf(),mzPrescriptionVo.getReadCardType());
|
|
|
+ tsmzService.directRegistration(tokenUser.getUserIdCode(), mzPrescriptionVo.getPatientId(), mzPrescriptionVo.getTimes(), mzPrescriptionVo.getReadCardResult(), mzPrescriptionVo.getGrzhzf(), mzPrescriptionVo.getReadCardType());
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("message", "职工门诊统筹试算成功");
|
|
|
return resultMap;
|