Merge branch 'dev' of chenyongxing/patient-co-management into dev

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/controller/medicine/PhysicalExaminationController.java

@@ -26,6 +26,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
@CrossOrigin
@RestController
@RequestMapping(value = "/medicine/physicalExamination")
public class PhysicalExaminationController extends BaseController {
@@ -50,7 +51,6 @@ public class PhysicalExaminationController extends BaseController {
    @Autowired
    private ExamReportService examReportService;
    @ApiOperation(value = "获取试卷列表")
    @RequestMapping(value = "/findExames",produces="application/json;charset=UTF-8")
    @ResponseBody

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/config/SpringSecurityConfig.java

@@ -29,6 +29,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/common/**",
                "/login/**",
                "/yueren/**",
                "/customer/**",
                "/admin/hos/doctor/importFromExcel",
                "/admin/hos/doctor/importData",
                "/admin/team/importData",

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/CustomerController.java

@@ -74,7 +74,7 @@ public class CustomerController extends BaseController {
            wlyyCustomerLog.setUser(curUser.getCode());
            wlyyCustomerLog.setType(1);
            wlyyCustomerLogService.save(wlyyCustomerLog);
            return write(1,"登入成功","user",curUser);
            return write(200,"登入成功","user",curUser);
        }
    }
@@ -92,7 +92,7 @@ public class CustomerController extends BaseController {
        wlyyCustomerLog.setUser(code);
        wlyyCustomerLog.setType(0);
        wlyyCustomerLogService.save(wlyyCustomerLog);
        return write(1,"退出成功");
        return write(200,"退出成功");
    }
    /**
@@ -126,7 +126,7 @@ public class CustomerController extends BaseController {
        }
        Map<String, Object> resp = customerService.findServerInfo(patient);
        resp.put("patient",patient);
        return write(1,"查询成功","data",resp);
        return write(200,"查询成功","data",resp);
    }
    /**
@@ -144,6 +144,6 @@ public class CustomerController extends BaseController {
        }
        Map<String, Object> resp = customerService.findServerInfo(patient);
        resp.put("patient",patient);
        return write(1,"查询成功","data",resp);
        return write(200,"查询成功","data",resp);
    }
}