Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorServiceApplicationService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java
	svr/svr-door-serivce/src/main/java/com/yihu/jw/door/util/MessageUtil.java
	svr/svr-door-serivce/src/main/resources/application.yml

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/controller/doctor/DoorOrderController.java

@@ -78,6 +78,20 @@ public class DoorOrderController extends BaseController {
    }
    @GetMapping("/getDoorOrderNum")
    @ApiOperation(value = "获取医生待服务工单数量")
    public String getDoorOrderNum(
            @ApiParam(name = "doctor", value = "医生codedoctor")
            @RequestParam(value = "doctor", required = true) String doctor) {
        try {
            return write(200, "获取成功", "data", doorOrderService.getDoorOrderNum(doctor));
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败!" + e.getMessage());
        }
    }
    @PostMapping("/dispatchOrderSwitch")
    @ApiOperation(value = "分派订单开关修改")
    public String dispatchOrderSwitch(

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/DoorOrderService.java

@@ -135,6 +135,18 @@ public class DoorOrderService {
    @Autowired
    private PrescriptionDao prescriptionDao;
    /**
     * 互联网查询待服务工单数
     * @param doctor
     * @return
     */
    public Integer getDoorOrderNum(String doctor){
        String sql = "SELECT COUNT(DISTINCT a.id) as num FROM wlyy_door_service_order a " ;
            sql +=  "LEFT JOIN wlyy_door_doctor d on d.order_id = a.id WHERE  (d.doctor ='"+doctor+"' or a.doctor = '"+doctor+"') and a.status = 4";
        return jdbcTemplate.queryForObject(sql,Integer.class);
    }
    /**
     * 顶部状态栏订单各分类总条数
@@ -1247,7 +1259,7 @@ public class DoorOrderService {
        if (doorDoctorDOList != null && doorDoctorDOList.size() > 0) {
            List<String> jobCodeList = doorDoctorDOList.stream().map(WlyyDoorDoctorDO::getDoctorJobCode).collect(Collectors.toList());
//            Double jobFeeCost = dmJobService.getJobFeeCost(jobCodeList, level, times);
            Double jobFeeCost = 120d;
            Double jobFeeCost = 30d;
            if(null != jobFeeCost){
                price = price.add(BigDecimal.valueOf(jobFeeCost));
            }
@@ -1267,7 +1279,7 @@ public class DoorOrderService {
        if (doorDoctorDOList != null && doorDoctorDOList.size() > 0) {
            for(WlyyDoorDoctorDO wlyyDoorDoctorDO:doorDoctorDOList){
//                Double jobFeeCost = dmJobService.getJobFee(wlyyDoorDoctorDO.getDoctorJobCode(), level, times);
                Double jobFeeCost = 120d;
                Double jobFeeCost = 30d;
                wlyyDoorDoctorDO.setJobFeeCost(jobFeeCost);
                doorDoctorDao.save(wlyyDoorDoctorDO);
                djDetailList.add(wlyyDoorDoctorDO);

svr/svr-door-serivce/src/main/java/com/yihu/jw/door/service/WlyyDoorServiceOrderService.java

@@ -467,7 +467,7 @@ public class WlyyDoorServiceOrderService extends BaseJpaService<WlyyDoorServiceO
                // 被服务的居民的次数（非代理居民）
                Integer tiems = countPatientDoorTimes(orderDO.getPatient());
//                BigDecimal fee = BigDecimal.valueOf(dmJobService.getJobFee(doorDoctorDO.getDoctorJobCode(),doorDoctorDO.getHospitalLevel(),tiems));
                BigDecimal fee = BigDecimal.valueOf(120);
                BigDecimal fee = BigDecimal.valueOf(30);
                feeDetailDO.setFee(fee);
                totalFee = totalFee.add(fee);
                feeDetailDOList.add(feeDetailDO);