更新修改

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -443,10 +443,10 @@ public class Prescription extends IdEntity {
                return "支付失败";
            }
            case 50: {
                return " 支付成功/待配药";
                return " 订单已支付";
            }
            case 60: {
                return "配药成功/待配送";
                return "配药完成";
            }
            case 61: {
                return "配送失败";

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/PrescriptionLog.java

@@ -250,7 +250,7 @@ public class PrescriptionLog extends IdEntity {
    @Transient
    public String getStatusName() {
        return Prescription.getStatusName(this.status,hospitalName);
        return Prescription.getStatusName(this.status,hospitalName+",接收人:"+userName);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/interceptors/GateWayInterceptor.java

@@ -29,6 +29,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.Controller;
import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver;
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -115,7 +116,7 @@ public class GateWayInterceptor implements HandlerInterceptor {
            output = JSONObject.fromObject(modelAndView.getModelMap()).toString();
        }
        HandlerMethod handlerMethod= (HandlerMethod) handler;
//        response.getOutputStream()
        String token = request.getHeader("accesstoken");
        String ip = NetworkUtil.getIpAddress(request);
@@ -141,8 +142,6 @@ public class GateWayInterceptor implements HandlerInterceptor {
    @Override
    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
        HandlerMethod handlerMethod= (HandlerMethod) handler;
    }
    public void saveHttpLog(String ip, String input, String output, String token, String method, Integer flag, String message) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionLogController.java

@@ -100,8 +100,8 @@ public class PrescriptionLogController extends BaseController {
                prescriptionLog.setCreateTime(prescriptionExpressageLog.getCreateTime());
                prescriptionLog.setHospital(prescriptionExpressageLog.getAcceptHospital());
                prescriptionLog.setHospitalName(prescriptionExpressageLog.getAcceptHospitalName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getExpressageUserCode());
                prescriptionLog.setUserName(prescriptionExpressageLog.getExpressageUserName());
                prescriptionLog.setUserCode(prescriptionExpressageLog.getAcceptUser());
                prescriptionLog.setUserName(prescriptionExpressageLog.getAcceptUserName());
                prescriptionLogs.add(prescriptionLog);
            }
            //排序
@@ -111,9 +111,9 @@ public class PrescriptionLogController extends BaseController {
                long map2value = o2.getCreateTime().getTime();
                if (map1value - map2value > 0) {
                    return 1;
                } else if (map1value - map2value < 0) {
                    return -1;
                } else if (map1value - map2value < 0) {
                    return 1;
                } else {
                    return 0;
                }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prescription/PatientPrescriptionLogController.java

@@ -76,9 +76,9 @@ public class PatientPrescriptionLogController extends BaseController {
                long map2value = o2.getCreateTime().getTime();
                if (map1value - map2value > 0) {
                    return 1;
                } else if (map1value - map2value < 0) {
                    return -1;
                } else if (map1value - map2value < 0) {
                    return 1;
                } else {
                    return 0;
                }