|
@@ -106,7 +106,7 @@ public class MedicalViewApiController {
|
|
|
return results;
|
|
|
}
|
|
|
results.put("resultCode", 0);
|
|
|
- MzPatientMi mzPatientMi=mzPatientMis.get(0);
|
|
|
+ MzPatientMi mzPatientMi = mzPatientMis.get(0);
|
|
|
results.put("patName", mzPatientMi.getName());
|
|
|
results.put("patSex", YesNoEnum.YES.code.equals(mzPatientMi.getSex()) ? MAN : WONMAN);
|
|
|
results.put("patAge", mzPatientMi.getAge());
|
|
@@ -118,10 +118,10 @@ public class MedicalViewApiController {
|
|
|
results.put("patCardType", YesNoEnum.YES.code);
|
|
|
results.put("patCardNo", mzPatientMi.getIcCardNo());
|
|
|
results.put("patHisNo", mzPatientMi.getPatientId());
|
|
|
- List<String> inPatientNos=aPatientMiService.queryInPatientNoByMzNo(mzPatientMi.getPatientId());
|
|
|
- if(inPatientNos!=null && inPatientNos.size()>0){
|
|
|
+ List<String> inPatientNos = aPatientMiService.queryInPatientNoByMzNo(mzPatientMi.getPatientId());
|
|
|
+ if (inPatientNos != null && inPatientNos.size() > 0) {
|
|
|
results.put("inPatientNo", inPatientNos.get(0));
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
results.put("inPatientNo", "");
|
|
|
}
|
|
|
return results;
|
|
@@ -814,7 +814,6 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 查询挂号科室分类
|
|
|
*
|
|
@@ -835,8 +834,6 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 根据门诊科室分类码查询科室列表
|
|
|
*
|
|
@@ -871,7 +868,7 @@ public class MedicalViewApiController {
|
|
|
resultMap.put("resultCode", 0);
|
|
|
resultMap.put("data", zdUnitCodeList);
|
|
|
return resultMap;
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
log.error("系统异常,请联系管理员");
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "没有查询到符合条件的科室列表");
|
|
@@ -880,63 +877,60 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 预约号源统计信息查询
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getNumByDateAndDept", method = {RequestMethod.GET})
|
|
|
- public Map<String, Object> getNumByDateAndDept(@RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate, @RequestParam("unitCode")String unitCode ) {
|
|
|
+ public Map<String, Object> getNumByDateAndDept(@RequestParam("beginDate") String beginDate, @RequestParam("endDate") String endDate, @RequestParam("unitCode") String unitCode) {
|
|
|
Map<String, Object> results = new HashMap<>();
|
|
|
try {
|
|
|
- if(StringUtils.isBlank(beginDate)){
|
|
|
+ if (StringUtils.isBlank(beginDate)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "开始时间不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(endDate)){
|
|
|
+ if (StringUtils.isBlank(endDate)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "结束时间不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(unitCode)){
|
|
|
+ if (StringUtils.isBlank(unitCode)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "科室编码不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- Date beginDateD = DateUtil.pase(beginDate,"yyyy-MM-dd");
|
|
|
- Date endDateD = DateUtil.pase(endDate,"yyyy-MM-dd");
|
|
|
- List<Map<String,Object>> list=mzyRequestService.queryNumByDateAndDept(beginDateD,endDateD,unitCode);
|
|
|
+ Date beginDateD = DateUtil.pase(beginDate, "yyyy-MM-dd");
|
|
|
+ Date endDateD = DateUtil.pase(endDate, "yyyy-MM-dd");
|
|
|
+ List<Map<String, Object>> list = mzyRequestService.queryNumByDateAndDept(beginDateD, endDateD, unitCode);
|
|
|
if (list == null || list.size() == 0) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "预约号源统计信息查询失败");
|
|
|
return results;
|
|
|
}
|
|
|
- Map<String, Map<String,Object>> tempMap= new HashMap<>();
|
|
|
- for(Map map :list){
|
|
|
- tempMap.put((String) map.get("scheduleDate"),map);
|
|
|
+ Map<String, Map<String, Object>> tempMap = new HashMap<>();
|
|
|
+ for (Map map : list) {
|
|
|
+ tempMap.put((String) map.get("scheduleDate"), map);
|
|
|
}
|
|
|
//获取时间区间内的日期集合
|
|
|
List<Date> days = DateUtil.getBetweenDates(beginDateD, endDateD);
|
|
|
- List<Map<String,Object>> resultMap= new ArrayList<>();
|
|
|
- for (Date date : days){
|
|
|
- String key=DateUtil.fomart(date,"yyyy-MM-dd");
|
|
|
- Map<String,Object> item=tempMap.get(key);
|
|
|
- if(item==null){
|
|
|
- item=new HashMap<>();
|
|
|
- item.put("scheduleDate",key);
|
|
|
- item.put("status",2);
|
|
|
- }else {
|
|
|
- Integer leftNum=(Integer)item.get("leftNum");
|
|
|
- if(leftNum==null || leftNum<=0){
|
|
|
- item.put("status",2);
|
|
|
+ List<Map<String, Object>> resultMap = new ArrayList<>();
|
|
|
+ for (Date date : days) {
|
|
|
+ String key = DateUtil.fomart(date, "yyyy-MM-dd");
|
|
|
+ Map<String, Object> item = tempMap.get(key);
|
|
|
+ if (item == null) {
|
|
|
+ item = new HashMap<>();
|
|
|
+ item.put("scheduleDate", key);
|
|
|
+ item.put("status", 2);
|
|
|
+ } else {
|
|
|
+ Integer leftNum = (Integer) item.get("leftNum");
|
|
|
+ if (leftNum == null || leftNum <= 0) {
|
|
|
+ item.put("status", 2);
|
|
|
item.remove("leftNum");
|
|
|
item.remove("totalNum");
|
|
|
- }else {
|
|
|
- item.put("status",1);
|
|
|
+ } else {
|
|
|
+ item.put("status", 1);
|
|
|
}
|
|
|
}
|
|
|
resultMap.add(item);
|
|
@@ -945,7 +939,7 @@ public class MedicalViewApiController {
|
|
|
results.put("resultMessage", "预约号源统计信息查询成功");
|
|
|
results.put("data", resultMap);
|
|
|
return results;
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "预约号源统计信息查询失败");
|
|
|
return results;
|
|
@@ -954,7 +948,6 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 查询所有门诊医生信息
|
|
|
*
|
|
@@ -964,22 +957,22 @@ public class MedicalViewApiController {
|
|
|
public Map<String, Object> getAllMzDoctor() {
|
|
|
Map<String, Object> results = new HashMap<>();
|
|
|
try {
|
|
|
- List<ZdUnitCode> list=zdUnitCodeService.queryAllMzDeptFromDb();
|
|
|
- List<String> codes =list.stream().map(ZdUnitCode::getCode).collect(Collectors.toList());
|
|
|
- List<Employee> employees=employeeService.queryEmployeeByDepts(codes);
|
|
|
+ List<ZdUnitCode> list = zdUnitCodeService.queryAllMzDeptFromDb();
|
|
|
+ List<String> codes = list.stream().map(ZdUnitCode::getCode).collect(Collectors.toList());
|
|
|
+ List<Employee> employees = employeeService.queryEmployeeByDepts(codes);
|
|
|
if (employees == null || employees.size() == 0) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "没有医生信息");
|
|
|
return results;
|
|
|
}
|
|
|
- List<ZdEmpTitle> zdEmpTitles=zdEmpTitleService.queryZdEmpTitle();
|
|
|
- Map<String,String> titleMap =null;
|
|
|
- Map<String,String> zdUnitCodeMap =list.stream().collect(Collectors.toMap(ZdUnitCode::getCode, ZdUnitCode::getName));
|
|
|
- if(zdEmpTitles!=null && zdEmpTitles.size()>0){
|
|
|
- titleMap=zdEmpTitles.stream().collect(Collectors.toMap(ZdEmpTitle::getCode, ZdEmpTitle::getName));
|
|
|
+ List<ZdEmpTitle> zdEmpTitles = zdEmpTitleService.queryZdEmpTitle();
|
|
|
+ Map<String, String> titleMap = null;
|
|
|
+ Map<String, String> zdUnitCodeMap = list.stream().collect(Collectors.toMap(ZdUnitCode::getCode, ZdUnitCode::getName));
|
|
|
+ if (zdEmpTitles != null && zdEmpTitles.size() > 0) {
|
|
|
+ titleMap = zdEmpTitles.stream().collect(Collectors.toMap(ZdEmpTitle::getCode, ZdEmpTitle::getName));
|
|
|
}
|
|
|
- for (Employee employee:employees){
|
|
|
- if(titleMap!=null){
|
|
|
+ for (Employee employee : employees) {
|
|
|
+ if (titleMap != null) {
|
|
|
employee.setDoctorTitle(titleMap.get(employee.getEmpTitCode()));
|
|
|
}
|
|
|
employee.setDeptName(zdUnitCodeMap.get(employee.getDeptCode()));
|
|
@@ -988,7 +981,7 @@ public class MedicalViewApiController {
|
|
|
results.put("resultMessage", "查询所有门诊医生信息成功");
|
|
|
results.put("data", employees);
|
|
|
return results;
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "查询所有门诊医生信息失败");
|
|
@@ -997,98 +990,101 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 查询可以挂号的科室内医生信息
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getDoctorByDateAndDept", method = {RequestMethod.GET})
|
|
|
- public Map<String, Object> getDoctorByDateAndDept(@RequestParam("requestDay") String requestDay, @RequestParam("unitCode")String unitCode ) {
|
|
|
+ public Map<String, Object> getDoctorByDateAndDept(@RequestParam("requestDay") String requestDay, @RequestParam("unitCode") String unitCode) {
|
|
|
Map<String, Object> results = new HashMap<>();
|
|
|
try {
|
|
|
- if(StringUtils.isBlank(requestDay)){
|
|
|
+ if (StringUtils.isBlank(requestDay)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "预约挂号时间不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(unitCode)){
|
|
|
+ if (StringUtils.isBlank(unitCode)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "科室编码不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- List<String> ampms=null;
|
|
|
- int flg = DateUtil.IsAfternoon(java.util.Calendar.getInstance().getTime().getHours());
|
|
|
- if (flg >= 0){
|
|
|
- ampms=Arrays.asList(Constants.AM);
|
|
|
- }
|
|
|
- MzZdWorkTime mzZdWorkTime=mzZdWorkTimeService.queryMzZdWorkTimeByCode(Constants.PM);
|
|
|
- SimpleDateFormat simpleDateFormat=new SimpleDateFormat("HH:mm");
|
|
|
- Date dateEndTime=simpleDateFormat.parse(mzZdWorkTime.getEndTime());
|
|
|
- long tsEndTime =dateEndTime.getTime();
|
|
|
- String realNowStr = simpleDateFormat.format(new Date());
|
|
|
- Date realHour = simpleDateFormat.parse(realNowStr);
|
|
|
- long realHourTs = realHour.getTime();
|
|
|
- if(realHourTs>tsEndTime){
|
|
|
- ampms=new ArrayList<>(ampms);
|
|
|
- ampms.add(Constants.PM);
|
|
|
+ List<String> ampms = null;
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ String now = simpleDateFormat.format(new Date());
|
|
|
+ if (requestDay.equals(now)) {
|
|
|
+ int flg = DateUtil.IsAfternoon(java.util.Calendar.getInstance().getTime().getHours());
|
|
|
+ if (flg >= 0) {
|
|
|
+ ampms = Arrays.asList(Constants.AM);
|
|
|
+ }
|
|
|
+ MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(Constants.PM);
|
|
|
+ simpleDateFormat = new SimpleDateFormat("HH:mm");
|
|
|
+ Date dateEndTime = simpleDateFormat.parse(mzZdWorkTime.getEndTime());
|
|
|
+ long tsEndTime = dateEndTime.getTime();
|
|
|
+ String realNowStr = simpleDateFormat.format(new Date());
|
|
|
+ Date realHour = simpleDateFormat.parse(realNowStr);
|
|
|
+ long realHourTs = realHour.getTime();
|
|
|
+ if (realHourTs > tsEndTime) {
|
|
|
+ ampms = new ArrayList<>(ampms);
|
|
|
+ ampms.add(Constants.PM);
|
|
|
+ }
|
|
|
}
|
|
|
- Date requestDayD = DateUtil.pase(requestDay,"yyyy-MM-dd");
|
|
|
- Date toDay = DateUtil.pase(new Date(),"yyyy-MM-dd");
|
|
|
- if(requestDayD.before(toDay)){
|
|
|
+ Date requestDayD = DateUtil.pase(requestDay, "yyyy-MM-dd");
|
|
|
+ Date toDay = DateUtil.pase(new Date(), "yyyy-MM-dd");
|
|
|
+ if (requestDayD.before(toDay)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "预约挂号时间已过,无法挂号,请重新选择!");
|
|
|
return results;
|
|
|
}
|
|
|
- List<Map<String,Object>> list=mzyRequestService.queryDoctorByDateAndDept(requestDayD,ampms,unitCode);
|
|
|
+ List<Map<String, Object>> list = mzyRequestService.queryDoctorByDateAndDept(requestDayD, ampms, unitCode);
|
|
|
if (list == null || list.size() == 0) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "没有医生排班信息");
|
|
|
return results;
|
|
|
}
|
|
|
- List<Map<String,Object>> removeList = new ArrayList<>();
|
|
|
- for(Map map :list){
|
|
|
+ List<Map<String, Object>> removeList = new ArrayList<>();
|
|
|
+ for (Map map : list) {
|
|
|
BigDecimal fee = BigDecimal.ZERO;
|
|
|
- String chargeType= (String) map.get("chargeType");
|
|
|
- if(StringUtils.isNotBlank(chargeType)){
|
|
|
- MzyZdChargeType mzyZdChargeType=mzyZdChargeTypeService.queryByCode(chargeType);
|
|
|
- if(mzyZdChargeType!=null){
|
|
|
- map.put("chargeType",mzyZdChargeType.getName());
|
|
|
- if(mzyZdChargeType.getReqFee()==null){
|
|
|
+ String chargeType = (String) map.get("chargeType");
|
|
|
+ if (StringUtils.isNotBlank(chargeType)) {
|
|
|
+ MzyZdChargeType mzyZdChargeType = mzyZdChargeTypeService.queryByCode(chargeType);
|
|
|
+ if (mzyZdChargeType != null) {
|
|
|
+ map.put("chargeType", mzyZdChargeType.getName());
|
|
|
+ if (mzyZdChargeType.getReqFee() == null) {
|
|
|
mzyZdChargeType.setReqFee(BigDecimal.ZERO);
|
|
|
}
|
|
|
- if(mzyZdChargeType.getClinicFee()==null){
|
|
|
+ if (mzyZdChargeType.getClinicFee() == null) {
|
|
|
mzyZdChargeType.setClinicFee(BigDecimal.ZERO);
|
|
|
}
|
|
|
- if(mzyZdChargeType.getOthFee()==null){
|
|
|
+ if (mzyZdChargeType.getOthFee() == null) {
|
|
|
mzyZdChargeType.setOthFee(BigDecimal.ZERO);
|
|
|
}
|
|
|
- fee=fee.add(mzyZdChargeType.getReqFee()).add(mzyZdChargeType.getClinicFee()).add(mzyZdChargeType.getOthFee());
|
|
|
+ fee = fee.add(mzyZdChargeType.getReqFee()).add(mzyZdChargeType.getClinicFee()).add(mzyZdChargeType.getOthFee());
|
|
|
}
|
|
|
}
|
|
|
- BigDecimal checkFee= (BigDecimal) map.get("checkFee");
|
|
|
- if(checkFee==null){
|
|
|
- checkFee=BigDecimal.ZERO;
|
|
|
+ BigDecimal checkFee = (BigDecimal) map.get("checkFee");
|
|
|
+ if (checkFee == null) {
|
|
|
+ checkFee = BigDecimal.ZERO;
|
|
|
}
|
|
|
- fee=fee.add(checkFee);
|
|
|
- map.put("fee",fee);
|
|
|
+ fee = fee.add(checkFee);
|
|
|
+ map.put("fee", fee);
|
|
|
map.remove("checkFee");
|
|
|
- String doctorCode= (String) map.get("doctorCode");
|
|
|
- if(StringUtils.isBlank(doctorCode)){
|
|
|
+ String doctorCode = (String) map.get("doctorCode");
|
|
|
+ if (StringUtils.isBlank(doctorCode)) {
|
|
|
removeList.add(map);
|
|
|
- continue;
|
|
|
+ continue;
|
|
|
}
|
|
|
- Employee employee= employeeService.queryByUserCode(doctorCode);
|
|
|
- if(employee==null){
|
|
|
+ Employee employee = employeeService.queryByUserCode(doctorCode);
|
|
|
+ if (employee == null) {
|
|
|
continue;
|
|
|
}
|
|
|
- map.put("doctorName",employee.getEmployeeName());
|
|
|
- if(StringUtils.isNotBlank(employee.getEmpTitCode())){
|
|
|
- ZdEmpTitle zdEmpTitle=zdEmpTitleService.queryByCode(employee.getEmpTitCode());
|
|
|
- if(zdEmpTitle==null){
|
|
|
+ map.put("doctorName", employee.getEmployeeName());
|
|
|
+ if (StringUtils.isNotBlank(employee.getEmpTitCode())) {
|
|
|
+ ZdEmpTitle zdEmpTitle = zdEmpTitleService.queryByCode(employee.getEmpTitCode());
|
|
|
+ if (zdEmpTitle == null) {
|
|
|
continue;
|
|
|
}
|
|
|
- map.put("doctorTitle",zdEmpTitle.getName());
|
|
|
+ map.put("doctorTitle", zdEmpTitle.getName());
|
|
|
}
|
|
|
}
|
|
|
list.removeAll(removeList);
|
|
@@ -1096,7 +1092,7 @@ public class MedicalViewApiController {
|
|
|
results.put("resultMessage", "查询可以挂号的科室内医生信息成功");
|
|
|
results.put("data", list);
|
|
|
return results;
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "查询可以挂号的科室内医生信息失败");
|
|
@@ -1105,112 +1101,114 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 查询可以挂号的医生号源信息
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/getRequestByDateAndDeptAndDoctor", method = {RequestMethod.GET})
|
|
|
- public Map<String, Object> getRequestByDateAndDeptAndDoctor(@RequestParam("requestDay") String requestDay, @RequestParam("unitCode")String unitCode, @RequestParam("doctorCode")String doctorCode ) {
|
|
|
+ public Map<String, Object> getRequestByDateAndDeptAndDoctor(@RequestParam("requestDay") String requestDay, @RequestParam("unitCode") String unitCode, @RequestParam("doctorCode") String doctorCode) {
|
|
|
Map<String, Object> results = new HashMap<>();
|
|
|
try {
|
|
|
- if(StringUtils.isBlank(requestDay)){
|
|
|
+ if (StringUtils.isBlank(requestDay)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "预约挂号时间不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(unitCode)){
|
|
|
+ if (StringUtils.isBlank(unitCode)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "科室编码不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(doctorCode)){
|
|
|
+ if (StringUtils.isBlank(doctorCode)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "医生编码不能为空");
|
|
|
return results;
|
|
|
}
|
|
|
- List<String> ampms=null;
|
|
|
- int flg = DateUtil.IsAfternoon(java.util.Calendar.getInstance().getTime().getHours());
|
|
|
- if (flg >= 0){
|
|
|
- ampms=Arrays.asList(Constants.AM);
|
|
|
- }
|
|
|
- MzZdWorkTime mzZdWorkTime=mzZdWorkTimeService.queryMzZdWorkTimeByCode(Constants.PM);
|
|
|
- SimpleDateFormat simpleDateFormat=new SimpleDateFormat("HH:mm");
|
|
|
- Date dateEndTime=simpleDateFormat.parse(mzZdWorkTime.getEndTime());
|
|
|
- long tsEndTime =dateEndTime.getTime();
|
|
|
- String realNowStr = simpleDateFormat.format(new Date());
|
|
|
- Date realHour = simpleDateFormat.parse(realNowStr);
|
|
|
- long realHourTs = realHour.getTime();
|
|
|
- if(realHourTs>tsEndTime){
|
|
|
- ampms=new ArrayList<>(ampms);
|
|
|
- ampms.add(Constants.PM);
|
|
|
+ List<String> ampms = null;
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ String now = simpleDateFormat.format(new Date());
|
|
|
+ if (requestDay.equals(now)) {
|
|
|
+ int flg = DateUtil.IsAfternoon(java.util.Calendar.getInstance().getTime().getHours());
|
|
|
+ if (flg >= 0) {
|
|
|
+ ampms = Arrays.asList(Constants.AM);
|
|
|
+ }
|
|
|
+ MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(Constants.PM);
|
|
|
+ simpleDateFormat = new SimpleDateFormat("HH:mm");
|
|
|
+ Date dateEndTime = simpleDateFormat.parse(mzZdWorkTime.getEndTime());
|
|
|
+ long tsEndTime = dateEndTime.getTime();
|
|
|
+ String realNowStr = simpleDateFormat.format(new Date());
|
|
|
+ Date realHour = simpleDateFormat.parse(realNowStr);
|
|
|
+ long realHourTs = realHour.getTime();
|
|
|
+ if (realHourTs > tsEndTime) {
|
|
|
+ ampms = new ArrayList<>(ampms);
|
|
|
+ ampms.add(Constants.PM);
|
|
|
+ }
|
|
|
}
|
|
|
- Date requestDayD = DateUtil.pase(requestDay,"yyyy-MM-dd");
|
|
|
- Date toDay = DateUtil.pase(new Date(),"yyyy-MM-dd");
|
|
|
- if(requestDayD.before(toDay)){
|
|
|
+ Date requestDayD = DateUtil.pase(requestDay, "yyyy-MM-dd");
|
|
|
+ Date toDay = DateUtil.pase(new Date(), "yyyy-MM-dd");
|
|
|
+ if (requestDayD.before(toDay)) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "预约挂号时间已过,无法挂号,请重新选择!");
|
|
|
return results;
|
|
|
}
|
|
|
- List<Map<String,Object>> list=mzyRequestService.queryRequestByDateAndDeptAndDoctor(requestDayD,ampms,unitCode,doctorCode);
|
|
|
+ List<Map<String, Object>> list = mzyRequestService.queryRequestByDateAndDeptAndDoctor(requestDayD, ampms, unitCode, doctorCode);
|
|
|
if (list == null || list.size() == 0) {
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "没有医生排班信息");
|
|
|
return results;
|
|
|
}
|
|
|
- for(Map map :list){
|
|
|
+ for (Map map : list) {
|
|
|
BigDecimal fee = BigDecimal.ZERO;
|
|
|
- String chargeType= (String) map.get("chargeType");
|
|
|
- if(StringUtils.isNotBlank(chargeType)){
|
|
|
- MzyZdChargeType mzyZdChargeType=mzyZdChargeTypeService.queryByCode(chargeType);
|
|
|
- if(mzyZdChargeType!=null){
|
|
|
- map.put("chargeType",mzyZdChargeType.getName());
|
|
|
- if(mzyZdChargeType.getReqFee()==null){
|
|
|
+ String chargeType = (String) map.get("chargeType");
|
|
|
+ if (StringUtils.isNotBlank(chargeType)) {
|
|
|
+ MzyZdChargeType mzyZdChargeType = mzyZdChargeTypeService.queryByCode(chargeType);
|
|
|
+ if (mzyZdChargeType != null) {
|
|
|
+ map.put("chargeType", mzyZdChargeType.getName());
|
|
|
+ if (mzyZdChargeType.getReqFee() == null) {
|
|
|
mzyZdChargeType.setReqFee(BigDecimal.ZERO);
|
|
|
}
|
|
|
- if(mzyZdChargeType.getClinicFee()==null){
|
|
|
+ if (mzyZdChargeType.getClinicFee() == null) {
|
|
|
mzyZdChargeType.setClinicFee(BigDecimal.ZERO);
|
|
|
}
|
|
|
- if(mzyZdChargeType.getOthFee()==null){
|
|
|
+ if (mzyZdChargeType.getOthFee() == null) {
|
|
|
mzyZdChargeType.setOthFee(BigDecimal.ZERO);
|
|
|
}
|
|
|
- fee=fee.add(mzyZdChargeType.getReqFee()).add(mzyZdChargeType.getClinicFee()).add(mzyZdChargeType.getOthFee());
|
|
|
+ fee = fee.add(mzyZdChargeType.getReqFee()).add(mzyZdChargeType.getClinicFee()).add(mzyZdChargeType.getOthFee());
|
|
|
}
|
|
|
}
|
|
|
- BigDecimal checkFee= (BigDecimal) map.get("checkFee");
|
|
|
- if(checkFee==null){
|
|
|
- checkFee=BigDecimal.ZERO;
|
|
|
+ BigDecimal checkFee = (BigDecimal) map.get("checkFee");
|
|
|
+ if (checkFee == null) {
|
|
|
+ checkFee = BigDecimal.ZERO;
|
|
|
}
|
|
|
- fee=fee.add(checkFee);
|
|
|
- map.put("fee",fee);
|
|
|
+ fee = fee.add(checkFee);
|
|
|
+ map.put("fee", fee);
|
|
|
map.remove("checkFee");
|
|
|
- Employee employee= employeeService.queryByUserCode(doctorCode);
|
|
|
- if(employee!=null){
|
|
|
- map.put("doctorName",employee.getEmployeeName());
|
|
|
- if(StringUtils.isNotBlank(employee.getEmpTitCode())){
|
|
|
- ZdEmpTitle zdEmpTitle=zdEmpTitleService.queryByCode(employee.getEmpTitCode());
|
|
|
- if(zdEmpTitle!=null){
|
|
|
- map.put("doctorTitle",zdEmpTitle.getName());
|
|
|
+ Employee employee = employeeService.queryByUserCode(doctorCode);
|
|
|
+ if (employee != null) {
|
|
|
+ map.put("doctorName", employee.getEmployeeName());
|
|
|
+ if (StringUtils.isNotBlank(employee.getEmpTitCode())) {
|
|
|
+ ZdEmpTitle zdEmpTitle = zdEmpTitleService.queryByCode(employee.getEmpTitCode());
|
|
|
+ if (zdEmpTitle != null) {
|
|
|
+ map.put("doctorTitle", zdEmpTitle.getName());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
String ampm = (String) map.get("ampm");
|
|
|
- if(Constants.AM.equals(ampm)){
|
|
|
- ampm="上午";
|
|
|
- }else if(Constants.PM.equals(ampm)){
|
|
|
- ampm="下午";
|
|
|
- }else if (Constants.DAY.equals(ampm)){
|
|
|
- ampm="全天";
|
|
|
+ if (Constants.AM.equals(ampm)) {
|
|
|
+ ampm = "上午";
|
|
|
+ } else if (Constants.PM.equals(ampm)) {
|
|
|
+ ampm = "下午";
|
|
|
+ } else if (Constants.DAY.equals(ampm)) {
|
|
|
+ ampm = "全天";
|
|
|
}
|
|
|
- map.put("ampm",ampm);
|
|
|
+ map.put("ampm", ampm);
|
|
|
}
|
|
|
results.put("resultCode", 0);
|
|
|
results.put("resultMessage", "查询可以挂号的医生号源信息成功");
|
|
|
results.put("data", list);
|
|
|
return results;
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
results.put("resultCode", -1);
|
|
|
results.put("resultMessage", "查询可以挂号的医生号源信息失败");
|
|
@@ -1219,28 +1217,27 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
/**
|
|
|
* 门诊挂号支付
|
|
|
+ *
|
|
|
* @return
|
|
|
*/
|
|
|
@RequestMapping(value = "/payRegistrationFormHaiCi", method = {RequestMethod.POST})
|
|
|
public Map<String, Object> payRegistrationFormHaiCi(@RequestBody MzyReqrecPageDto mzyReqrecPageDto) {
|
|
|
Map<String, Object> resultMap = new HashMap<>();
|
|
|
try {
|
|
|
- if(mzyReqrecPageDto==null || mzyReqrecPageDto.getMzyReqrec()==null){
|
|
|
+ if (mzyReqrecPageDto == null || mzyReqrecPageDto.getMzyReqrec() == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "挂号参数不能为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
MzyReqrec mzyReqrec = mzyReqrecPageDto.getMzyReqrec();
|
|
|
- if(StringUtils.isBlank(mzyReqrec.getPatientId())){
|
|
|
+ if (StringUtils.isBlank(mzyReqrec.getPatientId())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "病人id不能为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(mzyReqrec.getPaymode())){
|
|
|
+ if (StringUtils.isBlank(mzyReqrec.getPaymode())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "付款方式不能为空");
|
|
|
return resultMap;
|
|
@@ -1250,24 +1247,24 @@ public class MedicalViewApiController {
|
|
|
resultMap.put("resultMessage", "支付方式有误,请联系管理员");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(mzyReqrec.getAgtordnum())){
|
|
|
+ if (StringUtils.isBlank(mzyReqrec.getAgtordnum())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "流水号不能为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(StringUtils.isBlank(mzyReqrec.getPsordnum())){
|
|
|
+ if (StringUtils.isBlank(mzyReqrec.getPsordnum())) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "订单号不能为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if(mzyReqrecPageDto.getMzyRequestId()==null){
|
|
|
+ if (mzyReqrecPageDto.getMzyRequestId() == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "门诊号表主键不能为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
mzyReqrecPageDto.setResponceType("01");
|
|
|
- MzyRequest mzyRequest= mzyRequestService.queryById(mzyReqrecPageDto.getMzyRequestId());
|
|
|
- if(mzyRequest==null){
|
|
|
+ MzyRequest mzyRequest = mzyRequestService.queryById(mzyReqrecPageDto.getMzyRequestId());
|
|
|
+ if (mzyRequest == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "挂号信息对应的号表不存在");
|
|
|
return resultMap;
|
|
@@ -1276,15 +1273,15 @@ public class MedicalViewApiController {
|
|
|
mzyReqrec.setUnitCode(mzyRequest.getUnitCode());
|
|
|
mzyReqrec.setChargeType(mzyRequest.getChargeType());
|
|
|
mzyReqrec.setDoctorCode(mzyRequest.getDoctorCode());
|
|
|
- MzZdWorkTime mzZdWorkTime=mzZdWorkTimeService.queryMzZdWorkTimeByCode(mzyReqrec.getAmpm());
|
|
|
- if(mzZdWorkTime==null){
|
|
|
+ MzZdWorkTime mzZdWorkTime = mzZdWorkTimeService.queryMzZdWorkTimeByCode(mzyReqrec.getAmpm());
|
|
|
+ if (mzZdWorkTime == null) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "号段不存在");
|
|
|
return resultMap;
|
|
|
}
|
|
|
mzyReqrec.setOpId(Constants.BRZZJF_CODE);
|
|
|
- int num =mzyReqrecService.saveMzyReqrec(mzyReqrecPageDto);
|
|
|
- if(num==0){
|
|
|
+ int num = mzyReqrecService.saveMzyReqrec(mzyReqrecPageDto);
|
|
|
+ if (num == 0) {
|
|
|
resultMap.put("code", -1);
|
|
|
resultMap.put("message", "挂号失败,请稍后重试!");
|
|
|
return resultMap;
|
|
@@ -1292,17 +1289,16 @@ public class MedicalViewApiController {
|
|
|
resultMap.put("code", 0);
|
|
|
resultMap.put("message", "保存挂号信息成功");
|
|
|
return resultMap;
|
|
|
- }catch (Exception e){
|
|
|
+ } catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
resultMap.put("code", -1);
|
|
|
- resultMap.put("message", StringUtils.isBlank(e.getMessage())?"挂号失败,系统出错,请联系管理员":e.getMessage());
|
|
|
- log.error("挂号失败,系统异常,错误信息{}",e.getMessage());
|
|
|
+ resultMap.put("message", StringUtils.isBlank(e.getMessage()) ? "挂号失败,系统出错,请联系管理员" : e.getMessage());
|
|
|
+ log.error("挂号失败,系统异常,错误信息{}", e.getMessage());
|
|
|
return resultMap;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 门诊挂号订单支付状态查询
|
|
|
*
|
|
@@ -1374,7 +1370,6 @@ public class MedicalViewApiController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 查询门诊记录表 医患通已收费记录查询
|
|
|
*
|