bug修改

business/base-service/src/main/java/com/yihu/jw/complaint/BaseComplaintService.java

@@ -276,6 +276,7 @@ public class BaseComplaintService {
        }
       return baseComplaintDao.save(baseComplaintDO);
    }
    /*
     * 医生转交
     * */
@@ -429,7 +430,7 @@ public class BaseComplaintService {
                " t.acceptor_name as \"acceptorName\"" +
                " from base_complaint t  " +
                " left join base_patient b on t.patient=b.id " ;
        sql+=" left join base_complaint_operate_log g on t.id=g.relation_code where t.is_del='1 '";
        sql+=" left join base_complaint_operate_log g on t.id=g.relation_code where t.is_del='1' ";
        if (StringUtils.isNoneBlank(status)&&"3".equalsIgnoreCase(status)){
            sql+=" and  g.status='3' ";
        }/*else if (StringUtils.isNoneBlank(status)&&"1".equalsIgnoreCase(status)){

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -1766,20 +1766,26 @@ public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,Busines
    public JSONObject selectOrderTime(String relationCode){
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("PAY_TIME").orElse(null);
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(relationCode);
        Date createDate = businessOrderDO.getCreateTime();
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(createDate);
        if (businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getPyCode()));
        if (businessOrderDO!=null){
            Date createDate = businessOrderDO.getCreateTime();
            Calendar calendar = Calendar.getInstance();
            calendar.setTime(createDate);
            if (businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getPyCode()));
            }else {
                calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getDictCode()));
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String time = sdf.format(calendar.getTime());
            JSONObject object = new JSONObject();
            object.put("endTime",time);
            object.put("createTime",businessOrderDO.getCreateTime());
            return object;
        }else {
            calendar.add(Calendar.MINUTE,Integer.parseInt(wlyyHospitalSysDictDO.getDictCode()));
            return null;
        }
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        String time = sdf.format(calendar.getTime());
        JSONObject object = new JSONObject();
        object.put("endTime",time);
        object.put("createTime",businessOrderDO.getCreateTime());
        return object;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/complaint/BaseComplaintEndPoint.java

@@ -145,18 +145,13 @@ public class BaseComplaintEndPoint extends EnvelopRestEndpoint {
     */
    @GetMapping(value = "/findComplaintDoctorList")
    @ApiOperation(value = "查询医生列表", notes = "查询医生列表")
    public MixEnvelop findComplaintDoctorList(@ApiParam(name = "doctorName", value = "doctorName", required = false)
                                              @RequestParam(value = "doctorName", required = false) String doctorName,
                                              @ApiParam(name = "doctor", value = "doctor", required = false)
                                              @RequestParam(value = "doctor", required = false) String doctor,
                                              @ApiParam(name = "deptName", value = "deptName", required = false)
                                              @RequestParam(value = "deptName", required = false) String deptName,
                                              @ApiParam(name = "complaintType", value = "complaintType", required = false)
                                              @RequestParam(value = "complaintType", required = false) String complaintType,
                                              @ApiParam(name = "page", value = "page", required = false)
                                              @RequestParam(value = "page", required = false) Integer page,
                                              @ApiParam(name = "pageSize", value = "pageSize", required = false)
                                              @RequestParam(value = "pageSize", required = false) Integer pageSize
    public MixEnvelop findComplaintDoctorList(
            @ApiParam(name = "doctorName", value = "doctorName", required = false) @RequestParam(value = "doctorName", required = false) String doctorName,
            @ApiParam(name = "doctor", value = "doctor", required = false) @RequestParam(value = "doctor", required = false) String doctor,
            @ApiParam(name = "deptName", value = "deptName", required = false) @RequestParam(value = "deptName", required = false) String deptName,
            @ApiParam(name = "complaintType", value = "complaintType", required = false) @RequestParam(value = "complaintType", required = false) String complaintType,
            @ApiParam(name = "page", value = "page", required = false) @RequestParam(value = "page", required = false) Integer page,
            @ApiParam(name = "pageSize", value = "pageSize", required = false) @RequestParam(value = "pageSize", required = false) Integer pageSize
    ) throws Exception {
        try {
            return baseComplaintService.findComplaintDoctor(doctor, doctorName, deptName, complaintType, page, pageSize);
@@ -209,10 +204,10 @@ public class BaseComplaintEndPoint extends EnvelopRestEndpoint {
     */
    @GetMapping(value = "/doctorAccept")
    @ApiOperation(value = "接受投诉", notes = "接受投诉")
    public Envelop doctorAccept(@ApiParam(name = "id", value = "id", required = false)
                                @RequestParam(value = "id", required = false) String id,
                                @ApiParam(name = "doctor", value = "doctor", required = false)
                                @RequestParam(value = "doctor", required = false) String doctor) throws Exception {
    public Envelop doctorAccept(
            @ApiParam(name = "id", value = "id", required = false) @RequestParam(value = "id", required = false) String id,
            @ApiParam(name = "doctor", value = "doctor", required = false) @RequestParam(value = "doctor", required = false) String doctor
    ) throws Exception {
        try {
            return success(baseComplaintService.doctorAccept(id, doctor));
        } catch (Exception e) {
@@ -289,6 +284,7 @@ public class BaseComplaintEndPoint extends EnvelopRestEndpoint {
        }
    }
    /**
     * 居民反馈查询
     *